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 --- client/client-deployment/pom.xml | 109 +++---------------- client/client-editor/pom.xml | 121 +++++---------------- client/client-full/pom.xml | 12 +- client/client-monitoring/pom.xml | 109 +++---------------- packages/apex-pdp-package-full/pom.xml | 80 +------------- .../src/main/package/scripts/apexApps.bat | 16 +-- .../src/main/package/scripts/apexApps.sh | 16 +-- .../src/main/package/scripts/apexRESTEditor.bat | 52 --------- .../src/main/package/scripts/apexRESTEditor.sh | 48 -------- .../src/main/package/tarball/assembly.xml | 24 +--- 10 files changed, 77 insertions(+), 510 deletions(-) delete mode 100644 packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.bat delete mode 100755 packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.sh diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml index 149410a46..03e189953 100644 --- a/client/client-deployment/pom.xml +++ b/client/client-deployment/pom.xml @@ -1,7 +1,7 @@ install ${project.build.directory}/classes diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml index bd9893bef..f9e10de85 100644 --- a/client/client-monitoring/pom.xml +++ b/client/client-monitoring/pom.xml @@ -1,7 +1,7 @@ - - org.onap.policy.apex-pdp.client - apex-client-full - war - ${project.version} - - - org.onap.policy.apex-pdp.client - apex-client-editor - war - ${project.version} - - - org.onap.policy.apex-pdp.client - apex-client-deployment - war - ${project.version} - - - org.onap.policy.apex-pdp.client - apex-client-monitoring - war - ${project.version} - - + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution @@ -200,7 +175,7 @@ cli-editor ${project.version} - + org.onap.policy.apex-pdp.tools @@ -212,14 +187,14 @@ model-generator ${project.version} - + org.onap.policy.apex-pdp.testsuites.integration integration-common ${project.version} - + org.onap.policy.apex-pdp.examples @@ -256,12 +231,6 @@ examples-onap-vcpe ${project.version} - - org.onap.policy.apex-pdp.examples - examples-servlet - war - ${project.version} - org.onap.policy.apex-pdp.examples examples-onap-bbs @@ -433,15 +402,6 @@ ${project.build.directory}/examples/models/ONAPBBS NomadicONTPolicyModel.json - - org.onap.policy.apex-pdp.examples - examples-servlet - ${project.version} - war - false - ${project.build.directory}/examples/servlet - readme_examples-servlet.txt - org.onap.policy.apex-pdp.tools tools-common @@ -490,27 +450,6 @@ jar-with-dependencies ${project.build.directory}/lib/applications - - org.onap.policy.apex-pdp.client - apex-client-monitoring - ${project.version} - monitoring - ${project.build.directory}/lib/applications - - - org.onap.policy.apex-pdp.client - apex-client-editor - ${project.version} - editor - ${project.build.directory}/lib/applications - - - org.onap.policy.apex-pdp.client - apex-client-deployment - ${project.version} - deployment - ${project.build.directory}/lib/applications - org.onap.policy.apex-pdp.client apex-client-full @@ -526,7 +465,7 @@ - + org.apache.maven.plugins @@ -622,15 +561,6 @@ /opt/app/policy/${project.artifactId}-${project.version}/etc - - ${project.build.directory}/install_hierarchy/war - directory - etc - - perm - /opt/app/policy/${install.package.name}-${project.version}/war - - ${project.build.directory}/install_hierarchy/examples directory 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 diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh index 2654341f7..5b6350a81 100755 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh @@ -3,20 +3,20 @@ #------------------------------------------------------------------------------- # ============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========================================================= #------------------------------------------------------------------------------- @@ -93,13 +93,10 @@ APEX_APP_MAP["ws-console"]="java -jar $APEX_HOME/lib/applications/simple-wsclien APEX_APP_MAP["ws-echo"]="java -jar $APEX_HOME/lib/applications/simple-wsclient-$_version-jar-with-dependencies.jar" 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" 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.Model2ClMain" -APEX_APP_MAP["rest-editor"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-editor-$_version-editor.jar" APEX_APP_MAP["cli-editor"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain" 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" APEX_APP_MAP["engine"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.service.engine.main.ApexMain" -APEX_APP_MAP["eng-deployment"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-deployment-$_version-deployment.jar" -APEX_APP_MAP["eng-monitoring"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-monitoring-$_version-monitoring.jar" -APEX_APP_MAP["full-client"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/client-full-$_version-full.jar" +APEX_APP_MAP["full-client"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/apex-client-full-$_version-full.jar" APEX_APP_MAP["event-gen"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.testsuites.performance.benchmark.eventgenerator.EventGenerator" APEX_APP_MAP["onappf"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.services.onappf.ApexStarterMain" APEX_APP_MAP["jmx-test"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config $_jmxconfig org.onap.policy.apex.service.engine.main.ApexMain" @@ -110,12 +107,9 @@ APEX_APP_DESCR_MAP["ws-console"]="a simple console sending events to APEX, conne APEX_APP_DESCR_MAP["ws-echo"]="a simple echo client printing events received from APEX, connect to APEX producer port" APEX_APP_DESCR_MAP["tpl-event-json"]="provides JSON templates for events generated from a policy model" APEX_APP_DESCR_MAP["model-2-cli"]="generates CLI Editor Commands from a policy model" -APEX_APP_DESCR_MAP["rest-editor"]="starts the APEX REST Editor inside a simple webserver" APEX_APP_DESCR_MAP["cli-editor"]="runs the APEX CLI Editor" APEX_APP_DESCR_MAP["cli-tosca-editor"]="runs the APEX CLI Tosca Editor" APEX_APP_DESCR_MAP["engine"]="starts the APEX engine" -APEX_APP_DESCR_MAP["eng-deployment"]="starts the APEX deployment client in a simple webserver" -APEX_APP_DESCR_MAP["eng-monitoring"]="starts the APEX engine monitoring client in a simple webserver" APEX_APP_DESCR_MAP["full-client"]="starts the full APEX client (rest editor, deployment, monitoring) in a simple webserver" APEX_APP_DESCR_MAP["event-generator"]="starts the event generator in a simple webserver for performance testing" APEX_APP_DESCR_MAP["onappf"]="starts the ApexStarter which handles the Apex Engine based on instructions from PAP" diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.bat deleted file mode 100644 index 5942a2e1f..000000000 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.bat +++ /dev/null @@ -1,52 +0,0 @@ -:: ============LICENSE_START======================================================= -:: Copyright (C) 2016-2018 Ericsson. All rights reserved. -:: ================================================================================ -:: 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========================================================= - -:: -:: Script to run the APEX REST Editor, calls apexApps.bat -:: -:: @package org.onap.policy.apex -:: @author Sven van der Meer -:: @version v2.0.0 - -:: -:: DO NOT CHANGE CODE BELOW, unless you know what you are doing -:: - -@echo off -setlocal enableDelayedExpansion - - -if defined APEX_HOME ( - if exist "%APEX_HOME%\" ( - set _dummy=dir - ) else ( - echo[ - echo Apex directory 'APEX_HOME' not a directory - echo Please set environment for 'APEX_HOME' - echo[ - exit /b - ) -) else ( - echo[ - echo Apex directory 'APEX_HOME' not set - echo Please set environment for 'APEX_HOME' - echo[ - exit /b -) - -%APEX_HOME%\bin\apexApps.bat rest-editor %* diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.sh deleted file mode 100755 index 62ab50ea0..000000000 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -#------------------------------------------------------------------------------- -# ============LICENSE_START======================================================= -# Copyright (C) 2016-2018 Ericsson. All rights reserved. -# ================================================================================ -# 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========================================================= -#------------------------------------------------------------------------------- - -## -## Script to run the APEX REST Editor, calls apexApps.sh -## -## @package org.onap.policy.apex -## @author Sven van der Meer -## @version v2.0.0 - -## -## DO NOT CHANGE CODE BELOW, unless you know what you are doing -## - - -if [ -z $APEX_HOME ] -then - APEX_HOME="/opt/app/policy/apex-pdp" -fi - -if [ ! -d $APEX_HOME ] -then - echo - echo 'Apex directory "'$APEX_HOME'" not set or not a directory' - echo "Please set environment for 'APEX_HOME'" - exit -fi - -$APEX_HOME/bin/apexApps.sh rest-editor $* diff --git a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml index 5101821ed..a5d25593c 100644 --- a/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml +++ b/packages/apex-pdp-package-full/src/main/package/tarball/assembly.xml @@ -1,19 +1,20 @@ @@ -33,15 +34,6 @@ *:jar - - true - war - false - runtime - - *:war - - @@ -110,13 +102,5 @@ *.formatted - - - ${project.build.directory}/etc - - readme_examples-servlet.txt - - war - -- cgit 1.2.3-korg