diff options
Diffstat (limited to 'packages')
38 files changed, 185 insertions, 1610 deletions
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml index 5bc27cb61..ac3994fe7 100644 --- a/packages/apex-pdp-docker/pom.xml +++ b/packages/apex-pdp-docker/pom.xml @@ -114,6 +114,9 @@ <name>apexSite</name> </property> </activation> + <properties> + <adsite-packages-docker-dir>${project.basedir}/src</adsite-packages-docker-dir> + </properties> <distributionManagement> <site> <id>${project.artifactId}-site</id> diff --git a/packages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc b/packages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc new file mode 100755 index 000000000..ec5ae9a01 --- /dev/null +++ b/packages/apex-pdp-docker/src/site-docs/adoc/fragments/dockerfile.adoc @@ -0,0 +1,20 @@ +// +// ============LICENSE_START======================================================= +// Copyright (C) 2016-2018 Ericsson. All rights reserved. +// ================================================================================ +// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE +// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode +// +// SPDX-License-Identifier: CC-BY-4.0 +// ============LICENSE_END========================================================= +// +// @author Sven van der Meer (sven.van.der.meer@ericsson.com) +// + +== APEX Dockerfile + +.APEX Dockerfile +[source%nowrap,sh,numbered,subs="attributes+"] +---- +include::{adsite-packages-docker-dir}/main/docker/Dockerfile[APEX Dockerfile] +---- diff --git a/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc b/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc new file mode 100755 index 000000000..5c3ffb57a --- /dev/null +++ b/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc @@ -0,0 +1,14 @@ +// +// ============LICENSE_START======================================================= +// Copyright (C) 2016-2018 Ericsson. All rights reserved. +// ================================================================================ +// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE +// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode +// +// SPDX-License-Identifier: CC-BY-4.0 +// ============LICENSE_END========================================================= +// +// @author Sven van der Meer (sven.van.der.meer@ericsson.com) +// + +include::{adsite-packages-docker-dir}/site-docs/adoc/fragments/dockerfile.adoc[] diff --git a/packages/apex-pdp-docker/src/site/site.xml b/packages/apex-pdp-docker/src/site/site.xml index 7bf7f444a..ee59d8a00 100644 --- a/packages/apex-pdp-docker/src/site/site.xml +++ b/packages/apex-pdp-docker/src/site/site.xml @@ -16,6 +16,7 @@ <project name="APEX Packages Docker"> <body> <menu name="APEX Packages Docker"> + <item href="dockerfile.html" name="APEX Dockerfile" /> </menu> <menu ref="reports" inherit="top" /> <menu ref="modules" /> diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml index ceda3ad11..65520e83f 100644 --- a/packages/apex-pdp-package-full/pom.xml +++ b/packages/apex-pdp-package-full/pom.xml @@ -41,6 +41,32 @@ <version>${project.version}</version> </dependency> + <!-- Client Servlet applications --> + <dependency> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-full</artifactId> + <type>war</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-editor</artifactId> + <type>war</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-deployment</artifactId> + <type>war</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-monitoring</artifactId> + <type>war</type> + <version>${project.version}</version> + </dependency> + <!-- Plugins for Context Distribution --> <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId> @@ -161,7 +187,19 @@ <artifactId>cli-editor</artifactId> <version>${project.version}</version> </dependency> - + + <!-- Tools --> + <dependency> + <groupId>org.onap.policy.apex-pdp.tools</groupId> + <artifactId>simple-wsclient</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.apex-pdp.tools</groupId> + <artifactId>model-generator</artifactId> + <version>${project.version}</version> + </dependency> + <!-- Test Data used by examples --> <dependency> <groupId>org.onap.policy.apex-pdp.context</groupId> @@ -323,11 +361,70 @@ <outputDirectory>${project.build.directory}/etc</outputDirectory> <includes>/readme_examples-servlet.txt</includes> </artifactItem> + <artifactItem> + <groupId>org.onap.policy.apex-pdp.tools</groupId> + <artifactId>tools-common</artifactId> + <version>${project.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/etc</outputDirectory> + <includes>/app-version.txt</includes> + </artifactItem> + </artifactItems> + <overWriteReleases>true</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + <execution> + <id>copy-fat-jars</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.onap.policy.apex-pdp.tools</groupId> + <artifactId>simple-wsclient</artifactId> + <version>${project.version}</version> + <type>jar</type> + <classifier>jar-with-dependencies</classifier> + <outputDirectory>${project.build.directory}/lib/applications</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-monitoring</artifactId> + <version>${project.version}</version> + <classifier>monitoring</classifier> + <outputDirectory>${project.build.directory}/lib/applications</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-editor</artifactId> + <version>${project.version}</version> + <classifier>editor</classifier> + <outputDirectory>${project.build.directory}/lib/applications</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-deployment</artifactId> + <version>${project.version}</version> + <classifier>deployment</classifier> + <outputDirectory>${project.build.directory}/lib/applications</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-full</artifactId> + <version>${project.version}</version> + <classifier>full</classifier> + <outputDirectory>${project.build.directory}/lib/applications</outputDirectory> + </artifactItem> </artifactItems> <overWriteReleases>true</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> </configuration> </execution> + </executions> </plugin> diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/AADM/Stdin2StdoutJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/AADM/Stdin2StdoutJsonEvent.json deleted file mode 100644 index c43f41353..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/AADM/Stdin2StdoutJsonEvent.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "engineServiceParameters": { - "name": "AADMApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/AADM/AADMPolicyModel.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/AADM/Stdin2StdoutXmlEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/AADM/Stdin2StdoutXmlEvent.json deleted file mode 100644 index 294da2483..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/AADM/Stdin2StdoutXmlEvent.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "engineServiceParameters": { - "name": "AADMApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/AADM/AADMPolicyModel.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XMLEventProtocolParameters" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "XML", - "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XMLEventProtocolParameters" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json deleted file mode 100644 index 4da0bb969..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "engineServiceParameters": { - "name": "AdaptiveApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/Adaptive/AnomalyDetectionPolicyModel.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVA": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json deleted file mode 100644 index 5ae70f3e3..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "engineServiceParameters": { - "name": "AdaptiveApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/Adaptive/AutoLearnPolicyModel.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVA": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/AnswerInitiationEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/AnswerInitiationEvent.json deleted file mode 100644 index 6df3115d6..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/AnswerInitiationEvent.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "nameSpace": "org.onap.policy.apex.domains.decisionmaker", - "name": "AnswerEvent", - "version": "0.0.1", - "source": "dcae", - "target": "apex", - "a0" : "choice 0", - "a1" : "choice 1", - "a2" : "choice 2", - "a3" : "choice 3", - "a4" : "choice 4", - "a5" : "choice 5", - "a6" : "choice 6" -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/ApexConfigRESTClient.json b/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/ApexConfigRESTClient.json deleted file mode 100644 index 9fa0b6ddd..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/ApexConfigRESTClient.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/DecisionMaker/DecisionMakerPolicyModel.json", - "engineParameters": { - "executorParameters": { - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "VNFInitConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "examples/config/DecisionMaker/AnswerInitiationEvent.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - }, - "DMaaPConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:3904/events/toApex/APEX/1?timeout=60000" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventOutputParameters": { - "logProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "/tmp/EventsOut.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - }, - "DMaapProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters", - "parameters": { - "url": "http://localhost:3904/events/fromApex" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/ApexConfigRESTServer.json b/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/ApexConfigRESTServer.json deleted file mode 100644 index edf1b9cc3..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/DecisionMaker/ApexConfigRESTServer.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/DecisionMaker/DecisionMakerPolicyModel.json", - "engineParameters": { - "executorParameters": { - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "VNFInitConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "examples/config/DecisionMaker/AnswerInitiationEvent.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - }, - "RESTConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTSERVER", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters", - "parameters": { - "standalone": true, - "host": "0.0.0.0", - "port": 23324 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "synchronousMode": true, - "synchronousPeer": "RESTProducer", - "synchronousTimeout": 500 - } - }, - "eventOutputParameters": { - "logProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "/tmp/EventsOut.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - }, - "RESTProducer": { - "carrierTechnologyParameters":{ - "carrierTechnology" : "RESTSERVER", - "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters" - }, - "eventProtocolParameters":{ - "eventProtocol" : "JSON" - }, - "synchronousMode" : true, - "synchronousPeer" : "RESTConsumer", - "synchronousTimeout" : 500 - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json deleted file mode 100644 index fc81cd6a6..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyFirstPolicyApexEngine", - "version": "0.0.1", - "id": 103, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "examples/events/MyFirstPolicy/1/EventsIn.json.txt" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json deleted file mode 100644 index 27bd0a6a9..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyFirstPolicyApexEngine", - "version": "0.0.1", - "id": 101, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json deleted file mode 100644 index c4cf72171..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyFirstPolicyApexEngine", - "version": "0.0.1", - "id": 101, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/1/MyFirstPolicyModel_0.0.1.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WEBSOCKETCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 4000 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WEBSOCKETCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 3000 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json deleted file mode 100644 index be8ae938a..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyFirstPolicyApexEngine", - "version": "0.0.1", - "id": 104, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "examples/events/MyFirstPolicy/2/EventsIn.json.txt" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json deleted file mode 100644 index 56e79b2f3..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyFirstPolicyApexEngine", - "version": "0.0.1", - "id": 102, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "FirstProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "FirstConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "standardIO": true - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json deleted file mode 100644 index 65612b6db..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigWs2WsServerJsonEvent.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyFirstPolicyApexEngine", - "version": "0.0.1", - "id": 102, - "instanceCount": 4, - "deploymentPort": 12345, - "policyModelFileName": "examples/models/MyFirstPolicy/2/MyFirstPolicyModel_0.0.1.json", - "engineParameters": { - "executorParameters": { - "MVEL": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters" - }, - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventOutputParameters": { - "aProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WEBSOCKETCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 4000 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - }, - "eventInputParameters": { - "aConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "WEBSOCKET", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WEBSOCKETCarrierTechnologyParameters", - "parameters": { - "wsClient": false, - "port": 3000 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/ApexConfig.json b/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/ApexConfig.json deleted file mode 100644 index 070bbc105..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/ApexConfig.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "policy/ONAPTLGoalPolicyModel.json", - "engineParameters": { - "executorParameters": { - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - }, - "contextParameters": { - "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters", - "schemaParameters": { - "Avro": { - "parameterClassName": "org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters" - } - } - } - } - }, - "eventInputParameters": { - "VCPEInitConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "config/VCPEInitiationEvent.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON", - "parameters": { - "nameAlias": "closedLoopControlName", - "versionAlias": "version", - "sourceAlias": "from" - } - } - }, - "GuardRequestorConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTREQUESTOR", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters", - "parameters": { - "url": "http://192.168.144.235:54321/AAIAndGuardSim/sim/pdp/api/getDecision", - "httpMethod": "POST", - "restRequestTimeout": 2000 - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventName": "GuardResponseEvent", - "eventNameFilter": "GuardResponseEvent", - "requestorMode": true, - "requestorPeer": "GuardRequestorProducer", - "requestorTimeout": 500 - }, - "DCAEConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters", - "parameters": { - "url": "http://192.168.144.235:3904/events/unauthenticated.DCAE_CL_OUTPUT/APEX/1?timeout=60000" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON", - "parameters": { - "nameAlias": "closedLoopControlName", - "versionAlias": "version", - "sourceAlias": "from" - } - } - }, - "APPCConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters", - "parameters": { - "url": "http://192.168.144.235:3904/events/APPC_LCM_WRITE/APEX/1?timeout=60000" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventName": "APPCRestartVNFResponseEvent", - "eventNameFilter": "APPCRestartVNFResponseEvent" - } - }, - "eventOutputParameters": { - "logProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "/tmp/VCPEEventsOut.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - } - }, - "GuardRequestorProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTREQUESTOR", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters" - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "GuardRequestEvent", - "requestorMode": true, - "requestorPeer": "GuardRequestorConsumer", - "requestorTimeout": 500 - }, - "APPCProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters", - "parameters": { - "url": "http://192.168.144.235:3904/events/APPC-LCM-READ" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "APPCRestartVNFRequestEvent" - }, - "PolicyLogProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "RESTCLIENT", - "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters", - "parameters": { - "url": "http://192.168.144.235:3904/events/POLICY_CL_MGT" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "ControlLoopLogEvent" - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent0.json b/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent0.json deleted file mode 100644 index e46a2739c..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent0.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "closedLoopControlName": "ControlLoop-vCPE-85317438-861d-42a9-979e-9d96dc0a9ef1", - "closedLoopAlarmStart": 1519638197324, - "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", - "closedLoopEventStatus": "ONSET", - "requestID": "4a68f8a5-0db9-4070-a132-adede51ebeef", - "target_type": "VNF", - "target": "generic-vnf.vnf-id", - "AAI": { - "generic-vnf.resource-version": "1", - "generic-vnf.vnf-name": "vCPEInfraVNF99", - "generic-vnf.prov-status": "PREPROV", - "generic-vnf.is-closed-loop-disabled": "false", - "generic-vnf.orchestration-status": "Created", - "generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0", - "generic-vnf.in-maint": "false", - "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bf00f", - "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db001e" - }, - "from": "DCAE", - "version": "1.0.2" -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent1.json b/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent1.json deleted file mode 100644 index 5fcece8ac..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent1.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "closedLoopControlName": "ControlLoop-vCPE-85317438-861d-42a9-979e-9d96dc0a9ef1", - "closedLoopAlarmStart": 1519638197699, - "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", - "closedLoopEventStatus": "ONSET", - "requestID": "4a68f8a5-0db9-4070-a132-adede51ebeaf", - "target_type": "VNF", - "target": "generic-vnf.vnf-id", - "AAI": { - "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db001c" - }, - "from": "DCAE", - "version": "1.0.2" -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent2.json b/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent2.json deleted file mode 100644 index 7e3e33777..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/ONAPvCPE/VCPEInitiationEvent2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "closedLoopControlName": "ControlLoop-vCPE-85317438-861d-42a9-979e-9d96dc0a9ef1", - "closedLoopAlarmStart": 1519638197699, - "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", - "closedLoopEventStatus": "ONSET", - "requestID": "4a68f8a5-0db9-4070-a132-adede51ebeaf", - "target_type": "VNF", - "target": "generic-vnf.vnf-id", - "AAI": { - "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db001c" - }, - "from": "DCAE", - "version": "1.0.2" -} -{ - "closedLoopControlName": "ControlLoop-vCPE-85317438-861d-42a9-979e-9d96dc0a9ef1", - "closedLoopAlarmStart": 1519638197324, - "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", - "closedLoopEventStatus": "ONSET", - "requestID": "4a68f8a5-0db9-4070-a132-adede51ebeef", - "target_type": "VNF", - "target": "generic-vnf.vnf-id", - "AAI": { - "generic-vnf.resource-version": "1", - "generic-vnf.vnf-name": "vCPEInfraVNF99", - "generic-vnf.prov-status": "PREPROV", - "generic-vnf.is-closed-loop-disabled": "false", - "generic-vnf.orchestration-status": "Created", - "generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0", - "generic-vnf.in-maint": "false", - "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bf00f", - "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db001e" - }, - "from": "DCAE", - "version": "1.0.2" -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/Periodic/ApexConfigPeriodic.json b/packages/apex-pdp-package-full/src/main/package/examples/config/Periodic/ApexConfigPeriodic.json deleted file mode 100644 index a4c94779b..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/config/Periodic/ApexConfigPeriodic.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "engineServiceParameters": { - "name": "MyApexEngine", - "version": "0.0.1", - "id": 45, - "instanceCount": 4, - "deploymentPort": 12561, - "policyModelFileName": "examples/models/Periodic/PeriodicPolicyModel.json", - "periodicEventPeriod": 1000, - "engineParameters": { - "executorParameters": { - "JAVASCRIPT": { - "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters" - } - } - } - }, - "eventInputParameters": { - "EventRequestorConsumer": { - "carrierTechnologyParameters": { - "carrierTechnology": "EVENT_REQUESTOR" - }, - "eventProtocolParameters": { - "eventProtocol": "APEX" - }, - "eventNameFilter": "InputEvent", - "requestorMode": true, - "requestorPeer": "EventRequestorProducer", - "requestorTimeout": 500 - } - }, - "eventOutputParameters": { - "EventRequestorProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "EVENT_REQUESTOR" - }, - "eventProtocolParameters": { - "eventProtocol": "APEX" - }, - "eventNameFilter": "EventListEvent", - "requestorMode": true, - "requestorPeer": "EventRequestorConsumer", - "requestorTimeout": 500 - }, - "logProducer": { - "carrierTechnologyParameters": { - "carrierTechnology": "FILE", - "parameters": { - "fileName": "/tmp/PeriodicEventsOut.json" - } - }, - "eventProtocolParameters": { - "eventProtocol": "JSON" - }, - "eventNameFilter": "OutputEvent" - } - } -} diff --git a/packages/apex-pdp-package-full/src/main/package/examples/docker/base/base.Dockerfile b/packages/apex-pdp-package-full/src/main/package/examples/docker/base/base.Dockerfile deleted file mode 100644 index 4872f5546..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/docker/base/base.Dockerfile +++ /dev/null @@ -1,48 +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========================================================= -#------------------------------------------------------------------------------- - -# -# Docker file to build an image that runs APEX on Java 8 in Ubuntu -# -# apex/base:0.6.0 -FROM ubuntu:16.04 -MAINTAINER John Keeney John.Keeney@ericsson.com - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y software-properties-common && \ - add-apt-repository ppa:webupd8team/java -y && \ - apt-get update && \ - echo oracle-javax8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ - apt-get install -y oracle-java8-installer && \ - rm -rf /var/cache/oracle-jdk8-installer && \ - apt-get clean - -RUN mkdir /packages -COPY apex-pdp-package-full-2.0.0-SNAPSHOT.deb /packages -RUN dpkg -i packages/apex-pdp-package-full-2.0.0-SNAPSHOT.deb && \ - rm /packages/apex-pdp-package-full-2.0.0-SNAPSHOT.deb - -ENV PATH /opt/ericsson/apex/apex/bin:$PATH - -RUN apt-get clean - -RUN chown -R apexuser:apexuser /home/apexuser/* -WORKDIR /home/apexuser diff --git a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecisionExtraMode_Client.html b/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecisionExtraMode_Client.html deleted file mode 100644 index 1077939b0..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecisionExtraMode_Client.html +++ /dev/null @@ -1,156 +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========================================================= ---> - -<!-- http://localhost:3904/events/toApex --> - -<html> -<head> -<script src="http://code.jquery.com/jquery-latest.js"></script> -<script> - $(document).ready(function() { - $("#answerspost").click(function(e) { - var elements = document.getElementById("answerform").elements; - - var formValues = new Object; - formValues["name"] = "AnswerEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "text" && element.value != "") { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:3904/events/toApex", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Answers Set Successfully !!!"); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -<script> - $(document).ready(function() { - $("#modepost").click(function(e) { - var elements = document.getElementById("modeform").elements; - - var formValues = new Object; - formValues["name"] = "MakeDecisionEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "radio" && element.checked) { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:3904/events/toApex", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Decision Taken: " + data.decision); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -</head> -<body> - <h3>Decision Maker Answers</h3> - <form name="answerform" id="answerform" method="POST"> - <table> - <tr> - <td>First Answer:</td> - <td><input type="text" name="a0" value="Never Ever" /></td> - </tr> - <tr> - <td>Second Answer:</td> - <td><input type="text" name="a1" value="No" /></td> - </tr> - <tr> - <td>Third Answer:</td> - <td><input type="text" name="a2" value="Maybe not" /></td> - </tr> - <tr> - <td>Fourth Answer</td> - <td><input type="text" name="a3" value="Wait" /></td> - </tr> - <tr> - <td>Fifth Answer:</td> - <td><input type="text" name="a4" value="Maybe" /></td> - </tr> - <tr> - <td>Sixth Answer:</td> - <td><input type="text" name="a5" value="Yes" /></td> - </tr> - <tr> - <td>Seventh Answer:</td> - <td><input type="text" name="a6" value="Absolutely" /></td> - </tr> - <tr> - <td /> - <td><input type="button" class="btn btn-info" id="answerspost" - value="Set Answers"></td> - </tr> - </table> - </form> - <h3>Decision Maker Mode</h3> - <form name="modeform" id="modeform" method="POST"> - <table> - <tr> - <td><input name="mode" type="radio" value="random" - checked="checked">random</td> - <td><input name="mode" type="radio" value="pessimistic">pessimistic</td> - <td><input name="mode" type="radio" value="optimistic"> - optimistic</td> - <td><input name="mode" type="radio" value="dithering">dithering</td> - <td><input name="mode" type="radio" value="roundrobin">round - robin</td> - </tr> - <tr> - <td /> - <td /> - <td /> - <td /> - <td><input type="button" class="btn btn-info" id="modepost" - value="Make Decision"></td> - </tr> - </table> - </form> -</body> -</html> diff --git a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecisionExtraMode_Server.html b/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecisionExtraMode_Server.html deleted file mode 100644 index 06df67e59..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecisionExtraMode_Server.html +++ /dev/null @@ -1,156 +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========================================================= ---> - -<!-- http://localhost:23324/apex/EventIn --> - -<html> -<head> -<script src="http://code.jquery.com/jquery-latest.js"></script> -<script> - $(document).ready(function() { - $("#answerspost").click(function(e) { - var elements = document.getElementById("answerform").elements; - - var formValues = new Object; - formValues["name"] = "AnswerEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "text" && element.value != "") { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:23324/apex/RESTConsumer/EventIn", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Answers Set Successfully !!!"); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -<script> - $(document).ready(function() { - $("#modepost").click(function(e) { - var elements = document.getElementById("modeform").elements; - - var formValues = new Object; - formValues["name"] = "MakeDecisionEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "radio" && element.checked) { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:23324/apex/RESTConsumer/EventIn", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Decision Taken: " + data.decision); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -</head> -<body> - <h3>Decision Maker Answers</h3> - <form name="answerform" id="answerform" method="POST"> - <table> - <tr> - <td>First Answer:</td> - <td><input type="text" name="a0" value="Never Ever" /></td> - </tr> - <tr> - <td>Second Answer:</td> - <td><input type="text" name="a1" value="No" /></td> - </tr> - <tr> - <td>Third Answer:</td> - <td><input type="text" name="a2" value="Maybe not" /></td> - </tr> - <tr> - <td>Fourth Answer</td> - <td><input type="text" name="a3" value="Wait" /></td> - </tr> - <tr> - <td>Fifth Answer:</td> - <td><input type="text" name="a4" value="Maybe" /></td> - </tr> - <tr> - <td>Sixth Answer:</td> - <td><input type="text" name="a5" value="Yes" /></td> - </tr> - <tr> - <td>Seventh Answer:</td> - <td><input type="text" name="a6" value="Absolutely" /></td> - </tr> - <tr> - <td /> - <td><input type="button" class="btn btn-info" id="answerspost" - value="Set Answers"></td> - </tr> - </table> - </form> - <h3>Decision Maker Mode</h3> - <form name="modeform" id="modeform" method="POST"> - <table> - <tr> - <td><input name="mode" type="radio" value="random" - checked="checked">random</td> - <td><input name="mode" type="radio" value="pessimistic">pessimistic</td> - <td><input name="mode" type="radio" value="optimistic"> - optimistic</td> - <td><input name="mode" type="radio" value="dithering">dithering</td> - <td><input name="mode" type="radio" value="roundrobin">round - robin</td> - </tr> - <tr> - <td /> - <td /> - <td /> - <td /> - <td><input type="button" class="btn btn-info" id="modepost" - value="Make Decision"></td> - </tr> - </table> - </form> -</body> -</html> diff --git a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecision_Client.html b/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecision_Client.html deleted file mode 100644 index f7a3f0c5b..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecision_Client.html +++ /dev/null @@ -1,153 +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========================================================= ---> - -<!-- http://localhost:3904/events/toApex --> - -<html> -<head> -<script src="http://code.jquery.com/jquery-latest.js"></script> -<script> - $(document).ready(function() { - $("#answerspost").click(function(e) { - var elements = document.getElementById("answerform").elements; - - var formValues = new Object; - formValues["name"] = "AnswerEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "text" && element.value != "") { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:3904/events/toApex", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Answers Set Successfully !!!"); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -<script> - $(document).ready(function() { - $("#modepost").click(function(e) { - var elements = document.getElementById("modeform").elements; - - var formValues = new Object; - formValues["name"] = "MakeDecisionEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "radio" && element.checked) { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:3904/events/toApex", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Decision Taken: " + data.decision); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -</head> -<body> - <h3>Decision Maker Answers</h3> - <form name="answerform" id="answerform" method="POST"> - <table> - <tr> - <td>First Answer:</td> - <td><input type="text" name="a0" value="Never Ever" /></td> - </tr> - <tr> - <td>Second Answer:</td> - <td><input type="text" name="a1" value="No" /></td> - </tr> - <tr> - <td>Third Answer:</td> - <td><input type="text" name="a2" value="Maybe not" /></td> - </tr> - <tr> - <td>Fourth Answer</td> - <td><input type="text" name="a3" value="Wait" /></td> - </tr> - <tr> - <td>Fifth Answer:</td> - <td><input type="text" name="a4" value="Maybe" /></td> - </tr> - <tr> - <td>Sixth Answer:</td> - <td><input type="text" name="a5" value="Yes" /></td> - </tr> - <tr> - <td>Seventh Answer:</td> - <td><input type="text" name="a6" value="Absolutely" /></td> - </tr> - <tr> - <td /> - <td><input type="button" class="btn btn-info" id="answerspost" - value="Set Answers"></td> - </tr> - </table> - </form> - <h3>Decision Maker Mode</h3> - <form name="modeform" id="modeform" method="POST"> - <table> - <tr> - <td><input name="mode" type="radio" value="random" - checked="checked">random</td> - <td><input name="mode" type="radio" value="pessimistic">pessimistic</td> - <td><input name="mode" type="radio" value="optimistic"> - optimistic</td> - <td><input name="mode" type="radio" value="dithering">dithering</td> - </tr> - <tr> - <td /> - <td /> - <td /> - <td><input type="button" class="btn btn-info" id="modepost" - value="Make Decision"></td> - </tr> - </table> - </form> -</body> -</html> diff --git a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecision_Server.html b/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecision_Server.html deleted file mode 100644 index 4c8f311af..000000000 --- a/packages/apex-pdp-package-full/src/main/package/examples/html/DecisionMaker/MakeDecision_Server.html +++ /dev/null @@ -1,153 +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========================================================= ---> - -<!-- http://localhost:23324/apex/eventInput/EventIn --> - -<html> -<head> -<script src="http://code.jquery.com/jquery-latest.js"></script> -<script> - $(document).ready(function() { - $("#answerspost").click(function(e) { - var elements = document.getElementById("answerform").elements; - - var formValues = new Object; - formValues["name"] = "AnswerEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "text" && element.value != "") { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:23324/apex/RESTConsumer/EventIn", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Answers Set Successfully !!!"); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -<script> - $(document).ready(function() { - $("#modepost").click(function(e) { - var elements = document.getElementById("modeform").elements; - - var formValues = new Object; - formValues["name"] = "MakeDecisionEvent"; - for (var i = 0, element; element = elements[i++];) { - if (element.type === "radio" && element.checked) { - formValues[element.name] = element.value; - } - } - console.log(formValues); - var stringifiedForm = JSON.stringify(formValues); - console.log(stringifiedForm); - $.ajax({ - type : "POST", - url : "http://localhost:23324/apex/RESTConsumer/EventIn", - data : stringifiedForm, - crossDomain : true, - contentType : "application/json; charset=utf-8", - success : function(data) { - alert("Decision Taken: " + data.decision); - }, - failure : function(errMsg) { - alert(errMsg); - } - }); - e.preventDefault(); //STOP default action - - }); - }); -</script> -</head> -<body> - <h3>Decision Maker Answers</h3> - <form name="answerform" id="answerform" method="POST"> - <table> - <tr> - <td>First Answer:</td> - <td><input type="text" name="a0" value="Never Ever" /></td> - </tr> - <tr> - <td>Second Answer:</td> - <td><input type="text" name="a1" value="No" /></td> - </tr> - <tr> - <td>Third Answer:</td> - <td><input type="text" name="a2" value="Maybe not" /></td> - </tr> - <tr> - <td>Fourth Answer</td> - <td><input type="text" name="a3" value="Wait" /></td> - </tr> - <tr> - <td>Fifth Answer:</td> - <td><input type="text" name="a4" value="Maybe" /></td> - </tr> - <tr> - <td>Sixth Answer:</td> - <td><input type="text" name="a5" value="Yes" /></td> - </tr> - <tr> - <td>Seventh Answer:</td> - <td><input type="text" name="a6" value="Absolutely" /></td> - </tr> - <tr> - <td /> - <td><input type="button" class="btn btn-info" id="answerspost" - value="Set Answers"></td> - </tr> - </table> - </form> - <h3>Decision Maker Mode</h3> - <form name="modeform" id="modeform" method="POST"> - <table> - <tr> - <td><input name="mode" type="radio" value="random" - checked="checked">random</td> - <td><input name="mode" type="radio" value="pessimistic">pessimistic</td> - <td><input name="mode" type="radio" value="optimistic"> - optimistic</td> - <td><input name="mode" type="radio" value="dithering">dithering</td> - </tr> - <tr> - <td /> - <td /> - <td /> - <td><input type="button" class="btn btn-info" id="modepost" - value="Make Decision"></td> - </tr> - </table> - </form> -</body> -</html> 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 5aba49702..c1f71459e 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 @@ -17,13 +17,12 @@ :: ============LICENSE_END========================================================= :: -:: Script to run APEX Applications -:: Call -h for help +:: Script to run APEX Applications, call with '-h' for help :: - adding a new app means to add a command to APEX_APP_MAP and a description to APEX_APP_DESCR_MAP using same/unique key :: :: @package org.onap.policy.apex :: @author Sven van der Meer <sven.van.der.meer@ericsson.com> -:: @version v0.7.0 +:: @version v2.0.0 :: :: DO NOT CHANGE CODE BELOW, unless you know what you are doing @@ -72,16 +71,16 @@ set CLASSPATH=%APEX_HOME%\etc%cpsep%%APEX_HOME%\etc\hazelcast%cpsep%%APEX_HOME%\ :: array of applications with name=command :: declare -A APEX_APP_MAP -set APEX_APP_MAP[ws-console]=java -jar %APEX_HOME%\lib\applications\apex-apps.wsclients-simple-%_VERSION%-jar-with-dependencies.jar -c -set APEX_APP_MAP[ws-echo]=java -jar %APEX_HOME%\lib\applications\apex-apps.wsclients-simple-%_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.apps.generators.model.model2event.Application -set APEX_APP_MAP[model-2-cli]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -cp %CLASSPATH% %_CONFIG% org.onap.policy.apex.apps.generators.model.model2cli.Application -set APEX_APP_MAP[rest-editor]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\apex-services.client-editor-%_VERSION%-editor.jar +set APEX_APP_MAP[ws-console]=java -jar %APEX_HOME%\lib\applications\simple-wsclient-%_VERSION%-jar-with-dependencies.jar -c +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.Application +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.Application +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.ApexCLIEditorMain 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\apex-services.client-deployment-%_VERSION%-deployment.jar -set APEX_APP_MAP[eng-monitoring]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\apex-services.client-monitoring-%_VERSION%-monitoring.jar -set APEX_APP_MAP[full-client]=java -Dlogback.configurationFile=%APEX_HOME%\etc\logback.xml -jar %APEX_HOME%\lib\applications\apex-services.client-full-%_VERSION%-full.jar +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 :: array of applications with name=description :: declare -A APEX_APP_DESCR_MAP 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 c0397429b..d0e3f2efe 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 @@ -19,6 +19,15 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- +## +## Script to run APEX Applications, call with '-h' for help +## - requires BASH with associative arrays, bash of at least version 4 +## - for BASH examples with arrays see for instance: http://www.artificialworlds.net/blog/2012/10/17/bash-associative-array-examples/ +## - adding a new app means to add a command to APEX_APP_MAP and a description to APEX_APP_DESCR_MAP using same/unique key +## +## @package org.onap.policy.apex +## @author Sven van der Meer <sven.van.der.meer@ericsson.com> +## @version v2.0.0 ## ## DO NOT CHANGE CODE BELOW, unless you know what you are doing @@ -27,7 +36,7 @@ if [ -z $APEX_HOME ] then - APEX_HOME="/opt/app/policy/apex-pdp" + APEX_HOME="/opt/app/policy/apex-pdp/apex-pdp" fi if [ ! -d $APEX_HOME ] @@ -71,16 +80,16 @@ CLASSPATH="$APEX_HOME/etc${cpsep}$APEX_HOME/etc/hazelcast${cpsep}$APEX_HOME/etc/ ## array of applications with name=command declare -A APEX_APP_MAP -APEX_APP_MAP["ws-console"]="java -jar $APEX_HOME/lib/applications/apex-apps.wsclients-simple-$_version-jar-with-dependencies.jar -c" -APEX_APP_MAP["ws-echo"]="java -jar $APEX_HOME/lib/applications/apex-apps.wsclients-simple-$_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.apps.generators.model.model2event.Application" -APEX_APP_MAP["model-2-cli"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -cp ${CLASSPATH} $_config org.onap.policy.apex.apps.generators.model.model2cli.Application" -APEX_APP_MAP["rest-editor"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/apex-services.client-editor-$_version-editor.jar" +APEX_APP_MAP["ws-console"]="java -jar $APEX_HOME/lib/applications/simple-wsclient-$_version-jar-with-dependencies.jar -c" +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.Application" +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.Application" +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.ApexCLIEditorMain" 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/apex-services.client-deployment-$_version-deployment.jar" -APEX_APP_MAP["eng-monitoring"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/apex-services.client-monitoring-$_version-monitoring.jar" -APEX_APP_MAP["full-client"]="java -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -jar $APEX_HOME/lib/applications/apex-services.client-full-$_version-full.jar" +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" ## array of applications with name=description declare -A APEX_APP_DESCR_MAP diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.bat index c4cb649bc..165af595c 100644 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.bat +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.bat @@ -17,11 +17,11 @@ :: ============LICENSE_END========================================================= :: -:: Script to run the APEX CLI Editor +:: Script to run the APEX CLI Editor, calls apexApps.bat :: :: @package org.onap.policy.apex :: @author Sven van der Meer <sven.van.der.meer@ericsson.com> -:: @version v0.7.0 +:: @version v2.0.0 :: :: DO NOT CHANGE CODE BELOW, unless you know what you are doing diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.sh index 387a4d9cc..42c70fdb3 100755 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.sh +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexCLIEditor.sh @@ -21,14 +21,11 @@ #------------------------------------------------------------------------------- ## -## Script to run the APEX CLI Editor -## - requires BASH with associative arrays, bash of at least version 4 -## - for BASH examples with arrays see for instance: http://www.artificialworlds.net/blog/2012/10/17/bash-associative-array-examples/ -## - adding a new app means to add a command to APEX_APP_MAP and a description to APEX_APP_DESCR_MAP using same/unique key +## Script to run the APEX CLI Editor, calls apexApps.sh ## ## @package org.onap.policy.apex ## @author Sven van der Meer <sven.van.der.meer@ericsson.com> -## @version v0.7.0 +## @version v2.0.0 ## ## DO NOT CHANGE CODE BELOW, unless you know what you are doing diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.bat index d44adbbe6..a48a30055 100644 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.bat +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.bat @@ -17,11 +17,11 @@ :: ============LICENSE_END========================================================= :: -:: Script to run the APEX +:: Script to run the APEX, calls apexApps.bat :: :: @package org.onap.policy.apex :: @author Sven van der Meer <sven.van.der.meer@ericsson.com> -:: @version v0.7.0 +:: @version v2.0.0 :: :: DO NOT CHANGE CODE BELOW, unless you know what you are doing diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.sh index 0a251ab90..6a1386e0e 100755 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.sh +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexEngine.sh @@ -21,14 +21,11 @@ #------------------------------------------------------------------------------- ## -## Script to run the APEX -## - requires BASH with associative arrays, bash of at least version 4 -## - for BASH examples with arrays see for instance: http://www.artificialworlds.net/blog/2012/10/17/bash-associative-array-examples/ -## - adding a new app means to add a command to APEX_APP_MAP and a description to APEX_APP_DESCR_MAP using same/unique key +## Script to run the APEX, calls apexApps.sh ## ## @package org.onap.policy.apex ## @author Sven van der Meer <sven.van.der.meer@ericsson.com> -## @version v0.7.0 +## @version v2.0.0 ## ## DO NOT CHANGE CODE BELOW, unless you know what you are doing 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 index 69ada95bf..5942a2e1f 100644 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.bat +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.bat @@ -17,11 +17,11 @@ :: ============LICENSE_END========================================================= :: -:: Script to run the APEX REST Editor +:: Script to run the APEX REST Editor, calls apexApps.bat :: :: @package org.onap.policy.apex :: @author Sven van der Meer <sven.van.der.meer@ericsson.com> -:: @version v0.7.0 +:: @version v2.0.0 :: :: DO NOT CHANGE CODE BELOW, unless you know what you are doing 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 index cb3641f04..62ab50ea0 100755 --- a/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.sh +++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexRESTEditor.sh @@ -21,14 +21,11 @@ #------------------------------------------------------------------------------- ## -## Script to run the APEX REST Editor -## - requires BASH with associative arrays, bash of at least version 4 -## - for BASH examples with arrays see for instance: http://www.artificialworlds.net/blog/2012/10/17/bash-associative-array-examples/ -## - adding a new app means to add a command to APEX_APP_MAP and a description to APEX_APP_DESCR_MAP using same/unique key +## Script to run the APEX REST Editor, calls apexApps.sh ## ## @package org.onap.policy.apex ## @author Sven van der Meer <sven.van.der.meer@ericsson.com> -## @version v0.7.0 +## @version v2.0.0 ## ## DO NOT CHANGE CODE BELOW, unless you know what you are doing 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 1080506b6..6dd024f2d 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 @@ -26,7 +26,7 @@ <dependencySets> <dependencySet> <useProjectArtifact>true</useProjectArtifact> - <outputDirectory>/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <scope>runtime</scope> <includes> @@ -35,7 +35,7 @@ </dependencySet> <dependencySet> <useProjectArtifact>true</useProjectArtifact> - <outputDirectory>/war</outputDirectory> + <outputDirectory>war</outputDirectory> <unpack>false</unpack> <scope>runtime</scope> <includes> @@ -49,7 +49,7 @@ <includes> <include>*</include> </includes> - <outputDirectory>/bin</outputDirectory> + <outputDirectory>bin</outputDirectory> <fileMode>0755</fileMode> <lineEnding>unix</lineEnding> <excludes> @@ -61,7 +61,7 @@ <includes> <include>**/*</include> </includes> - <outputDirectory>/etc</outputDirectory> + <outputDirectory>etc</outputDirectory> <lineEnding>unix</lineEnding> <excludes> <exclude>*.formatted</exclude> @@ -72,7 +72,7 @@ <includes> <include>**/*</include> </includes> - <outputDirectory>/examples</outputDirectory> + <outputDirectory>examples</outputDirectory> <lineEnding>unix</lineEnding> <excludes> <exclude>*.formatted</exclude> @@ -83,7 +83,7 @@ <includes> <include>**/*</include> </includes> - <outputDirectory>/etc</outputDirectory> + <outputDirectory>etc</outputDirectory> <lineEnding>unix</lineEnding> <excludes> <exclude>*.formatted</exclude> @@ -94,7 +94,7 @@ <includes> <include>**/*</include> </includes> - <outputDirectory>/examples</outputDirectory> + <outputDirectory>examples</outputDirectory> <lineEnding>unix</lineEnding> <excludes> <exclude>*.formatted</exclude> @@ -105,7 +105,7 @@ <includes> <include>**/*</include> </includes> - <outputDirectory>/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <excludes> <exclude>*.formatted</exclude> </excludes> @@ -116,7 +116,7 @@ <includes> <include>readme_examples-servlet.txt</include> </includes> - <outputDirectory>/war</outputDirectory> + <outputDirectory>war</outputDirectory> </fileSet> </fileSets> </assembly> diff --git a/packages/apex-pdp-package-full/src/main/resources/app-version.txt b/packages/apex-pdp-package-full/src/main/resources/app-version.txt deleted file mode 100644 index f2ab45c3b..000000000 --- a/packages/apex-pdp-package-full/src/main/resources/app-version.txt +++ /dev/null @@ -1 +0,0 @@ -${project.version}
\ No newline at end of file |