Merge branch 'develop'

.gitignore

@@ -140,3 +140,4 @@ target
 logs
 *.log
 
+*.jks

build.gradle

@@ -4,7 +4,7 @@ if (!hasProperty('mainClass')) {
 // initial extensions to gradle
 buildscript {
     ext {
-        springBootVersion = '1.5.11.RELEASE'
+        springBootVersion = '1.5.14.RELEASE'
     }
     repositories {
         mavenCentral()
@@ -34,7 +34,7 @@ apply plugin: 'idea'
 //apply plugin: 'com.cinnober.gradle.semver-git'
 
 // XXX please change with your commits according to http://semver.org/
-project.version = '0.0.2'
+project.version = '3.0.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -45,13 +45,6 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 
-// Spring related configs
-dependencyManagement {
-    imports {
-    //    mavenBom "org.springframework.cloud:spring-cloud-dependencies:Dalston.SR5"
-    }
-}
-
 /*
 Forces dependencies' cache invalidation for each build for dependencies marked with
     { changing = true }
@@ -76,15 +69,9 @@ dependencies {
             3) project dependency requires changes in settings.gradle file in this project
             4) never commit build.gradle which has project dependencies active as it will break CI builds
     */
-    //compile project(':SymbIoTeLibraries')
-    compile('com.github.symbiote-h2020:SymbIoTeLibraries:5+') { changing = true }
+    compile('com.github.symbiote-h2020:SymbIoTeLibraries:5.27+')
+
     // Spring
-    //compile('org.springframework.cloud:spring-cloud-starter')
-    //compile('org.springframework.cloud:spring-cloud-starter-config')
-    //compile('org.springframework.cloud:spring-cloud-starter-eureka')
-    //compile('org.springframework.cloud:spring-cloud-starter-zipkin')
-    //compile('org.springframework.boot:spring-boot-starter-amqp')
-    //compile("org.springframework.integration:spring-integration-mqtt:4+")
     compile('org.springframework.boot:spring-boot-starter-data-rest')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-data-mongodb')

saam/bootstrap.properties

@@ -10,7 +10,7 @@ logging.file=logs/AuthenticationAuthorizationManager.log
 aam.deployment.owner.username=loc_sspunidata
 aam.deployment.owner.password=loc_sspunidata123
 # absolute path to the saam-keystore.p12 file
-aam.security.KEY_STORE_FILE_NAME=file:///home/cnit/saam/saam-keystore.p12
+aam.security.KEY_STORE_FILE_NAME=file:///home/cnit/test/saam/saam-keystore.p12
 # name of the root ca certificate entry in the Keystore you produced using the SymbIoTeSecurity Factory
 aam.security.ROOT_CA_CERTIFICATE_ALIAS=caam
 # name of the certificate entry in the Keystore you produced using the SymbIoTeSecurity Factory
@@ -33,21 +33,21 @@ aam.security.PV_KEY_PASSWORD=pass123
 
 # Cache settings. If validated token is in cache, component certificate or available AAMs were aquired recently, value from cache is returned to avoid communication with another AAM. In case of missing, default values are used.
 # time (in milliseconds) for which valid token should be cached (DEFAULT: 60000)
-aam.cache.validToken.expireMillis=60000
+aam.cache.validToken.expireMillis=1800000
 # size of validToken cache. If size set to -1, validToken cache has no limit. (DEFAULT: 1000)
 aam.cache.validToken.size=1000
 # time (in seconds) for which componentCertificate should be cached (DEFAULT: 60)
-aam.cache.componentCertificate.expireSeconds=60
+aam.cache.componentCertificate.expireSeconds=600
 # time (in seconds) for which availableAAMs should be cached (DEFAULT: 60)
-aam.cache.availableAAMs.expireSeconds=60
+aam.cache.availableAAMs.expireSeconds=600
 
 #JWT validity time in milliseconds - how long the tokens issued to your users (apps) are valid... think maybe of an hour, day, week?
-aam.deployment.token.validityMillis=60000
+aam.deployment.token.validityMillis=1800000
 # allowing offline validation of foreign tokens by signature trust-chain only. Useful when foreign tokens are expected to be used along with no internet access
 aam.deployment.validation.allow-offline=true
 
 # needed to offer available aams service
-symbIoTe.core.interface.url=https://symbiote-dev.man.poznan.pl/coreInterface
+symbIoTe.core.interface.url=https://symbiote-open.man.poznan.pl/coreInterface/
 # needed to expose oneself to other components
 symbIoTe.localaam.url=http://localhost:8443
 # the external address for client to reach the AAM from the Internet

saam/cert.properties

@@ -1,9 +1,9 @@
 # From CloudConfigProperties application.properties file: symbIoTe.core.interface.url
-coreAAMAddress=https://symbiote-dev.man.poznan.pl/coreInterface
+coreAAMAddress=https://symbiote-open.man.poznan.pl/coreInterface
 
 # The user registered through administration in the symbIoTe Core
-serviceOwnerUsername=sspunidata
-serviceOwnerPassword=sspunidata123
+serviceOwnerUsername=SYMBIOTEUSER
+serviceOwnerPassword=SYMBIOTEPASSWORD
 
 # The SSP ID registered to the given service Owner
 serviceId=SSP_UNIDATA

saam/install_saam.sh

@@ -47,18 +47,22 @@ if [ -f "SymbIoTeSecurity-25.4.0-helper.jar" ]; then
 else
 	echo "SymbIoTeSecurity-25.4.0-helper.jar not exists, download and copy"
 	wget https://jitpack.io/com/github/symbiote-h2020/SymbIoTeSecurity/25.4.0/SymbIoTeSecurity-25.4.0-helper.jar 
-	if [ -f "cert.properties" ]; then
-		echo "cert.properties exists, generate saam-keystore.p12"
-		java -jar SymbIoTeSecurity-25.4.0-helper.jar cert.properties
-	else
-		echo "ERROR: cert.properties not exists, check your cert.properties first"
-		exit
-	fi
-
+
 fi
 
 echo "step 5:"
 echo "---------"
+if [ -f "cert.properties" ]; then
+	echo "cert.properties exists, generate saam-keystore.p12"
+	java -jar SymbIoTeSecurity-25.4.0-helper.jar cert.properties
+else
+	echo "ERROR: cert.properties not exists, check your cert.properties first"
+	exit
+fi
+
+
+echo "step 6:"
+echo "---------"
 #4 download SAM SymbioteSecuirty Helper
 if [ -f "AuthenticationAuthorizationManager-3.1.1-run.jar" ]; then
 	echo "AuthenticationAuthorizationManager-3.1.1-run.jar exists, skip download"