From 3862f22ad1d17dfc452e2846c20036c0cafbd75e Mon Sep 17 00:00:00 2001
From: lucio lelii <lucio.lelii@isti.cnr.it>
Date: Wed, 20 Apr 2022 16:29:44 +0200
Subject: [PATCH] first steps to the distro 4-0-0

---
 CHANGELOG.md                        |  4 +++
 Dockerfile                          |  2 +-
 distro/contents/install             |  9 ++-----
 distro/contents/logback.xml         |  1 -
 distro/contents/samplecontainer.ini | 40 +++++++++++++++++++++++++++++
 distro/standalone.xml               |  4 +--
 pom.xml                             |  3 ++-
 7 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 distro/contents/samplecontainer.ini

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 709b759..096dd8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Smartgears Distribution
 
+## [v4.0.0-SNAPSHOT] - 2022-03-30
+
+- moving to smartgears-4.0.0
+
 ## [v3.4.5] - 2022-03-29
 
 - fixes issue [#23075]
diff --git a/Dockerfile b/Dockerfile
index 35f41ee..263e720 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@ FROM tomcat:8.5.47-jdk8-openjdk
   ARG nexuspath
   ARG filename
   ARG version
+  COPY ./target/$filename.tar.gz /smartgears-distro.tar.gz 	
   WORKDIR /
-  RUN curl -k  $nexuspath/$filename.tar.gz --output /smartgears-distro.tar.gz
   RUN tar zxvf /smartgears-distro.tar.gz
   RUN export CATALINA_HOME=/usr/local/tomcat
   RUN mv smartgears-distribution-$version  smartgears-distribution
diff --git a/distro/contents/install b/distro/contents/install
index 648707c..4c8f42f 100755
--- a/distro/contents/install
+++ b/distro/contents/install
@@ -220,13 +220,8 @@ function change_line {
 
 function replace_property {
 	local PROPERTY=$1
-	#local OLD_LINE=$(sed -n "/${PROPERTY}/p" $ghnhome/container.xml)
-	local NEW_LINE=$(sed -n "/${PROPERTY}/p" $distro/container.xml)
-	#echo "Replacing property ${PROPERTY}:"
-	#echo $OLD_LINE
-	#echo $NEW_LINE
-	change_line "${PROPERTY}" "${NEW_LINE}" $ghnhome/container.xml
-	#echo "done."
+	local NEW_LINE=$(sed -n "/${PROPERTY}/p" $distro/container.ini)
+	change_line "${PROPERTY}" "${NEW_LINE}" $ghnhome/container.ini
 }
 
 echo -e "\ninstalling configuration         \c"
diff --git a/distro/contents/logback.xml b/distro/contents/logback.xml
index d46921c..347f69b 100644
--- a/distro/contents/logback.xml
+++ b/distro/contents/logback.xml
@@ -1,4 +1,3 @@
-
 <configuration scan="true" debug="false">
 
 	<appender name="FILE"
diff --git a/distro/contents/samplecontainer.ini b/distro/contents/samplecontainer.ini
new file mode 100644
index 0000000..ca1d21f
--- /dev/null
+++ b/distro/contents/samplecontainer.ini
@@ -0,0 +1,40 @@
+[node]
+; mandatory
+; optional fields: mode (=online), publication-frequency-seconds (=60), authorizeChildrenContext (=false)
+mode = offline
+hostname = localhost
+protocol= https
+port = 8080
+infrastructure = gcube
+authorizeChildrenContext = true
+publicationFrequencyInSeconds = 60
+
+[properties]
+; not mandatory
+SmartGearsDistribution = ${SmartGearsDistribution}
+SmartGearsDistributionBundle = ${SmartGearsDistributionBundle}
+
+[site]
+; mandatory
+; optional fields: latitude, logitude
+country = it
+location = rome
+
+;[proxy]
+; not mandatory
+;protocol = https
+;hostname = proxy
+;port = 80
+
+[authorization]
+; mandatory
+; optional fields: provider (=org.gcube.smartgears.security.DefaultAuthorizationProvider)
+provider = org.gcube.smartgears.security.DefaultAuthorizationProvider
+credentials.class = org.gcube.smartgears.security.SimpleCredentials
+credentials.clientID = testClient
+credentials.secret = testSecret
+
+;[persistence]
+; not mandatory (default is LocalPersistence writing in the ghn home)
+;class = utils.PersistenceWriterTest
+;location = /tmp 
diff --git a/distro/standalone.xml b/distro/standalone.xml
index 6d78709..9cd6c34 100644
--- a/distro/standalone.xml
+++ b/distro/standalone.xml
@@ -47,8 +47,8 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>${distroDirectory}/contents/samplecontainer.xml</source>
-			<destName>container.xml</destName>
+			<source>${distroDirectory}/contents/samplecontainer.ini</source>
+			<destName>container.ini</destName>
 			<filtered>true</filtered>
 		</file>
 	</files>
diff --git a/pom.xml b/pom.xml
index 7c1efc6..452ebbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>smartgears-distribution</artifactId>
-	<version>3.4.5</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>A distribution for the SmartGears Framework</name>
 
@@ -40,6 +40,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears</artifactId>
+			<version>[4.0.0-SNAPSHOT, 5.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>