From 28cc40db786a5ef1b012077ee288fe171d6f819a Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 16 May 2017 15:01:16 +0530 Subject: [PATCH 1/5] Removing unwanted features from profiles. --- modules/distribution/pom.xml | 2 +- modules/distribution/src/assembly/bin.xml | 52 +- .../src/assembly/filter.properties | 1 + .../src/core/{README.txt => README} | 24 +- .../src/core/bin/profile-creator.bat | 39 +- .../src/core/bin/profile-creator.sh | 32 +- .../profiles/keymanager/axis2/axis2.xml | 725 ++++++++++++++++++ .../profiles/keymanager/tomcat/context.xml | 62 ++ .../profiles/manager/axis2/axis2.xml | 725 ++++++++++++++++++ modules/p2-profile/iot-core-profile/pom.xml | 473 ++---------- pom.xml | 1 - 11 files changed, 1659 insertions(+), 477 deletions(-) rename modules/distribution/src/core/{README.txt => README} (90%) create mode 100644 modules/distribution/src/core/resources/profiles/keymanager/axis2/axis2.xml create mode 100644 modules/distribution/src/core/resources/profiles/keymanager/tomcat/context.xml create mode 100644 modules/distribution/src/core/resources/profiles/manager/axis2/axis2.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 273f6383..3b8f7e43 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -188,7 +188,7 @@ ${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/input-event-adapters.xml - ../../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/input-event-adapters.xm + ../../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/input-event-adapters.xml src/core/conf/input-adapter-change.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 50fd397b..e90c4581 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -684,7 +684,7 @@ **/version.txt **/wso2carbon-version.txt **/wso2server.bat - **/README.txt + **/README **/LICENSE.txt **/release-notes.html **/webapp-mode/WEB-INF/web.xml @@ -957,7 +957,7 @@ **/version.txt **/wso2carbon-version.txt **/wso2server.bat - **/README.txt + **/README **/LICENSE.txt **/release-notes.html **/dbscripts @@ -1238,9 +1238,10 @@ ${pom.artifactId}-${pom.version}/conf/security - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version} true + README.txt 644 @@ -1255,12 +1256,6 @@ true 644 - - src/core/README.txt - ${pom.artifactId}-${pom.version}/bin/ - true - 644 - target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt ${pom.artifactId}-${pom.version}/bin/ @@ -1276,7 +1271,7 @@ 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/conf/ true 644 @@ -1611,13 +1606,6 @@ ${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/profile 644 - - - src/core/README.txt - ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ - true - 644 - target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ @@ -1630,37 +1618,37 @@ true - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/analytics/conf/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/analytics/repository/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/analytics/repository/database/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/analytics/repository/logs/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/ true 644 @@ -1753,12 +1741,6 @@ - - src/core/README.txt - ${pom.artifactId}-${pom.version}/wso2/broker/bin/ - true - 644 - target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt ${pom.artifactId}-${pom.version}/wso2/broker/bin/ @@ -1771,37 +1753,37 @@ true - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/broker/conf/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/broker/repository/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/broker/repository/database/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/broker/repository/deployment/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/broker/repository/logs/ true 644 - src/core/README.txt + src/core/README ${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/ true 644 diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index fd60d207..aeefa12d 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -19,6 +19,7 @@ product.name=WSO2 IoT Server product.key=IoT product.version=3.1.0-SNAPSHOT +product.doc.version=310 carbon.version=4.4.14 default.server.role=IoTServer diff --git a/modules/distribution/src/core/README.txt b/modules/distribution/src/core/README similarity index 90% rename from modules/distribution/src/core/README.txt rename to modules/distribution/src/core/README index b06d40c9..c0538982 100644 --- a/modules/distribution/src/core/README.txt +++ b/modules/distribution/src/core/README @@ -1,6 +1,6 @@ -WSO2 IoT Server 3.1.0 +WSO2 IoT Server @product.version@ ============================================================== -Welcome to the WSO2 IoT Server (IoTS) 3.1.0 release. +Welcome to the WSO2 IoT Server (IoTS) @product.version@ release. WSO2 IoT Server (IoTS) provides the essential capabilities required to implement a scalable server-side IoT Platform. These capabilities involve device management, API/App management for devices, analytics, customizable web portals, transport extensions for MQTT, XMPP @@ -12,15 +12,15 @@ the Apache Software License Version 2.0, one of the most business-friendly licen Key Features ================================== See the online WSO2 IoT documentation for more information on product features: -https://docs.wso2.com/display/IoTS300/About+this+Release +https://docs.wso2.com/display/IoTS@product.doc.version@/About+this+Release Installation & Running ================================== -Running the Integrator +Running the IoT server ================================== -1. Extract wso2iot-3.1.0.zip and go to the extracted directory/bin. +1. Extract wso2iot-@product.version@.zip and go to the extracted directory/bin. 2. Run iot-server.sh or iot-server.bat. 3. Point your favourite browser to https://localhost:9443/devicemgt in order to see the available device types and operations. 4. Use the following username and password to login @@ -32,16 +32,16 @@ Running the Integrator Running other runtimes individually (Analytics, Broker) ======================================================== -1. Extract wso2iot-3.1.0.zip and go to the extracted directory. -2. Go to wso2iot-3.1.0/wso2 directory. +1. Extract wso2iot-@product.version@.zip and go to the extracted directory. +2. Go to wso2iot-@product.version@/wso2 directory. 3. Go to appropriate runtime directory (analytics/broker) /bin. 4. Execute wso2server.sh or wso2server.bat. 3. Access the url related to the required runtime. (For example, use https://localhost:9445/carbon for the analytics runtime.) -Running all runtimes (Integrator, Analytics, Broker, Business-Process) +Running all runtimes (IoT, Analytics, Broker) ================================================================== -1. Extract wso2iot-3.1.0.zip and go to the extracted directory/bin. +1. Extract wso2iot-@product.version@.zip and go to the extracted directory/bin. 2. Run start-all.sh or start-all.bat. 3. Access appropriate url for the related runtime. (For example, use https://localhost:9443/devicemgt for the IoT Server runtime) @@ -53,7 +53,7 @@ System Requirements 2. The portal app requires full Javascript enablement on the Web browser -WSO2 EI distribution directory +WSO2 IoT distribution directory ============================================= - bin @@ -93,13 +93,13 @@ WSO2 EI distribution directory - LICENSE.txt Apache License 2.0 and the relevant other licenses under which - WSO2 EI is distributed. + WSO2 IoT is distributed. - README.txt This document. - release-notes.html - Release information for WSO2 IoT 3.1.0 + Release information for WSO2 IoT @product.version@ - patches Used to add patches related for all runtimes. diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat index b3bc7901..2aef85cd 100644 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ b/modules/distribution/src/core/bin/profile-creator.bat @@ -69,12 +69,31 @@ goto :eof for /R %DIR%..\repository\resources\profiles\keymanager %%f in (*.bat) do copy %%f %DIR%..\bin\ copy /y %DIR%..\repository\resources\profiles\keymanager\carbon.xml %DIR%..\conf\ copy /y %DIR%..\repository\resources\profiles\keymanager\identity\application-authentication.xml %DIR%..\conf\identity\ + copy /y %DIR%..\repository\resources\profiles\keymanager\tomcat\context.xml %DIR%..\conf\tomcat\ + copy /y %DIR%..\repository\resources\profiles\keymanager\axis2\axis2.xml %DIR%..\conf\axis2\ IF EXIST %DIR%..\repository\deployment\server\jaggeryapps @RD /S /Q %DIR%..\repository\deployment\server\jaggeryapps IF EXIST %DIR%..\repository\deployment\server\carbonapps @RD /S /Q %DIR%..\repository\deployment\server\carbonapps IF EXIST %DIR%..\repository\deployment\server\axis2services @RD /S /Q %DIR%..\repository\deployment\server\axis2services IF EXIST %DIR%..\repository\deployment\server\devicetypes @RD /S /Q %DIR%..\repository\deployment\server\devicetypes - IF EXIST %DIR%..\repository\deployment\server\synapse-configs\default\api @RD /S /Q %DIR%..\repository\deployment\server\synapse-configs\default\api - del /s /q /f %DIR%..\repository\deployment\server\synapse-configs\default\sequences\_*.xml + IF EXIST %DIR%..\repository\deployment\server\synapse-configs @RD /S /Q %DIR%..\repository\deployment\server\synapse-configs + IF EXIST %DIR%..\conf\cdm-config.xml del %DIR%..\conf\cdm-config.xml + IF EXIST %DIR%..\conf\app-manager.xml del %DIR%..\conf\app-manager.xml + If EXIST %DIR%..\conf\analytics @RD /S /Q %DIR%..\conf\analytics + IF EXIST %DIR%..\conf\apim-integration.xml del %DIR%..\conf\apim-integration.xml + IF EXIST %DIR%..\conf\certificate-config.xml del %DIR%..\conf\certificate-config.xml + IF EXIST %DIR%..\conf\data-bridge @RD /S /Q %DIR%..\conf\data-bridge + IF EXIST %DIR%..\conf\governance.xml del %DIR%..\conf\governance.xml + IF EXIST %DIR%..\conf\input-event-adapters.xml del %DIR%..\conf\input-event-adapters.xml + IF EXIST %DIR%..\conf\iot-api-config.xml del %DIR%..\conf\iot-api-config.xml + IF EXIST %DIR%..\conf\mobile-config.xml del %DIR%..\conf\mobile-config.xml + IF EXIST %DIR%..\conf\nhttp.properties del %DIR%..\conf\nhttp.properties + IF EXIST %DIR%..\conf\output-event-adapters.xml del %DIR%..\conf\output-event-adapters.xml + IF EXIST %DIR%..\conf\registry-event-broker.xml del %DIR%..\conf\registry-event-broker.xml + IF EXIST %DIR%..\conf\social.xml del %DIR%..\conf\social.xml + IF EXIST %DIR%..\conf\synapse-handlers.xml del %DIR%..\conf\synapse-handlers.xml + IF EXIST %DIR%..\conf\synapse.properties del %DIR%..\conf\synapse.properties + IF EXIST %DIR%..\conf\passthru-http.properties del %DIR%..\conf\passthru-http.properties + IF EXIST %DIR%..\conf\registry-event-broker.xml del %DIR%..\conf\registry-event-broker.xml mkdir %DIR%..\repository\deployment\server\tempwebapp copy /y %DIR%..\repository\deployment\server\webapps\oauth2.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ @@ -86,7 +105,6 @@ goto :eof mkdir %DIR%..\repository\deployment\server\axis2services mkdir %DIR%..\repository\deployment\server\devicetypes mkdir %DIR%..\repository\deployment\server\webapps - mkdir %DIR%..\repository\deployment\server\synapse-configs\default\api for /R %DIR%..\repository\deployment\server\tempwebapp %%f in (*.war) do copy %%f %DIR%..\repository\deployment\server\webapps\ IF EXIST %DIR%..\repository\deployment\server\tempwebapp @RD /S /Q %DIR%..\repository\deployment\server\tempwebapp IF EXIST %DIR%start-all.bat del %DIR%start-all.bat @@ -125,7 +143,6 @@ goto :eof IF EXIST %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war del %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war mkdir %DIR%..\repository\deployment\server\jaggeryapps mkdir %DIR%..\repository\deployment\server\axis2services - mkdir %DIR%..\repository\deployment\server\synapse-configs\default\api IF EXIST %DIR%..\conf\identity\sso-idp-config.xml del %DIR%..\conf\identity\sso-idp-config.xml IF EXIST %DIR%start-all.bat del %DIR%start-all.bat IF EXIST %DIR%start-all.sh del %DIR%start-all.sh @@ -136,7 +153,7 @@ goto :eof goto Exit :Manager - echo Preparing the Gateway profile distribution. + echo Preparing the Device Manager profile distribution. SET PROFILE=_device-manager call :COPY_DIST set DEFAULT_BUNDLES=%DIR%..\wso2\components\device-manager\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info @@ -151,8 +168,15 @@ goto :eof for /R %DIR%..\repository\resources\profiles\manager %%f in (*.sh) do copy %%f %DIR%..\bin\ for /R %DIR%..\repository\resources\profiles\manager %%f in (*.bat) do copy %%f %DIR%..\bin\ copy /y %DIR%..\repository\resources\profiles\manager\carbon.xml %DIR%..\conf\ - IF EXIST %DIR%..\repository\deployment\server\synapse-configs\default\api @RD /S /Q %DIR%..\repository\deployment\server\synapse-configs\default\api - del /s /q /f %DIR%..\repository\deployment\server\synapse-configs\default\sequences\_*.xml + copy /y %DIR%..\repository\resources\profiles\manager\axis2\axis2.xml %DIR%..\conf\axis2\ + IF EXIST %DIR%..\repository\deployment\server\synapse-configs @RD /S /Q %DIR%..\repository\deployment\server\synapse-configs + IF EXIST %DIR%..\conf\nhttp.properties del %DIR%..\conf\nhttp.properties + IF EXIST %DIR%..\conf\synapse-handlers.xml del %DIR%..\conf\synapse-handlers.xml + IF EXIST %DIR%..\conf\synapse.properties del %DIR%..\conf\synapse.properties + IF EXIST %DIR%..\conf\passthru-http.properties del %DIR%..\conf\passthru-http.properties + IF EXIST %DIR%..\conf\datasources\android-datasources.xml del %DIR%..\conf\datasources\android-datasources.xml + IF EXIST %DIR%..\conf\datasources\windows-datasources.xml del %DIR%..\conf\datasources\windows-datasources.xml + IF EXIST %DIR%..\conf\datasources\cdm-datasources.xml del %DIR%..\conf\datasources\cdm-datasources.xml mkdir %DIR%..\repository\deployment\server\tempwebapp copy /y %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\api#am#store#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ @@ -163,7 +187,6 @@ goto :eof IF EXIST %DIR%..\repository\deployment\server\webapps @RD /S /Q %DIR%..\repository\deployment\server\webapps IF EXIST %DIR%..\repository\deployment\server\axis2services @RD /S /Q %DIR%..\repository\deployment\server\axis2services mkdir %DIR%..\repository\deployment\server\axis2services - mkdir %DIR%..\repository\deployment\server\synapse-configs\default\api mkdir %DIR%..\repository\deployment\server\webapps for /R %DIR%..\repository\deployment\server\tempwebapp %%f in (*.war) do copy %%f %DIR%..\repository\deployment\server\webapps\ IF EXIST %DIR%..\conf\identity\sso-idp-config.xml del %DIR%..\conf\identity\sso-idp-config.xml diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index c4cb018a..3430c539 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -120,6 +120,7 @@ then cp -rf ${DIR}/../repository/resources/profiles/manager/*.sh ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/manager/*.bat ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/manager/carbon.xml ${DIR}/../conf/ + cp -rf ${DIR}/../repository/resources/profiles/manager/axis2/axis2.xml ${DIR}/../conf/axis2/ mkdir ${DIR}/../repository/deployment/server/tempwebapp cp ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ @@ -131,8 +132,11 @@ then cp -rf ${DIR}/../repository/deployment/server/tempwebapp/* ${DIR}/../repository/deployment/server/webapps/ rm -rf ${DIR}/../repository/deployment/server/tempwebapp rm -rf ${DIR}/../repository/deployment/server/axis2services/* - rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* - rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml + rm -rf ${DIR}/../repository/deployment/server/synapse-configs + rm -rf ${DIR}/../conf/nhttp.properties + rm -rf ${DIR}/../conf/synapse-handlers.xml + rm -rf ${DIR}/../conf/synapse.properties + rm -rf ${DIR}/../conf/passthru-http.properties rm -rf ${DIR}/../conf/identity/sso-idp-config.xml PROFILE="_device-manager" @@ -162,13 +166,33 @@ then rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat + rm -rf ${DIR}/../conf/cdm-config.xml ${DIR}/../conf/app-manager.xml ${DIR}/../conf/analytics + rm -rf ${DIR}/../conf/apim-integration.xml + rm -rf ${DIR}/../conf/certificate-config.xml + rm -rf ${DIR}/../conf/data-bridge + rm -rf ${DIR}/../conf/governance.xml + rm -rf ${DIR}/../conf/input-event-adapters.xml + rm -rf ${DIR}/../conf/iot-api-config.xml + rm -rf ${DIR}/../conf/mobile-config.xml + rm -rf ${DIR}/../conf/nhttp.properties + rm -rf ${DIR}/../conf/output-event-adapters.xml + rm -rf ${DIR}/../conf/registry-event-broker.xml + rm -rf ${DIR}/../conf/social.xml + rm -rf ${DIR}/../conf/synapse-handlers.xml + rm -rf ${DIR}/../conf/synapse.properties + rm -rf ${DIR}/../conf/passthru-http.properties + rm -rf ${DIR}/../conf/registry-event-broker.xml + rm -rf ${DIR}/../conf/datasources/android-datasources.xml + rm -rf ${DIR}/../conf/datasources/windows-datasources.xml + rm -rf ${DIR}/../conf/datasources/cdm-datasources.xml cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.bat ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/carbon.xml ${DIR}/../conf/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/identity/application-authentication.xml ${DIR}/../conf/identity/ + cp -rf ${DIR}/../repository/resources/profiles/keymanager/tomcat/context.xml ${DIR}/../conf/tomcat/ + cp -rf ${DIR}/../repository/resources/profiles/keymanager/axis2/axis2.xml ${DIR}/../conf/axis2/ rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* - rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* - rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml + rm -rf ${DIR}/../repository/deployment/server/synapse-configs mkdir ${DIR}/../repository/deployment/server/tempwebapp cp ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/throttle#data#v1.war ${DIR}/../repository/deployment/server/tempwebapp/ diff --git a/modules/distribution/src/core/resources/profiles/keymanager/axis2/axis2.xml b/modules/distribution/src/core/resources/profiles/keymanager/axis2/axis2.xml new file mode 100644 index 00000000..f99b343f --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/keymanager/axis2/axis2.xml @@ -0,0 +1,725 @@ + + + + + + + + + + + + + true + true + optional + true + work/mtom + 4000 + + ${childfirstCL} + + + true + + + true + + + + false + + inmemory + + + + + + + services + + + axis2services + + + axis2modules + + + WSO2 Data Analytics Server-3.1.0 + + + WSO2 Data Analytics Server-3.1.0 + + + + + + + false + + + + + + false + + + true + + + + ./repository/deployment/server/synapse-configs + + + + . + + + . + + + WSO2 Carbon Server + + + + + + + ${jaxwsparam} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9763 + + + + + + + + + + + + 9443 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + + true + + + HTTP/1.1 + chunked + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + diff --git a/modules/distribution/src/core/resources/profiles/keymanager/tomcat/context.xml b/modules/distribution/src/core/resources/profiles/keymanager/tomcat/context.xml new file mode 100644 index 00000000..7a4a4271 --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/keymanager/tomcat/context.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/core/resources/profiles/manager/axis2/axis2.xml b/modules/distribution/src/core/resources/profiles/manager/axis2/axis2.xml new file mode 100644 index 00000000..f99b343f --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/manager/axis2/axis2.xml @@ -0,0 +1,725 @@ + + + + + + + + + + + + + true + true + optional + true + work/mtom + 4000 + + ${childfirstCL} + + + true + + + true + + + + false + + inmemory + + + + + + + services + + + axis2services + + + axis2modules + + + WSO2 Data Analytics Server-3.1.0 + + + WSO2 Data Analytics Server-3.1.0 + + + + + + + false + + + + + + false + + + true + + + + ./repository/deployment/server/synapse-configs + + + + . + + + . + + + WSO2 Carbon Server + + + + + + + ${jaxwsparam} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9763 + + + + + + + + + + + + 9443 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + + true + + + HTTP/1.1 + chunked + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 2dd5845b..c46b7ffb 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -388,31 +388,31 @@ - org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.ws.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.ws.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.task.server.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.task.server.feature:${carbon.registry.version} @@ -611,10 +611,10 @@ - org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.server.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.server.feature:${carbon.registry.version} - org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.ui.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.ui.feature:${carbon.registry.version} @@ -657,7 +657,7 @@ - org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version} @@ -671,7 +671,7 @@ - org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.server.feature:${carbon.registry.version.iotcore} + org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.server.feature:${carbon.registry.version} @@ -1301,39 +1301,39 @@ org.wso2.carbon.registry.core.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.resource.properties.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.associations.dependencies.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.community.features.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ws.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.contentsearch.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.governance.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.task.server.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} @@ -1485,11 +1485,11 @@ org.wso2.carbon.registry.community.features.server.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.community.features.ui.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} @@ -1633,32 +1633,6 @@ ${product.iot.version} - - - org.wso2.carbon.appmgt.core.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.wso2emm.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mobile.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.services.api.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.appmgt.mdm.restconnector.feature.group - ${carbon.device.mgt.plugin.version} - - org.wso2.carbon.tenant.mgt.common.feature.group ${carbon.commons.version} @@ -1667,14 +1641,6 @@ org.wso2.carbon.core.feature.group ${carbon.kernel.version} - - org.apache.axis2.transport.mail.feature.group - ${axis2-transports.wso2.version} - - - org.wso2.carbon.identity.notification.mgt.feature.group - ${carbon.identity.framework.version} - org.wso2.carbon.identity.xacml.server.feature.group ${carbon.identity.framework.version} @@ -1695,14 +1661,6 @@ org.wso2.carbon.tenant.common.feature.group ${carbon.multitenancy.version} - - org.wso2.carbon.tenant.usage.agent.feature.group - ${carbon.multitenancy.version} - - - org.wso2.carbon.tenant.throttling.agent.feature.group - ${carbon.multitenancy.version} - org.wso2.carbon.tenant.deployment.feature.group ${carbon.multitenancy.version} @@ -1748,70 +1706,14 @@ org.wso2.carbon.core.runtime.feature.group ${carbon.kernel.version} - - org.wso2.carbon.ntask.core.feature.group - ${carbon.commons.version} - org.wso2.carbon.logging.mgt.feature.group ${carbon.commons.version} - - org.wso2.carbon.module.mgt.server.feature.group - ${carbon.deployment.version} - - - org.apache.synapse.wso2.feature.group - ${carbon.mediation.version} - - - org.apache.synapse.transport.nhttp.feature.group - ${carbon.mediation.version} - org.wso2.carbon.task.server.feature.group ${carbon.mediation.version} - - org.wso2.carbon.mediation.initializer.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.mediation.admin.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.inbound.endpoints.server.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.mediation.configadmin.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.mediator.cache.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.application.mgt.server.feature.group - ${carbon.commons.version} - - - org.wso2.carbon.application.mgt.synapse.server.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.application.mgt.feature.group - ${carbon.commons.version} - - - org.wso2.carbon.application.deployer.synapse.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.system.statistics.feature.group - ${carbon.commons.version} - org.wso2.carbon.security.mgt.feature.group ${carbon.identity.framework.version} @@ -1820,60 +1722,22 @@ org.wso2.carbon.security.mgt.server.feature.group ${carbon.identity.framework.version} - - org.wso2.carbon.service.mgt.server.feature.group - ${carbon.deployment.version} - - org.wso2.carbon.message.flows.feature.group ${carbon.commons.version} - org.wso2.carbon.registry.core.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.registry.core.server.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.registry.ui.menu.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.registry.ui.menu.governance.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.resource.properties.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.mediators.server.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.relay.server.feature.group - ${carbon.mediation.version} + ${carbon.registry.version} org.wso2.carbon.identity.provider.server.feature.group ${identity.inbound.auth.openid.version} - - org.wso2.carbon.event.common.feature.group - ${carbon.commons.version} - - - org.wso2.carbon.registry.associations.dependencies.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.registry.community.features.feature.group - ${carbon.registry.version.iotcore} - org.wso2.carbon.identity.oauth.feature.group ${identity.inbound.auth.oauth.version} @@ -1887,30 +1751,6 @@ org.wso2.carbon.deployment.synchronizer.feature.group ${carbon.commons.version} - - org.wso2.carbon.registry.community.features.server.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.registry.ws.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.registry.extensions.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.registry.extensions.server.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.governance.metadata.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.governance.lifecycle.management.feature.group - ${carbon.governance.version} - org.wso2.carbon.user.mgt.feature.group ${carbon.identity.framework.version} @@ -1939,14 +1779,6 @@ org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group ${identity.carbon.auth.saml2.version} - - org.wso2.carbon.apimgt.core.feature.group - ${carbon.api.mgt.version} - - - org.wso2.carbon.apimgt.gateway.feature.group - ${carbon.api.mgt.version} - org.wso2.carbon.apimgt.keymanager.feature.group ${carbon.api.mgt.version} @@ -1963,10 +1795,6 @@ org.wso2.carbon.apimgt.authenticator.oidc.feature.group ${carbon.api.mgt.version} - - org.wso2.carbon.apimgt.hostobjects.oidc.feature.group - ${carbon.api.mgt.version} - org.wso2.carbon.webapp.mgt.server.feature.group ${carbon.deployment.version} @@ -1979,116 +1807,32 @@ org.wso2.carbon.identity.user.profile.feature.group ${carbon.identity.framework.version} - - org.wso2.carbon.apimgt.application.extension.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.apimgt.integration.client.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.dynamic.client.registration.server.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.webapp.mgt.feature.group - ${carbon.deployment.version} - - - org.wso2.carbon.apimgt.webapp.publisher.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.dynamic.client.registration.server.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.oauth.extensions.feature.group ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.mobile.android.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.device.mgt.mobile.windows.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.apimgt.gateway.feature.group - ${carbon.api.mgt.version} - - - org.wso2.carbon.apimgt.application.extension.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.apimgt.integration.client.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.certificate.mgt.api.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.certificate.mgt.server.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.certificate.mgt.api.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.analytics.dashboard.feature.group + org.wso2.carbon.identity.jwt.client.extension.feature.group ${carbon.device.mgt.version} - org.wso2.carbon.identity.jwt.client.extension.feature.group - ${carbon.device.mgt.version} + org.wso2.carbon.identity.sso.saml.feature.group + ${identity.inbound.auth.saml.version} - org.wso2.carbon.analytics.api.client.feature.group - ${carbon.analytics.version} + org.wso2.carbon.relay.server.feature.group + ${carbon.mediation.version} - org.wso2.carbon.identity.sso.saml.feature.group - ${identity.inbound.auth.saml.version} + org.wso2.carbon.event.output.adapter.server.feature.group + ${carbon.analytics.common.version} @@ -2365,63 +2109,18 @@ org.wso2.carbon.module.mgt.server.feature.group ${carbon.deployment.version} - - org.apache.synapse.wso2.feature.group - ${carbon.mediation.version} - - - org.apache.synapse.transport.nhttp.feature.group - ${carbon.mediation.version} - org.wso2.carbon.task.server.feature.group ${carbon.mediation.version} - - org.wso2.carbon.mediation.initializer.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.mediation.admin.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.inbound.endpoints.server.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.mediation.configadmin.feature.group - ${carbon.mediation.version} - - - org.wso2.carbon.mediator.cache.feature.group - ${carbon.mediation.version} - - - - org.wso2.carbon.application.mgt.server.feature.group ${carbon.commons.version} - - org.wso2.carbon.application.mgt.synapse.server.feature.group - ${carbon.mediation.version} - org.wso2.carbon.application.mgt.feature.group ${carbon.commons.version} - - org.wso2.carbon.application.deployer.synapse.feature.group - ${carbon.mediation.version} - org.wso2.carbon.system.statistics.feature.group ${carbon.commons.version} @@ -2438,33 +2137,29 @@ org.wso2.carbon.service.mgt.server.feature.group ${carbon.deployment.version} - - org.wso2.carbon.message.flows.feature.group - ${carbon.commons.version} - org.wso2.carbon.social.feature.group ${carbon.store.version} org.wso2.carbon.registry.core.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.core.server.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.governance.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.resource.properties.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.mediators.server.feature.group @@ -2480,15 +2175,11 @@ org.wso2.carbon.registry.associations.dependencies.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.community.features.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.identity.provider.server.feature.group - ${identity.inbound.auth.openid.version} + ${carbon.registry.version} org.wso2.carbon.identity.oauth.feature.group @@ -2526,11 +2217,11 @@ org.wso2.carbon.registry.community.features.server.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ws.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.jaggeryjs.feature.group @@ -2560,10 +2251,6 @@ org.jaggeryjs.modules.ws.feature.group ${jaggery.extensions.version} - - org.wso2.carbon.apimgt.gateway.feature.group - ${carbon.api.mgt.version} - org.wso2.carbon.apimgt.rest.api.dcr.feature.group ${carbon.api.mgt.version} @@ -2642,7 +2329,7 @@ org.wso2.carbon.registry.contentsearch.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.forum.server.feature.group @@ -2730,10 +2417,6 @@ org.wso2.carbon.device.mgt.mobile.windows.feature.group ${carbon.device.mgt.plugin.version} - - org.wso2.carbon.apimgt.gateway.feature.group - ${carbon.api.mgt.version} - org.wso2.carbon.apimgt.application.extension.feature.group ${carbon.device.mgt.version} @@ -2990,18 +2673,6 @@ org.apache.axis2.transport.mail.feature.group ${axis2-transports.wso2.version} - - org.wso2.carbon.identity.notification.mgt.feature.group - ${carbon.identity.framework.version} - - - org.wso2.carbon.identity.xacml.server.feature.group - ${carbon.identity.framework.version} - - - org.wso2.carbon.identity.thrift.authentication.feature.group - ${carbon.identity.framework.version} - org.wso2.carbon.core.common.feature.group ${carbon.kernel.version} @@ -3014,10 +2685,6 @@ org.wso2.carbon.identity.user.profile.feature.group ${carbon.identity.framework.version} - - org.wso2.carbon.identity.application.authz.xacml.server.feature.group - ${identity.application.authz.xacml} - org.wso2.carbon.core.server.feature.group ${carbon.kernel.version} @@ -3107,10 +2774,6 @@ org.wso2.carbon.security.mgt.feature.group ${carbon.identity.framework.version} - - org.wso2.carbon.security.mgt.server.feature.group - ${carbon.identity.framework.version} - org.wso2.carbon.service.mgt.server.feature.group ${carbon.deployment.version} @@ -3121,23 +2784,23 @@ org.wso2.carbon.registry.core.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.core.server.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.governance.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.resource.properties.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.mediators.server.feature.group @@ -3153,19 +2816,11 @@ org.wso2.carbon.registry.associations.dependencies.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.community.features.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.identity.provider.server.feature.group - ${identity.inbound.auth.openid.version} - - - org.wso2.carbon.identity.oauth.feature.group - ${identity.inbound.auth.oauth.version} + ${carbon.registry.version} @@ -3179,31 +2834,21 @@ ${identity.outbound.auth.samlsso.version} - - - org.wso2.carbon.identity.application.authentication.framework.server.feature.group - - ${carbon.identity.framework.version} - org.wso2.carbon.tenant.mgt.common.server.feature.group ${carbon.commons.version} - - org.wso2.carbon.identity.user.registration.server.feature.group - ${carbon.identity.framework.version} - org.wso2.carbon.deployment.synchronizer.feature.group ${carbon.commons.version} org.wso2.carbon.registry.community.features.server.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.registry.ws.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.jaggeryjs.feature.group @@ -3277,10 +2922,6 @@ org.wso2.carbon.governance.lifecycle.management.feature.group ${carbon.governance.version} - - org.wso2.carbon.user.mgt.feature.group - ${carbon.identity.framework.version} - org.wso2.carbon.identity.core.feature.group ${carbon.identity.framework.version} @@ -3293,10 +2934,6 @@ org.wso2.carbon.um.ws.service.client.feature.group ${identity.user.ws.version} - - org.wso2.carbon.directory.service.mgr.feature.group - ${carbon.identity.framework.version} - org.wso2.carbon.claim.mgt.feature.group ${carbon.identity.framework.version} @@ -3315,7 +2952,7 @@ org.wso2.carbon.registry.contentsearch.feature.group - ${carbon.registry.version.iotcore} + ${carbon.registry.version} org.wso2.carbon.forum.server.feature.group @@ -3459,6 +3096,10 @@ org.wso2.carbon.analytics.jsservice.feature.group ${carbon.analytics.version} + + org.wso2.carbon.identity.application.authz.xacml.server.feature.group + ${identity.application.authz.xacml} + org.wso2.carbon.mediator.cache.feature.group ${carbon.mediation.version} diff --git a/pom.xml b/pom.xml index 381d410a..82c93351 100644 --- a/pom.xml +++ b/pom.xml @@ -1507,7 +1507,6 @@ 4.6.5 - 4.6.5 4.7.0 From 955294135a989825f3f9dd9756a4b80293c963f8 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 16 May 2017 15:08:14 +0530 Subject: [PATCH 2/5] Moving the config files to the key manager profile. --- modules/distribution/src/core/bin/profile-creator.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat index 2aef85cd..602cedc7 100644 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ b/modules/distribution/src/core/bin/profile-creator.bat @@ -94,6 +94,9 @@ goto :eof IF EXIST %DIR%..\conf\synapse.properties del %DIR%..\conf\synapse.properties IF EXIST %DIR%..\conf\passthru-http.properties del %DIR%..\conf\passthru-http.properties IF EXIST %DIR%..\conf\registry-event-broker.xml del %DIR%..\conf\registry-event-broker.xml + IF EXIST %DIR%..\conf\datasources\android-datasources.xml del %DIR%..\conf\datasources\android-datasources.xml + IF EXIST %DIR%..\conf\datasources\windows-datasources.xml del %DIR%..\conf\datasources\windows-datasources.xml + IF EXIST %DIR%..\conf\datasources\cdm-datasources.xml del %DIR%..\conf\datasources\cdm-datasources.xml mkdir %DIR%..\repository\deployment\server\tempwebapp copy /y %DIR%..\repository\deployment\server\webapps\oauth2.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\client-registration#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ @@ -174,9 +177,6 @@ goto :eof IF EXIST %DIR%..\conf\synapse-handlers.xml del %DIR%..\conf\synapse-handlers.xml IF EXIST %DIR%..\conf\synapse.properties del %DIR%..\conf\synapse.properties IF EXIST %DIR%..\conf\passthru-http.properties del %DIR%..\conf\passthru-http.properties - IF EXIST %DIR%..\conf\datasources\android-datasources.xml del %DIR%..\conf\datasources\android-datasources.xml - IF EXIST %DIR%..\conf\datasources\windows-datasources.xml del %DIR%..\conf\datasources\windows-datasources.xml - IF EXIST %DIR%..\conf\datasources\cdm-datasources.xml del %DIR%..\conf\datasources\cdm-datasources.xml mkdir %DIR%..\repository\deployment\server\tempwebapp copy /y %DIR%..\repository\deployment\server\webapps\api#am#publisher#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ copy /y %DIR%..\repository\deployment\server\webapps\api#am#store#v0.11.war %DIR%..\repository\deployment\server\tempwebapp\ From df48dbd3c081ae362bad1fc1612a122b7d92bc00 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 16 May 2017 15:18:42 +0530 Subject: [PATCH 3/5] Fixing the formatting issue. --- .../src/core/bin/profile-creator.sh | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 3430c539..36c7ca30 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -172,20 +172,20 @@ then rm -rf ${DIR}/../conf/data-bridge rm -rf ${DIR}/../conf/governance.xml rm -rf ${DIR}/../conf/input-event-adapters.xml - rm -rf ${DIR}/../conf/iot-api-config.xml - rm -rf ${DIR}/../conf/mobile-config.xml - rm -rf ${DIR}/../conf/nhttp.properties - rm -rf ${DIR}/../conf/output-event-adapters.xml - rm -rf ${DIR}/../conf/registry-event-broker.xml - rm -rf ${DIR}/../conf/social.xml - rm -rf ${DIR}/../conf/synapse-handlers.xml - rm -rf ${DIR}/../conf/synapse.properties - rm -rf ${DIR}/../conf/passthru-http.properties - rm -rf ${DIR}/../conf/registry-event-broker.xml - rm -rf ${DIR}/../conf/datasources/android-datasources.xml - rm -rf ${DIR}/../conf/datasources/windows-datasources.xml - rm -rf ${DIR}/../conf/datasources/cdm-datasources.xml - cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ + rm -rf ${DIR}/../conf/iot-api-config.xml + rm -rf ${DIR}/../conf/mobile-config.xml + rm -rf ${DIR}/../conf/nhttp.properties + rm -rf ${DIR}/../conf/output-event-adapters.xml + rm -rf ${DIR}/../conf/registry-event-broker.xml + rm -rf ${DIR}/../conf/social.xml + rm -rf ${DIR}/../conf/synapse-handlers.xml + rm -rf ${DIR}/../conf/synapse.properties + rm -rf ${DIR}/../conf/passthru-http.properties + rm -rf ${DIR}/../conf/registry-event-broker.xml + rm -rf ${DIR}/../conf/datasources/android-datasources.xml + rm -rf ${DIR}/../conf/datasources/windows-datasources.xml + rm -rf ${DIR}/../conf/datasources/cdm-datasources.xml + cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.bat ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/carbon.xml ${DIR}/../conf/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/identity/application-authentication.xml ${DIR}/../conf/identity/ From 52fb2f732f7f39e269d98cf416f9f9b7d7f21f9b Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 16 May 2017 15:22:14 +0530 Subject: [PATCH 4/5] Fixing the formatting issue. --- modules/distribution/src/core/bin/profile-creator.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 36c7ca30..b4ec1ce4 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -135,8 +135,8 @@ then rm -rf ${DIR}/../repository/deployment/server/synapse-configs rm -rf ${DIR}/../conf/nhttp.properties rm -rf ${DIR}/../conf/synapse-handlers.xml - rm -rf ${DIR}/../conf/synapse.properties - rm -rf ${DIR}/../conf/passthru-http.properties + rm -rf ${DIR}/../conf/synapse.properties + rm -rf ${DIR}/../conf/passthru-http.properties rm -rf ${DIR}/../conf/identity/sso-idp-config.xml PROFILE="_device-manager" From b2495ad414a74e80271a791c52631dfb2dd773e9 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 16 May 2017 15:23:44 +0530 Subject: [PATCH 5/5] Fixing the formatting issue. --- modules/distribution/src/core/bin/profile-creator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index b4ec1ce4..7526460f 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -185,7 +185,7 @@ then rm -rf ${DIR}/../conf/datasources/android-datasources.xml rm -rf ${DIR}/../conf/datasources/windows-datasources.xml rm -rf ${DIR}/../conf/datasources/cdm-datasources.xml - cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.bat ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/carbon.xml ${DIR}/../conf/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/identity/application-authentication.xml ${DIR}/../conf/identity/