From 03f5d140383fcfa689787976614ca8d6e9fbcdb1 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 9 Jan 2018 20:09:00 +0530 Subject: [PATCH 1/3] Adding androidAgentDownloadURL for the change-ip script --- modules/scripts/change-ip.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh index 7519a2b5..705cd4e9 100644 --- a/modules/scripts/change-ip.sh +++ b/modules/scripts/change-ip.sh @@ -62,6 +62,11 @@ sed -i -e 's/"identityProvider.*/\"identityProviderUrl\"\ :\ "https\:\/\/'$val2' sed -i -e 's/"acs.*/\"acs\"\ :\ "https\:\/\/'$val2':9443\/devicemgt\/uuf\/sso\/acs\"\,/' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/app-conf.json echo "Completed!!" +#-------------------- +echo "Changing /repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json" +sed -i -e 's/"androidAgentDownloadURL.*/\"androidAgentDownloadURL\":\ "https\:\/\/\%iot.manager.host\%\:\%iot.manager.https.port\%\/devicemgt\/public\/cdmf.unit.device.type.android.type-view\/assets\/android-agent.apk\",/' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json +echo "Completed!!" + #-------------------- echo "Changing /repository/deployment/server/jaggeryapps/api-store/site/conf/site.json" sed -i -e 's/"identityProvider.*/\"identityProviderURL\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json From 6909c055e6d2c5739983f4555f1dc2b0ca41b16c Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 9 Jan 2018 21:01:40 +0530 Subject: [PATCH 2/3] Removed android-web-agent app --- modules/distribution/src/assembly/bin.xml | 21 ------- .../android-web-agent/jaggery.conf | 58 ------------------- .../scripts/change-superadmin-credentials.sh | 7 --- 3 files changed, 86 deletions(-) delete mode 100644 modules/distribution/src/core/jaggeryapps/android-web-agent/jaggery.conf diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 7ab1f3fb..3ebe56cd 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -371,19 +371,6 @@ - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/android-web-agent/ - - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent - - - **/jaggery.conf - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps/ @@ -1503,14 +1490,6 @@ true 644 - - - src/core/jaggeryapps/android-web-agent/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent/ - - 755 - src/core/jaggeryapps/api-store/jaggery.conf diff --git a/modules/distribution/src/core/jaggeryapps/android-web-agent/jaggery.conf b/modules/distribution/src/core/jaggeryapps/android-web-agent/jaggery.conf deleted file mode 100644 index 7c33479a..00000000 --- a/modules/distribution/src/core/jaggeryapps/android-web-agent/jaggery.conf +++ /dev/null @@ -1,58 +0,0 @@ -{ - "displayName": "UUF Template App", - "logLevel": "warn", - "urlMappings": [ - { - "url": "/uuf/login", - "path": "/lib/modules/auth/login.jag" - }, - { - "url": "/uuf/logout", - "path": "/lib/modules/auth/logout.jag" - }, - { - "url": "/uuf/sso/acs", - "path": "/lib/modules/auth/acs.jag" - }, - { - "url": "/public/*", - "path": "/lib/static-files.jag" - }, - { - "url": "/unit/*", - "path": "/lib/units.jag" - }, - { - "url": "/*", - "path": "/lib/pages.jag" - } - ], - "filters": [ - { - "name": "ContentTypeBasedCachePreventionFilter", - "class": "org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter", - "params" : [ - {"name" : "patterns", "value" : "text/html\" ,application/json\" ,text/plain"}, - {"name" : "filterAction", "value" : "enforce"}, - {"name" : "httpHeaders", "value" : "Cache-Control: no-store, no-cache, must-revalidate, private"} - ] - }, - { - "name":"HttpHeaderSecurityFilter", - "class":"org.apache.catalina.filters.HttpHeaderSecurityFilter", - "params" : [{"name" : "hstsEnabled", "value" : "false"}] - } - - ], - "filterMappings": [ - { - "name":"HttpHeaderSecurityFilter", - "url":"*" - }, - { - "name":"ContentTypeBasedCachePreventionFilter", - "url":"*" - } - - ] -} diff --git a/modules/scripts/change-superadmin-credentials.sh b/modules/scripts/change-superadmin-credentials.sh index f51f1829..fc0d2aa5 100644 --- a/modules/scripts/change-superadmin-credentials.sh +++ b/modules/scripts/change-superadmin-credentials.sh @@ -129,9 +129,6 @@ if [ $val5 = "Y" ]; then sed -i -e 's#\("owner": "\)'$val1'\(@carbon.super"\)#\1'$val3'\2#g' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json echo "Completed!!" - echo "Changing /repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json" - sed -i -e 's#\("owner": "\)'$val1'\(@carbon.super"\)#\1'$val3'\2#g' ../repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json - echo "Completed!!" else if [ $val5 = "N" ]; then echo "" echo "Please enter the old tenant domain of the IoTS " @@ -153,10 +150,6 @@ else if [ $val5 = "N" ]; then sed -i -e 's#\("adminUser": "\)'$val1'\(@\)'$val6'\("\)#\1'$val3'\2'$val7'\3#g' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json sed -i -e 's#\("owner": "\)'$val1'\(@\)'$val6'\("\)#\1'$val3'\2'$val7'\3#g' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json echo "Completed!!" - - echo "Changing /repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json" - sed -i -e 's#\("owner": "\)'$val1'\(@\)'$val6'\("\)#\1'$val3'\2'$val7'\3#g' ../repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json - echo "Completed!!" fi fi From 0c89fe8b524c6d493ead6a65fe3f98ecf7af02d5 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 9 Jan 2018 21:07:27 +0530 Subject: [PATCH 3/3] Version bump in devicemgt and devicemgt-plugins --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68e6a17b..fc4c4f69 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.189 + 3.0.196 [3.0.0, 4.0.0) ${project.version} - 4.0.105 + 4.0.108 6.1.109