From b94b171057cce7d344bfd2f73e0cb845793ad4d3 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 8 May 2017 11:47:31 +0530 Subject: [PATCH] Removing gateway profile, and merging it with device backend. --- .../src/core/bin/profile-creator.bat | 63 +- .../src/core/bin/profile-creator.sh | 155 ++-- .../resources/profiles/backend/iot-server.bat | 2 +- .../resources/profiles/backend/iot-server.sh | 8 +- .../resources/profiles/gateway/carbon.xml | 688 ------------------ .../resources/profiles/gateway/iot-server.bat | 182 ----- .../resources/profiles/gateway/iot-server.sh | 341 --------- .../profiles/keymanager/iot-server.bat | 2 +- .../profiles/keymanager/iot-server.sh | 8 +- .../resources/profiles/manager/iot-server.bat | 2 +- .../resources/profiles/manager/iot-server.sh | 8 +- modules/p2-profile/iot-core-profile/pom.xml | 428 +---------- 12 files changed, 89 insertions(+), 1798 deletions(-) delete mode 100644 modules/distribution/src/core/resources/profiles/gateway/carbon.xml delete mode 100644 modules/distribution/src/core/resources/profiles/gateway/iot-server.bat delete mode 100755 modules/distribution/src/core/resources/profiles/gateway/iot-server.sh diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat index 9bbb8296..b3bc7901 100644 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ b/modules/distribution/src/core/bin/profile-creator.bat @@ -24,23 +24,21 @@ REM get the desired profile echo This tool will erase all the files which are not required for the selected profile echo and provide you a light weight package for the target profile. echo WSO2 IoT Server Supports following profiles. -echo 1.IoT Gateway Profile -echo 2.IoT Key Manager Profile -echo 3.IoT Device Backend Profile -echo 4.IoT Device Manager Profile -echo 5.Analytics Profile -echo 6.Broker profile -echo 7.For All Profiles +echo 1.IoT Device Backend Profile +echo 2.IoT Device Manager Profile +echo 3.IoT Key Manager Profile +echo 4.Analytics Profile +echo 5.Broker profile +echo 6.All Profiles set /p profileNumber= [Please enter the desired profile number to create the profile specific distribution] -IF /I "%profileNumber%" EQU "1" goto Gateway -IF /I "%profileNumber%" EQU "2" goto KeyManager -IF /I "%profileNumber%" EQU "3" goto Backend -IF /I "%profileNumber%" EQU "4" goto Manager -IF /I "%profileNumber%" EQU "5" goto Analytics -IF /I "%profileNumber%" EQU "6" goto Broker -IF /I "%profileNumber%" EQU "7" goto All +IF /I "%profileNumber%" EQU "1" goto Backend +IF /I "%profileNumber%" EQU "2" goto Manager +IF /I "%profileNumber%" EQU "3" goto KeyManager +IF /I "%profileNumber%" EQU "4" goto Analytics +IF /I "%profileNumber%" EQU "5" goto Broker +IF /I "%profileNumber%" EQU "6" goto All echo Invalid profile identifier. @@ -53,37 +51,6 @@ xcopy %DIR%..\..\%DISTRIBUTION% %TEMPDIR%\%DISTRIBUTION%\ /s /e /h set DIR=%TEMPDIR%\%DISTRIBUTION%\bin\ goto :eof -:Gateway - echo Preparing the Gateway profile distribution. - SET PROFILE=_gateway - call :COPY_DIST - set DEFAULT_BUNDLES=%DIR%..\wso2\components\http-gateway\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - call :Remove_BROKER - call :Remove_ANALYTICS - call :Remove_JARS - IF EXIST %DIR%..\wso2\components\default @RD /S /Q %DIR%..\wso2\components\default - IF EXIST %DIR%..\wso2\components\device-backend @RD /S /Q %DIR%..\wso2\components\device-backend - IF EXIST %DIR%..\wso2\components\device-key-manager @RD /S /Q %DIR%..\wso2\components\device-key-manager - IF EXIST %DIR%..\wso2\components\device-manager @RD /S /Q %DIR%..\wso2\components\device-manager - IF EXIST %DIR%..\samples @RD /S /Q %DIR%..\samples - IF EXIST %DIR%..\plugins @RD /S /Q %DIR%..\plugins - for /R %DIR%..\repository\resources\profiles\gateway %%f in (*.sh) do copy %%f %DIR%..\bin\ - for /R %DIR%..\repository\resources\profiles\gateway %%f in (*.bat) do copy %%f %DIR%..\bin\ - copy /y %DIR%..\repository\resources\profiles\gateway\carbon.xml %DIR%..\conf\ - IF EXIST %DIR%..\repository\deployment\server\jaggeryapps @RD /S /Q %DIR%..\repository\deployment\server\jaggeryapps - IF EXIST %DIR%..\repository\deployment\server\webapps @RD /S /Q %DIR%..\repository\deployment\server\webapps - 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 - mkdir %DIR%..\repository\deployment\server\jaggeryapps - mkdir %DIR%..\repository\deployment\server\webapps - mkdir %DIR%..\repository\deployment\server\carbonapps - mkdir %DIR%..\repository\deployment\server\axis2services - mkdir %DIR%..\repository\deployment\server\devicetypes - IF EXIST %DIR%..\conf\identity\sso-idp-config.xml del %DIR%..\conf\identity\sso-idp-config.xml - call :RENAME_DIST - echo Gateway profile created successfully in %TEMPDIR%\%DISTRIBUTION%%PROFILE%. - goto Exit :KeyManager echo Preparing the KeyManager profile distribution. @@ -94,7 +61,6 @@ goto :eof call :Remove_ANALYTICS call :Remove_JARS IF EXIST %DIR%..\wso2\components\default @RD /S /Q %DIR%..\wso2\components\default - IF EXIST %DIR%..\wso2\components\http-gateway @RD /S /Q %DIR%..\wso2\components\http-gateway IF EXIST %DIR%..\wso2\components\device-backend @RD /S /Q %DIR%..\wso2\components\device-backend IF EXIST %DIR%..\wso2\components\device-manager @RD /S /Q %DIR%..\wso2\components\device-manager IF EXIST %DIR%..\samples @RD /S /Q %DIR%..\samples @@ -140,7 +106,6 @@ goto :eof call :Remove_ANALYTICS call :Remove_JARS IF EXIST %DIR%..\wso2\components\default @RD /S /Q %DIR%..\wso2\components\default - IF EXIST %DIR%..\wso2\components\http-gateway @RD /S /Q %DIR%..\wso2\components\http-gateway IF EXIST %DIR%..\wso2\components\device-key-manager @RD /S /Q %DIR%..\wso2\components\device-key-manager IF EXIST %DIR%..\wso2\components\device-manager @RD /S /Q %DIR%..\wso2\components\device-manager IF EXIST %DIR%..\samples @RD /S /Q %DIR%..\samples @@ -148,8 +113,6 @@ goto :eof for /R %DIR%..\repository\resources\profiles\backend %%f in (*.sh) do copy %%f %DIR%..\bin\ for /R %DIR%..\repository\resources\profiles\backend %%f in (*.bat) do copy %%f %DIR%..\bin\ copy /y %DIR%..\repository\resources\profiles\backend\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 IF EXIST %DIR%..\repository\deployment\server\jaggeryapps @RD /S /Q %DIR%..\repository\deployment\server\jaggeryapps IF EXIST %DIR%..\repository\deployment\server\axis2services @RD /S /Q %DIR%..\repository\deployment\server\axis2services IF EXIST %DIR%..\repository\deployment\server\webapps\shindig.war del %DIR%..\repository\deployment\server\webapps\shindig.war @@ -181,7 +144,6 @@ goto :eof call :Remove_ANALYTICS call :Remove_JARS IF EXIST %DIR%..\wso2\components\default @RD /S /Q %DIR%..\wso2\components\default - IF EXIST %DIR%..\wso2\components\http-gateway @RD /S /Q %DIR%..\wso2\components\http-gateway IF EXIST %DIR%..\wso2\components\device-key-manager @RD /S /Q %DIR%..\wso2\components\device-key-manager IF EXIST %DIR%..\wso2\components\device-backend @RD /S /Q %DIR%..\wso2\components\device-backend IF EXIST %DIR%..\samples @RD /S /Q %DIR%..\samples @@ -274,7 +236,6 @@ goto :eof IF EXIST %DIR%..\wso2\components\device-manager @RD /S /Q %DIR%..\wso2\components\device-manager IF EXIST %DIR%..\wso2\components\device-key-manager @RD /S /Q %DIR%..\wso2\components\device-key-manager IF EXIST %DIR%..\wso2\components\device-backend @RD /S /Q %DIR%..\wso2\components\device-backend - IF EXIST %DIR%..\wso2\components\http-gateway @RD /S /Q %DIR%..\wso2\components\http-gateway IF EXIST %DIR%..\samples @RD /S /Q %DIR%..\samples IF EXIST %DIR%..\modules @RD /S /Q %DIR%..\modules IF EXIST %DIR%..\dbscripts @RD /S /Q %DIR%..\dbscripts diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 25668003..c4cb018a 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -29,13 +29,12 @@ BINDIR=$(pwd) echo "This tool will erase all the files which are not required for the selected profile " echo "and also creates a distribution of this profile in the same folder resides." echo "WSO2 IoT Server Supports following profiles." -echo " 1.IoT Gateway Profile" -echo " 2.IoT Key Manager Profile" -echo " 3.IoT Device Backend Profile" -echo " 4.IoT Device Manager Profile" -echo " 5.Analytics Profile" -echo " 6.Broker profile" -echo " 7.For All Profiles" +echo " 1.IoT Device Backend Profile" +echo " 2.IoT Device Manager Profile" +echo " 3.IoT Key Manager Profile" +echo " 4.Analytics Profile" +echo " 5.Broker profile" +echo " 6.All Profiles" echo "Please enter the desired profile number to create the profile specific distribution." read profileNumber @@ -55,11 +54,11 @@ if [ "$profileNumber" -lt 7 ] && [ "$profileNumber" -gt 0 ] ; then DIR=${TEMPDIR}/${DISTRIBUTION}/bin fi -#gateway profile +#device backend profile if [ ${profileNumber} -eq 1 ] then - echo "Preparing the IoT Gateway profile distribution" - DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/http-gateway/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" + echo "Preparing the IoT Device Backend profile distribution" + DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-backend/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" rm -rf ${DIR}/../wso2/broker @@ -76,28 +75,27 @@ then #remove iot echo "Removing IoT Other profiles" - rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager + rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat - cp -rf ${DIR}/../repository/resources/profiles/gateway/*.sh ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/gateway/*.bat ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ + cp -rf ${DIR}/../repository/resources/profiles/backend/*.sh ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/backend/*.bat ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/backend/carbon.xml ${DIR}/../conf/ + rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war + rm -rf ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* - rm -rf ${DIR}/../repository/deployment/server/webapps/* - rm -rf ${DIR}/../repository/deployment/server/carbonapps/* rm -rf ${DIR}/../repository/deployment/server/axis2services/* - rm -rf ${DIR}/../repository/deployment/server/devicetypes/* rm -rf ${DIR}/../conf/identity/sso-idp-config.xml - PROFILE="_gateway" + PROFILE="_device-backend" -#key-manager profile +#device manager profile elif [ ${profileNumber} -eq 2 ] then - echo "Preparing the IoT Keymanager profile distribution" - DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-key-manager/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" + echo "Preparing the IoT Device Manager profile distribution" + DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-manager/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" rm -rf ${DIR}/../wso2/broker @@ -114,77 +112,35 @@ then #remove iot echo "Removing IoT Other profiles" - rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/http-gateway ${DIR}/../wso2/components/device-manager + rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-backend rm -rf ${DIR}/../samples/ rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat - 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/ - 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 + 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/ 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/ - cp ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/authenticationendpoint.war ${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/ + cp ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/tempwebapp/ rm -rf ${DIR}/../repository/deployment/server/webapps/* 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/carbonapps/* rm -rf ${DIR}/../repository/deployment/server/axis2services/* - rm -rf ${DIR}/../repository/deployment/server/devicetypes/* - - PROFILE="_keymanager" - -#device backend profile -elif [ ${profileNumber} -eq 3 ] -then - echo "Preparing the IoT Device Backend profile distribution" - DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-backend/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" - #remove broker - echo "Removing Broker profile" - rm -rf ${DIR}/../wso2/broker - rm -rf ${DIR}/../wso2/components/broker-default - rm -rf ${DIR}/broker.bat - rm -rf ${DIR}/broker.sh - - #remove analytics - echo "Removing Analytics profile" - rm -rf ${DIR}/../wso2/analytics - rm -rf ${DIR}/../wso2/components/analytics-default - rm -rf ${DIR}/analytics.bat - rm -rf ${DIR}/analytics.sh - - #remove iot - echo "Removing IoT Other profiles" - rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/http-gateway ${DIR}/../wso2/components/device-manager - rm -rf ${DIR}/../samples/ - rm -rf ${DIR}/../plugins - rm -rf ${DIR}/profile-creator.sh - rm -rf ${DIR}/profile-creator.bat rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml - cp -rf ${DIR}/../repository/resources/profiles/backend/*.sh ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/backend/*.bat ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/backend/carbon.xml ${DIR}/../conf/ - rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war - rm -rf ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war - rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* - rm -rf ${DIR}/../repository/deployment/server/axis2services/* rm -rf ${DIR}/../conf/identity/sso-idp-config.xml - PROFILE="_device-backend" - -#device manager profile -elif [ ${profileNumber} -eq 4 ] + PROFILE="_device-manager" +#key-manager profile +elif [ ${profileNumber} -eq 3 ] then - echo "Preparing the IoT Device Manager profile distribution" - DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-manager/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" + echo "Preparing the IoT Keymanager profile distribution" + DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-key-manager/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" rm -rf ${DIR}/../wso2/broker @@ -201,33 +157,36 @@ then #remove iot echo "Removing IoT Other profiles" - rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/http-gateway ${DIR}/../wso2/components/device-backend + rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat - 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/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/ + 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 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/ - cp ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war ${DIR}/../repository/deployment/server/tempwebapp/ - cp ${DIR}/../repository/deployment/server/webapps/shindig.war ${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/ + cp ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/authenticationendpoint.war ${DIR}/../repository/deployment/server/tempwebapp/ rm -rf ${DIR}/../repository/deployment/server/webapps/* 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/carbonapps/* 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}/../conf/identity/sso-idp-config.xml + rm -rf ${DIR}/../repository/deployment/server/devicetypes/* + + PROFILE="_keymanager" - PROFILE="_device-manager" #Analytics profile -elif [ ${profileNumber} -eq 5 ] +elif [ ${profileNumber} -eq 4 ] then echo "Preparing the Analytics profile distribution" DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/analytics-default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" @@ -241,7 +200,7 @@ then #remove intergrator echo "Removing IoT profiles" rm -rf ${DIR}/../conf - rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager ${DIR}/../wso2/components/http-gateway + rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ rm -rf ${DIR}/../modules rm -rf ${DIR}/../dbscripts @@ -259,7 +218,7 @@ then PROFILE="_analytics" -elif [ ${profileNumber} -eq 6 ] +elif [ ${profileNumber} -eq 5 ] then echo "Preparing the Broker profile distribution" DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/broker-default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" @@ -273,7 +232,7 @@ then #remove iot echo "Removing IoT profiles" rm -rf ${DIR}/../conf - rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager ${DIR}/../wso2/components/http-gateway + rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ rm -rf ${DIR}/../modules rm -rf ${DIR}/../dbscripts @@ -317,9 +276,9 @@ DIR=${BINDIR} echo "Profile created successfully in "$(pwd)"/"${DISTRIBUTION}${PROFILE} } -if [ ${profileNumber} -eq 7 ]; then +if [ ${profileNumber} -eq 6 ]; then profileNumber=1 - while [ "$profileNumber" -lt 7 ] + while [ "$profileNumber" -lt 6 ] do create_profile ((profileNumber++)) diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat index d40a4c30..1e5c7704 100644 --- a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=device-backend -set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.gateway.carbon.https.port="9448" -Diot.gateway.carbon.http.port="9768" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% +set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8244" -Diot.gateway.http.port="8281" -Diot.gateway.carbon.https.port="9444" -Diot.gateway.carbon.http.port="9764" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :runJava echo JAVA_HOME environment variable is set to %JAVA_HOME% echo CARBON_HOME environment variable is set to %CARBON_HOME% diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh index dfbee89f..c182e1fd 100755 --- a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh @@ -327,10 +327,10 @@ do -Diot.keymanager.host="localhost" \ -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8248" \ - -Diot.gateway.http.port="8285" \ - -Diot.gateway.carbon.https.port="9448" \ - -Diot.gateway.carbon.http.port="9768" \ + -Diot.gateway.https.port="8244" \ + -Diot.gateway.http.port="8281" \ + -Diot.gateway.carbon.https.port="9444" \ + -Diot.gateway.carbon.http.port="9764" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/distribution/src/core/resources/profiles/gateway/carbon.xml b/modules/distribution/src/core/resources/profiles/gateway/carbon.xml deleted file mode 100644 index 9f90eed4..00000000 --- a/modules/distribution/src/core/resources/profiles/gateway/carbon.xml +++ /dev/null @@ -1,688 +0,0 @@ - - - - - - - - - ${product.name} - - - ${product.key} - - - ${product.version} - - - - localhost - - - localhost - - - local:/${carbon.context}/services/ - - - - - - - ${default.server.role} - ${cdmf.analytics.role} - CDMFPlatform - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 5 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 30 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT - - - - - - - - true - - - - - - true - - diff --git a/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat b/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat deleted file mode 100644 index c805976d..00000000 --- a/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat +++ /dev/null @@ -1,182 +0,0 @@ -@echo off - -REM --------------------------------------------------------------------------- -REM Copyright 2005-2009 WSO2, Inc. http://www.wso2.org -REM -REM Licensed under the Apache License, Version 2.0 (the "License"); -REM you may not use this file except in compliance with the License. -REM You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. - -rem --------------------------------------------------------------------------- -rem Main Script for WSO2 Carbon -rem -rem Environment Variable Prequisites -rem -rem CARBON_HOME Home of CARBON installation. If not set I will try -rem to figure it out. -rem -rem -rem JAVA_HOME Must point at your Java Development Kit installation. -rem -rem JAVA_OPTS (Optional) Java runtime options used when the commands -rem is executed. -rem --------------------------------------------------------------------------- - -rem ----- if JAVA_HOME is not set we're not happy ------------------------------ -:checkJava - -if "%JAVA_HOME%" == "" goto noJavaHome -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -goto checkServer - -:noJavaHome -echo "You must set the JAVA_HOME variable before running CARBON." -goto end - -rem ----- Only set CARBON_HOME if not already set ---------------------------- -:checkServer -rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed -SET CARBON_HOME=%~sdp0.. -SET curDrive=%cd:~0,1% -SET wsasDrive=%CARBON_HOME:~0,1% -if not "%curDrive%" == "%wsasDrive%" %wsasDrive%: - -rem find CARBON_HOME if it does not exist due to either an invalid value passed -rem by the user or the %0 problem on Windows 9x -if not exist "%CARBON_HOME%\bin\version.txt" goto noServerHome - -set AXIS2_HOME=%CARBON_HOME% -goto updateClasspath - -:noServerHome -echo CARBON_HOME is set incorrectly or CARBON could not be located. Please set CARBON_HOME. -goto end - -rem ----- update classpath ----------------------------------------------------- -:updateClasspath - -setlocal EnableDelayedExpansion -cd %CARBON_HOME% -set CARBON_CLASSPATH= -FOR %%C in ("%CARBON_HOME%\bin\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\bin\%%~nC%%~xC" - -set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%CARBON_CLASSPATH%; - -FOR %%D in ("%CARBON_HOME%\wso2\lib\commons-lang*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\lib\%%~nD%%~xD" - -rem ----- Process the input command ------------------------------------------- - -rem Slurp the command line arguments. This loop allows for an unlimited number -rem of arguments (up to the command line limit, anyway). - - -:setupArgs -if ""%1""=="""" goto doneStart - -if ""%1""==""-run"" goto commandLifecycle -if ""%1""==""--run"" goto commandLifecycle -if ""%1""==""run"" goto commandLifecycle - -if ""%1""==""-restart"" goto commandLifecycle -if ""%1""==""--restart"" goto commandLifecycle -if ""%1""==""restart"" goto commandLifecycle - -if ""%1""==""debug"" goto commandDebug -if ""%1""==""-debug"" goto commandDebug -if ""%1""==""--debug"" goto commandDebug - -if ""%1""==""version"" goto commandVersion -if ""%1""==""-version"" goto commandVersion -if ""%1""==""--version"" goto commandVersion - -shift -goto setupArgs - -rem ----- commandVersion ------------------------------------------------------- -:commandVersion -shift -type "%CARBON_HOME%\bin\version.txt" -type "%CARBON_HOME%\bin\wso2carbon-version.txt" -goto end - -rem ----- commandDebug --------------------------------------------------------- -:commandDebug -shift -set DEBUG_PORT=%1 -if "%DEBUG_PORT%"=="" goto noDebugPort -if not "%JAVA_OPTS%"=="" echo Warning !!!. User specified JAVA_OPTS will be ignored, once you give the --debug option. -set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%DEBUG_PORT% -echo Please start the remote debugging client to continue... -goto findJdk - -:noDebugPort -echo Please specify the debug port after the --debug option -goto end - -rem ----- commandLifecycle ----------------------------------------------------- -:commandLifecycle -goto findJdk - -:doneStart -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal - -rem ---------- Handle the SSL Issue with proper JDK version -------------------- -rem find the version of the jdk -:findJdk - -set CMD=RUN %* - -:checkJdk17 -"%JAVA_HOME%\bin\java" -version 2>&1 | findstr /r "1.[7|8]" >NUL -IF ERRORLEVEL 1 goto unknownJdk -goto jdk17 - -:unknownJdk -echo Starting WSO2 Carbon (in unsupported JDK) -echo [ERROR] CARBON is supported only on JDK 1.7 and 1.8 -goto jdk17 - -:jdk17 -goto runServer - -rem ----------------- Execute The Requested Command ---------------------------- - -:runServer -cd %CARBON_HOME% - -rem ------------------ Remove tmp folder on startup ----------------------------- -set TMP_DIR=%CARBON_HOME%\tmp -cd "%TMP_DIR%" -del *.* /s /q > nul -FOR /d %%G in ("*.*") DO rmdir %%G /s /q -cd .. - -rem ---------- Add jars to classpath ---------------- - -set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH% - -set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" - -set profile=-Dprofile=http-gateway - -set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.gateway.carbon.https.port="9448" -Diot.gateway.carbon.http.port="9768" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% -:runJava -echo JAVA_HOME environment variable is set to %JAVA_HOME% -echo CARBON_HOME environment variable is set to %CARBON_HOME% -"%JAVA_HOME%\bin\java" %CMD_LINE_ARGS% org.wso2.carbon.bootstrap.Bootstrap %CMD% -if "%ERRORLEVEL%"=="121" goto runJava -:end -goto endlocal - -:endlocal - -:END \ No newline at end of file diff --git a/modules/distribution/src/core/resources/profiles/gateway/iot-server.sh b/modules/distribution/src/core/resources/profiles/gateway/iot-server.sh deleted file mode 100755 index dae9e8a0..00000000 --- a/modules/distribution/src/core/resources/profiles/gateway/iot-server.sh +++ /dev/null @@ -1,341 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Copyright 2005-2012 WSO2, Inc. http://www.wso2.org -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ---------------------------------------------------------------------------- -# Main Script for the WSO2 Carbon Server -# -# Environment Variable Prequisites -# -# CARBON_HOME Home of WSO2 Carbon installation. If not set I will try -# to figure it out. -# -# JAVA_HOME Must point at your Java Development Kit installation. -# -# JAVA_OPTS (Optional) Java runtime options used when the commands -# is executed. -# -# NOTE: Borrowed generously from Apache Tomcat startup scripts. -# ----------------------------------------------------------------------------- - -# OS specific support. $var _must_ be set to either true or false. -#ulimit -n 100000 - -cygwin=false; -darwin=false; -os400=false; -mingw=false; -case "`uname`" in -CYGWIN*) cygwin=true;; -MINGW*) mingw=true;; -OS400*) os400=true;; -Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set CARBON_HOME if not already set -[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` - -# Set AXIS2_HOME. Needed for One Click JAR Download -AXIS2_HOME=$CARBON_HOME - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CARBON_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"` - [ -n "$AXIS2_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"` -fi - -# For OS400 -if $os400; then - # Set job priority to standard for interactive (interactive - 6) by using - # the interactive priority - 6, the helper threads that respond to requests - # will be running at the same priority as interactive jobs. - COMMAND='chgjob job('$JOBNAME') runpty(6)' - system $COMMAND - - # Enable multi threading - QIBM_MULTI_THREADED=Y - export QIBM_MULTI_THREADED -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$CARBON_HOME" ] && - CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - [ -n "$AXIS2_HOME" ] && - CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD=java - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " CARBON cannot execute $JAVACMD" - exit 1 -fi - -# if JAVA_HOME is not set we're not happy -if [ -z "$JAVA_HOME" ]; then - echo "You must set the JAVA_HOME variable before running CARBON." - exit 1 -fi - -if [ -e "$CARBON_HOME/wso2carbon.pid" ]; then - PID=`cat "$CARBON_HOME"/wso2carbon.pid` -fi - -# ----- Process the input command ---------------------------------------------- -args="" -for c in $* -do - if [ "$c" = "--debug" ] || [ "$c" = "-debug" ] || [ "$c" = "debug" ]; then - CMD="--debug" - continue - elif [ "$CMD" = "--debug" ]; then - if [ -z "$PORT" ]; then - PORT=$c - fi - elif [ "$c" = "--stop" ] || [ "$c" = "-stop" ] || [ "$c" = "stop" ]; then - CMD="stop" - elif [ "$c" = "--start" ] || [ "$c" = "-start" ] || [ "$c" = "start" ]; then - CMD="start" - elif [ "$c" = "--version" ] || [ "$c" = "-version" ] || [ "$c" = "version" ]; then - CMD="version" - elif [ "$c" = "--restart" ] || [ "$c" = "-restart" ] || [ "$c" = "restart" ]; then - CMD="restart" - elif [ "$c" = "--test" ] || [ "$c" = "-test" ] || [ "$c" = "test" ]; then - CMD="test" - else - args="$args $c" - fi -done - -if [ "$CMD" = "--debug" ]; then - if [ "$PORT" = "" ]; then - echo " Please specify the debug port after the --debug option" - exit 1 - fi - if [ -n "$JAVA_OPTS" ]; then - echo "Warning !!!. User specified JAVA_OPTS will be ignored, once you give the --debug option." - fi - CMD="RUN" - JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=$PORT" - echo "Please start the remote debugging client to continue..." -elif [ "$CMD" = "start" ]; then - if [ -e "$CARBON_HOME/wso2carbon.pid" ]; then - if ps -p $PID > /dev/null ; then - echo "Process is already running" - exit 0 - fi - fi - export CARBON_HOME=$CARBON_HOME -# using nohup sh to avoid erros in solaris OS.TODO - nohup sh $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 & - exit 0 -elif [ "$CMD" = "stop" ]; then - export CARBON_HOME=$CARBON_HOME - kill -term `cat $CARBON_HOME/wso2carbon.pid` - exit 0 -elif [ "$CMD" = "restart" ]; then - export CARBON_HOME=$CARBON_HOME - kill -term `cat $CARBON_HOME/wso2carbon.pid` - process_status=0 - pid=`cat $CARBON_HOME/wso2carbon.pid` - while [ "$process_status" -eq "0" ] - do - sleep 1; - ps -p$pid 2>&1 > /dev/null - process_status=$? - done - -# using nohup sh to avoid erros in solaris OS.TODO - nohup sh $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 & - exit 0 -elif [ "$CMD" = "test" ]; then - JAVACMD="exec "$JAVACMD"" -elif [ "$CMD" = "version" ]; then - cat $CARBON_HOME/bin/version.txt - cat $CARBON_HOME/bin/wso2carbon-version.txt - exit 0 -fi - -# ---------- Handle the SSL Issue with proper JDK version -------------------- -jdk_17=`$JAVA_HOME/bin/java -version 2>&1 | grep "1.[7|8]"` -if [ "$jdk_17" = "" ]; then - echo " Starting WSO2 Carbon (in unsupported JDK)" - echo " [ERROR] CARBON is supported only on JDK 1.7 and 1.8" -fi - -CARBON_XBOOTCLASSPATH="" -for f in "$CARBON_HOME"/wso2/lib/xboot/*.jar -do - if [ "$f" != "$CARBON_HOME/wso2/lib/xboot/*.jar" ];then - CARBON_XBOOTCLASSPATH="$CARBON_XBOOTCLASSPATH":$f - fi -done - -JAVA_ENDORSED_DIRS="$CARBON_HOME/wso2/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/wso2/lib/endorsed" - -CARBON_CLASSPATH="" -if [ -e "$JAVA_HOME/lib/tools.jar" ]; then - CARBON_CLASSPATH="$JAVA_HOME/lib/tools.jar" -fi -for f in "$CARBON_HOME"/bin/*.jar -do - if [ "$f" != "$CARBON_HOME/bin/*.jar" ];then - CARBON_CLASSPATH="$CARBON_CLASSPATH":$f - fi -done -for t in "$CARBON_HOME"/wso2/lib/commons-lang*.jar -do - CARBON_CLASSPATH="$CARBON_CLASSPATH":$t -done -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` - CARBON_HOME=`cygpath --absolute --windows "$CARBON_HOME"` - AXIS2_HOME=`cygpath --absolute --windows "$CARBON_HOME"` - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` - CARBON_CLASSPATH=`cygpath --path --windows "$CARBON_CLASSPATH"` - CARBON_XBOOTCLASSPATH=`cygpath --path --windows "$CARBON_XBOOTCLASSPATH"` -fi - -# ----- Execute The Requested Command ----------------------------------------- - -echo JAVA_HOME environment variable is set to $JAVA_HOME -echo CARBON_HOME environment variable is set to $CARBON_HOME - -cd "$CARBON_HOME" - -TMP_DIR=$CARBON_HOME/tmp -if [ -d "$TMP_DIR" ]; then -rm -rf "$TMP_DIR" -fi - -START_EXIT_STATUS=121 -status=$START_EXIT_STATUS - -#setting up profile parameter for runtime http-gateway -NODE_PARAMS="-Dprofile=http-gateway" - -#To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property. -# -Djava.rmi.server.hostname="your.IP.goes.here" - -while [ "$status" = "$START_EXIT_STATUS" ] -do - $JAVACMD \ - -Xbootclasspath/a:"$CARBON_XBOOTCLASSPATH" \ - -Xms256m -Xmx1024m -XX:MaxPermSize=512m \ - -XX:+HeapDumpOnOutOfMemoryError \ - -XX:HeapDumpPath="$CARBON_HOME/repository/logs/heap-dump.hprof" \ - $JAVA_OPTS \ - -Dcom.sun.management.jmxremote \ - -classpath "$CARBON_CLASSPATH" \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Djava.io.tmpdir="$CARBON_HOME/wso2/tmp" \ - -Dcatalina.base="$CARBON_HOME/wso2/lib/tomcat" \ - -Dwso2.server.standalone=true \ - -Dcarbon.registry.root=/ \ - -Djava.command="$JAVACMD" \ - -Dcarbon.home="$CARBON_HOME" \ - -Dlogger.server.name="IoT-Core" \ - -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ - -Dcarbon.config.dir.path="$CARBON_HOME/conf" \ - -Dcarbon.components.dir.path="$CARBON_HOME/wso2/components" \ - -Dcarbon.dropins.dir.path="$CARBON_HOME/dropins" \ - -Dcarbon.external.lib.dir.path="$CARBON_HOME/lib" \ - -Dcarbon.patches.dir.path="$CARBON_HOME/patches" \ - -Dcarbon.servicepacks.dir.path="$CARBON_HOME/servicepacks" \ - -Dcarbon.internal.lib.dir.path="$CARBON_HOME/wso2/lib" \ - -Djava.util.logging.config.file="$CARBON_HOME/conf/etc/logging-bridge.properties" \ - -Dcomponents.repo="$CARBON_HOME/wso2/components/plugins" \ - -Dconf.location="$CARBON_HOME/conf"\ - -Dcom.atomikos.icatch.file="$CARBON_HOME/wso2/lib/transactions.properties" \ - -Dcom.atomikos.icatch.hide_init_file_path=true \ - -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false \ - -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true \ - -Dcom.sun.jndi.ldap.connect.pool.authentication=simple \ - -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 \ - -Dorg.terracotta.quartz.skipUpdateCheck=true \ - -Djava.security.egd=file:/dev/./urandom \ - -Dfile.encoding=UTF8 \ - -Djava.net.preferIPv4Stack=true \ - -Dcom.ibm.cacheLocalHost=true \ - -DworkerNode=false \ - -Dorg.wso2.ignoreHostnameVerification=true \ - -Dorg.opensaml.httpclient.https.disableHostnameVerification=true \ - -Diot.analytics.host="localhost" \ - -Diot.analytics.https.port="9445" \ - -Diot.manager.host="localhost" \ - -Diot.manager.https.port="9443" \ - -Dmqtt.broker.host="localhost" \ - -Dmqtt.broker.port="1886" \ - -Diot.core.host="localhost" \ - -Diot.core.https.port="9444" \ - -Diot.keymanager.host="localhost" \ - -Diot.keymanager.https.port="9447" \ - -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8248" \ - -Diot.gateway.http.port="8285" \ - -Diot.gateway.carbon.https.port="9448" \ - -Diot.gateway.carbon.http.port="9768" \ - -Diot.apimpublisher.host="localhost" \ - -Diot.apimpublisher.https.port="9443" \ - -Diot.apimstore.host="localhost" \ - -Diot.apimstore.https.port="9443" \ - $NODE_PARAMS \ - org.wso2.carbon.bootstrap.Bootstrap $* - status=$? -done diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat index f0116ecf..daedc1b2 100644 --- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=device-key-manager -set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.gateway.carbon.https.port="9448" -Diot.gateway.carbon.http.port="9768" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% +set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8244" -Diot.gateway.http.port="8281" -Diot.gateway.carbon.https.port="9444" -Diot.gateway.carbon.http.port="9764" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :runJava echo JAVA_HOME environment variable is set to %JAVA_HOME% echo CARBON_HOME environment variable is set to %CARBON_HOME% diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh index 02a25320..b46482d9 100755 --- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh @@ -327,10 +327,10 @@ do -Diot.keymanager.host="localhost" \ -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8248" \ - -Diot.gateway.http.port="8285" \ - -Diot.gateway.carbon.https.port="9448" \ - -Diot.gateway.carbon.http.port="9768" \ + -Diot.gateway.https.port="8244" \ + -Diot.gateway.http.port="8281" \ + -Diot.gateway.carbon.https.port="9444" \ + -Diot.gateway.carbon.http.port="9764" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat index 6aab9e65..a3b01ab5 100644 --- a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=device-manager -set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.gateway.carbon.https.port="9448" -Diot.gateway.carbon.http.port="9768" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% +set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8244" -Diot.gateway.http.port="8281" -Diot.gateway.carbon.https.port="9444" -Diot.gateway.carbon.http.port="9764" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :runJava echo JAVA_HOME environment variable is set to %JAVA_HOME% echo CARBON_HOME environment variable is set to %CARBON_HOME% diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh index 5fb8ca2c..f21aa8d2 100755 --- a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh @@ -327,10 +327,10 @@ do -Diot.keymanager.host="localhost" \ -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8248" \ - -Diot.gateway.http.port="8285" \ - -Diot.gateway.carbon.https.port="9448" \ - -Diot.gateway.carbon.http.port="9768" \ + -Diot.gateway.https.port="8244" \ + -Diot.gateway.http.port="8281" \ + -Diot.gateway.carbon.https.port="9444" \ + -Diot.gateway.carbon.http.port="9764" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 2cfb7463..9970ee77 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -765,22 +765,6 @@ default - - p2-profile-generation-http-gateway-profile - package - - materialize-product - - - ${basedir}/carbon.product - file:${basedir}/target/p2-repo - file:${basedir}/target/p2-repo - - file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components - - http-gateway - - p2-profile-generation-key-manager-profile package @@ -1591,413 +1575,6 @@ - - - 5-p2-profile-generation - package - - p2-profile-gen - - - http-gateway - file:${basedir}/target/p2-repo - file:${basedir}/target/p2-repo - - ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components - - true - - - org.wso2.iot.core.styles.feature.group - ${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.apache.axis2.transport.mail.feature.group - ${axis2-transports.wso2.version} - - - org.wso2.carbon.core.common.feature.group - ${carbon.kernel.version} - - - org.wso2.carbon.core.server.feature.group - ${carbon.kernel.version} - - - 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.wso2.carbon.databridge.datapublisher.feature.group - ${carbon.analytics.common.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.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} - - - 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} - - - 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} - - - 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.identity.provider.server.feature.group - ${identity.inbound.auth.openid.version} - - - org.wso2.carbon.registry.community.features.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.identity.oauth.feature.group - ${identity.inbound.auth.oauth.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} - - - 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} - - - org.wso2.carbon.identity.core.feature.group - ${carbon.identity.framework.version} - - - org.wso2.carbon.um.ws.service.server.feature.group - ${identity.user.ws.version} - - - 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.apimgt.gateway.feature.group - ${carbon.api.mgt.version} - - - org.wso2.carbon.apimgt.core.feature.group - ${carbon.api.mgt.version} - - - org.wso2.carbon.registry.extensions.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.registry.extensions.server.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.registry.contentsearch.feature.group - ${carbon.registry.version.iotcore} - - - org.wso2.carbon.identity.application.authentication.framework.server.feature.group - ${carbon.identity.framework.version} - - - org.wso2.carbon.identity.application.authz.xacml.server.feature.group - ${identity.application.authz.xacml} - - - org.wso2.carbon.tenant.mgt.common.server.feature.group - ${carbon.commons.version} - - - org.wso2.carbon.tenant.common.feature.group - ${carbon.multitenancy.version} - - - org.wso2.carbon.tenant.usage.agent.feature.group - ${carbon.multitenancy.version} - - - org.wso2.carbon.ndatasource.feature.group - ${carbon.commons.version} - - - 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} - - - org.wso2.carbon.metrics.feature.group - ${carbon.metrics.version} - - - org.wso2.carbon.identity.user.profile.feature.group - ${carbon.identity.framework.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.server.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.certificate.mgt.api.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.analytics.data.publisher.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 - ${carbon.device.mgt.version} - - - org.wso2.carbon.identity.jwt.client.extension.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.analytics.api.client.feature.group - ${carbon.analytics.version} - - - - 6-p2-profile-generation @@ -3241,6 +2818,11 @@ + + org.wso2.carbon.databridge.datapublisher.feature.group + ${carbon.analytics.common.version} + + org.wso2.carbon.device.mgt.feature.group