From 9aa62b777ddcd25665fdc1544934c133e0124230 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 25 Mar 2020 12:09:54 +0000 Subject: Reduce size of client artifacts This change: - Removes separate packaging of the three clients - Reduces the size of the combined client by suppressing unused dependencies - Removes the Servlet code from the Docker packaging - Removes the client WARs from the docker package Issue-ID: POLICY-2443 Change-Id: If0a0c2dddc3f05f2815b84ae04fcc029b1c4fe08 Signed-off-by: liamfallon --- .../src/main/package/scripts/apexApps.bat | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat') diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat index f0c343f4b..6610c109e 100644 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat @@ -1,19 +1,19 @@ :: ============LICENSE_START======================================================= :: Copyright (C) 2016-2018 Ericsson. All rights reserved. -:: Modifications Copyright (C) 2019 Nordix Foundation. +:: Modifications Copyright (C) 2019-2020 Nordix Foundation. :: ================================================================================ :: 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. -:: +:: :: SPDX-License-Identifier: Apache-2.0 :: ============LICENSE_END========================================================= @@ -84,13 +84,10 @@ set APEX_APP_MAP[ws-console]=java -jar %APEX_HOME%\lib\applications\simple-wscli set APEX_APP_MAP[ws-echo]=java -jar %APEX_HOME%\lib\applications\simple-wsclient-%_VERSION%-jar-with-dependencies.jar set APEX_APP_MAP[tpl-event-json]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.tools.model.generator.model2event.Model2EventMain set APEX_APP_MAP[model-2-cli]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.tools.model.generator.model2cli.Model2CliMain -set APEX_APP_MAP[rest-editor]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-editor-%_VERSION%-editor.jar set APEX_APP_MAP[cli-editor]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain set APEX_APP_MAP[cli-tosca-editor]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain set APEX_APP_MAP[engine]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.service.engine.main.ApexMain -set APEX_APP_MAP[eng-deployment]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-deployment-%_VERSION%-deployment.jar -set APEX_APP_MAP[eng-monitoring]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-monitoring-%_VERSION%-monitoring.jar -set APEX_APP_MAP[full-client]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\client-full-%_VERSION%-full.jar +set APEX_APP_MAP[full-client]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\apex-client-full-%_VERSION%-full.jar set APEX_APP_MAP[event-generator]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator set APEX_APP_MAP[onappf]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.services.onappf.ApexStarterMain @@ -100,12 +97,9 @@ set APEX_APP_DESCR_MAP[ws-console]=a simple console sending events to APEX, conn set APEX_APP_DESCR_MAP[ws-echo]=a simple echo client printing events received from APEX, connect to APEX producer port set APEX_APP_DESCR_MAP[tpl-event-json]=provides JSON templates for events generated from a policy model set APEX_APP_DESCR_MAP[model-2-cli]=generates CLI Editor Commands from a policy model -set APEX_APP_DESCR_MAP[rest-editor]=starts the APEX REST Editor inside a simple webserver set APEX_APP_DESCR_MAP[cli-editor]=runs the APEX CLI Editor set APEX_APP_DESCR_MAP[cli-tosca-editor]=runs the APEX CLI Tosca Editor set APEX_APP_DESCR_MAP[engine]=starts the APEX engine -set APEX_APP_DESCR_MAP[eng-deployment]=starts the APEX deployment client in a simple webserver -set APEX_APP_DESCR_MAP[eng-monitoring]=starts the APEX engine monitoring client in a simple webserver set APEX_APP_DESCR_MAP[full-client]=starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver set APEX_APP_DESCR_MAP["event-generator"]=starts the event generator in a simple webserver for performance testing set APEX_APP_DESCR_MAP[onappf]=starts the ApexStarter which handles the Apex Engine based on instructions from PAP -- cgit 1.2.3-korg