diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index f68f9af9..43cf9c49 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1106,12 +1106,12 @@ ${pom.artifactId}-${pom.version}/bin 755 - - src/core/bin/profile-creator.bat - ${pom.artifactId}-${pom.version}/bin - 755 - true - + + + + + + src/core/bin/profile-creator.sh ${pom.artifactId}-${pom.version}/bin diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat deleted file mode 100644 index 134f7a59..00000000 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ /dev/null @@ -1,173 +0,0 @@ -@echo OFF - -REM --------------------------------------------------------------------------- -REM Copyright 2017 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 Profile creator tool for EI -REM --------------------------------------------------------------------------- - -set DIR=%~dp0 -set DISTRIBUTION=wso2ei-@product.version@ -REM get the desired profile -echo This tool will erase all the files which are not required for the selected profile. -echo WARNING:This may cause loss of any changes to the other profiles. -echo WSO2 Enterprise Integrator Supports following profiles. -echo 1.Integrator profile -echo 2.Analytics Profile -echo 3.Business Process profile -echo 4.Broker profile -echo 5.Msf4j profile - -set /p profileNumber= [Please enter the desired profile number to create the profile specific distribution] - -IF /I "%profileNumber%" EQU "1" goto Integrator -IF /I "%profileNumber%" EQU "2" goto Analytics -IF /I "%profileNumber%" EQU "3" goto BPS -IF /I "%profileNumber%" EQU "4" goto Broker -IF /I "%profileNumber%" EQU "5" goto Msf4j - -echo Invalid profile identifier. -goto Exit - -:Integrator - echo Preparing the Integrator profile distribution. - set DEFAULT_BUNDLES=%DIR%..\wso2\components\default\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - set WORKER_BUNDLES=%DIR%..\wso2\components\worker\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - call :Remove_BPS - call :Remove_BROKER - call :Remove_ANALYTICS - call :Remove_JARS - call :Remove_MSF4J - echo Integrator profile created successfully. - goto Exit - -:Broker - echo Preparing the Broker profile. - set DEFAULT_BUNDLES=%DIR%..\wso2\components\broker-default\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - set WORKER_BUNDLES=%DIR%..\wso2\components\broker-worker\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - call :Remove_BPS - call :Remove_INTEGRATOR - call :Remove_ANALYTICS - call :Remove_JARS - call :Remove_MSF4J - echo Broker profile created successfully. - goto Exit - -:BPS - echo Preparing the Business Process profile. - set DEFAULT_BUNDLES=%DIR%..\wso2\components\business-process-default\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - set WORKER_BUNDLES=%DIR%..\wso2\components\business-process-worker\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - call :Remove_BROKER - call :Remove_INTEGRATOR - call :Remove_ANALYTICS - call :Remove_JARS - call :Remove_MSF4J - echo Business Process profile created successfully. - goto Exit - -:Analytics - echo Preparing the Analytics profile. - set DEFAULT_BUNDLES=%DIR%..\wso2\components\analytics-default\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - set WORKER_BUNDLES=%DIR%..\wso2\components\analytics-worker\configuration\org.eclipse.equinox.simpleconfigurator\bundles.info - call :Remove_BPS - call :Remove_INTEGRATOR - call :Remove_BROKER - call :Remove_JARS - call :Remove_MSF4J - echo Analytics profile created successfully. - goto Exit - -:Msf4j - echo Preparing the Msf4j profile. - call :Remove_BPS - call :Remove_BROKER - call :Remove_ANALYTICS - call :Remove_INTEGRATOR - IF EXIST %DIR%\..\conf @RD /S /Q %DIR%\..\conf - IF EXIST %DIR%\..\lib @RD /S /Q %DIR%\..\lib - IF EXIST %DIR%\..\dropins @RD /S /Q %DIR%\..\dropins - IF EXIST %DIR%\..\dbscripts @RD /S /Q %DIR%\..\dbscripts - IF EXIST %DIR%\..\patches @RD /S /Q %DIR%\..\patches - IF EXIST %DIR%\..\repository @RD /S /Q %DIR%\..\repository - IF EXIST %DIR%\..\resources @RD /S /Q %DIR%\..\resources - IF EXIST %DIR%\..\samples @RD /S /Q %DIR%\..\samples - IF EXIST %DIR%\..\servicepacks @RD /S /Q %DIR%\..\servicepacks - IF EXIST %DIR%\..\webapp-mode @RD /S /Q %DIR%\..\webapp-mode - IF EXIST %DIR%\..\wso2\analytics @RD /S /Q %DIR%\..\wso2\analytics - IF EXIST %DIR%\..\wso2\broker @RD /S /Q %DIR%\..\wso2\broker - IF EXIST %DIR%\..\wso2\business-process @RD /S /Q %DIR%\..\wso2\business-process - IF EXIST %DIR%\..\wso2\components @RD /S /Q %DIR%\..\wso2\components - IF EXIST %DIR%\..\wso2\lib @RD /S /Q %DIR%\..\wso2\lib - IF EXIST %DIR%\..\wso2\tmp @RD /S /Q %DIR%\..\wso2\tmp - echo Msf4j profile created successfully. - goto Exit - -:Remove_BPS - echo Removing Business Process profile - IF EXIST %DIR%\..\wso2\business-process @RD /S /Q %DIR%\..\wso2\business-process - IF EXIST %DIR%\..\samples\business-process @RD /S /Q %DIR%\..\samples\business-process - IF EXIST %DIR%\..\wso2\components\business-process-default @RD /S /Q %DIR%\..\wso2\components\business-process-default - IF EXIST %DIR%\..\wso2\components\business-process-worker @RD /S /Q %DIR%\..\wso2\components\business-process-worker - IF EXIST %DIR%\business-process.bat del %DIR%\business-process.bat - IF EXIST %DIR%\business-process.sh del %DIR%\business-process.sh - goto :eof - -:Remove_BROKER - echo Removing Broker profile - IF EXIST %DIR%\..\wso2\broker @RD /S /Q %DIR%\..\wso2\broker - IF EXIST %DIR%\..\wso2\components\broker-default @RD /S /Q %DIR%\..\wso2\components\broker-default - IF EXIST %DIR%\..\wso2\components\broker-worker @RD /S /Q %DIR%\..\wso2\components\broker-worker - IF EXIST %DIR%\broker.bat del %DIR%\broker.bat - IF EXIST %DIR%\broker.sh del %DIR%\broker.sh - goto :eof - -:Remove_ANALYTICS - echo Removing Analytics profile - IF EXIST %DIR%\..\wso2\analytics @RD /S /Q %DIR%\..\wso2\analytics - IF EXIST %DIR%\..\wso2\components\analytics-default @RD /S /Q %DIR%\..\wso2\components\analytics-default - IF EXIST %DIR%\..\wso2\components\analytics-worker @RD /S /Q %DIR%\..\wso2\components\analytics-worker - IF EXIST %DIR%\broker.bat del %DIR%\analytics.bat - IF EXIST %DIR%\broker.sh del %DIR%\analytics.sh - goto :eof - -:Remove_INTEGRATOR - echo Removing Integrator profile - IF EXIST %DIR%\..\conf @RD /S /Q %DIR%\..\conf - IF EXIST %DIR%\..\wso2\components\default @RD /S /Q %DIR%\..\wso2\components\default - IF EXIST %DIR%\..\wso2\components\worker @RD /S /Q %DIR%\..\wso2\components\worker - IF EXIST %DIR%\..\samples\service-bus @RD /S /Q %DIR%\..\samples\service-bus - IF EXIST %DIR%\integrator.bat del %DIR%\integrator.bat - IF EXIST %DIR%\integrator.sh del %DIR%\integrator.sh - IF EXIST %DIR%\wso2ei-samples.bat del %DIR%\wso2ei-samples.bat - IF EXIST %DIR%\wso2ei-samples.sh del %DIR%\wso2ei-samples.sh - goto :eof - -:Remove_JARS - echo Removing unnecessary jars - mkdir %DIR%\..\wso2\components\tmp_plugins - - FOR /F "tokens=1,2* delims=, " %%i in (%DEFAULT_BUNDLES%) do copy %DIR%\..\wso2\components\plugins\%%i_%%j.jar %DIR%\..\wso2\components\tmp_plugins - FOR /F "tokens=1,2* delims=, " %%i in (%WORKER_BUNDLES%) do copy %DIR%\..\wso2\components\plugins\%%i_%%j.jar %DIR%\..\wso2\components\tmp_plugins - - @RD /S /Q %DIR%\..\wso2\components\plugins - rename %DIR%\..\wso2\components\tmp_plugins plugins - goto :eof - -:Remove_MSF4J - IF EXIST %DIR%\..\wso2\msf4j @RD /S /Q %DIR%\..\wso2\msf4j - goto :eof - -:Exit - pause diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 9a51c188..3725e86a 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -67,6 +67,7 @@ then 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/* PROFILE="_gateway" @@ -99,13 +100,17 @@ then cp -rf ${DIR}/../repository/resources/profiles/keymanager/* ${DIR}/../bin/ 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/oauth2.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/ 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" @@ -136,8 +141,10 @@ then 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/* ${DIR}/../bin/ - rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war + 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/* @@ -170,10 +177,19 @@ then rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat cp -rf ${DIR}/../repository/resources/profiles/manager/* ${DIR}/../bin/ + 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/ 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/axis2services/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* - rm -rf ${DIR}/../repository/deployment/server/carbonapps/* + rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml PROFILE="_device-manager" diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 3f9b871a..cd55e41d 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -2839,13 +2839,14 @@ 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} @@ -3869,24 +3870,6 @@ ${identity.inbound.auth.saml.version} - - - - org.wso2.carbon.dashboards.shindig.feature.group - ${carbon.dashboard.version} - - - org.wso2.carbon.dashboards.portal.feature.group - ${carbon.dashboard.version} - - - org.wso2.carbon.dashboard.deployment.feature.group - ${carbon.dashboard.version} - - - org.wso2.carbon.iot.device.statistics.dashboard.feature.group - ${carbon.device.mgt.plugin.version} -