summaryrefslogtreecommitdiffstats
path: root/examples/examples-periodic/src
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-09-05 15:46:31 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-09-06 13:26:24 +0100
commita41c877a6b1980e0e866699633e0289d9a3fdbb5 (patch)
tree4f8d15559549760c2e74880871ec08c3b8df2d0e /examples/examples-periodic/src
parent825ae627d4378c5cc7ab4b7d5f4b4ffefcb7977e (diff)
Fix package of apex examples and documents
The examples are not packaged correctly in the apex build and the client wars are missing The links and location of the documents are corrected. Some POM duplicate dependencies removed. Javadoc warnings removed. Issue-ID: POLICY-867 Change-Id: I555c29191c61c0a9887365d95005dbc584eddf04 Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'examples/examples-periodic/src')
-rw-r--r--examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json58
-rw-r--r--examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc2
-rw-r--r--examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc20
-rw-r--r--examples/examples-periodic/src/site/asciidoc/dockerfile.adoc14
-rw-r--r--examples/examples-periodic/src/site/site.xml1
5 files changed, 59 insertions, 36 deletions
diff --git a/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json b/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json
new file mode 100644
index 000000000..a4c94779b
--- /dev/null
+++ b/examples/examples-periodic/src/main/resources/examples/config/Periodic/ApexConfigPeriodic.json
@@ -0,0 +1,58 @@
+{
+ "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/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc b/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc
index 612149818..5540f1591 100644
--- a/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc
+++ b/examples/examples-periodic/src/site-docs/adoc/fragments/apex-configuration.adoc
@@ -16,5 +16,5 @@
.APEX configuration
[source,json,options="nowrap"]
----
-include::{adsite-examples-periodic-dir}/main/resources/config/ApexConfigPeriodic.json[APEX configuration]
+include::{adsite-examples-periodic-dir}/main/resources/examples/config/Periodic/ApexConfigPeriodic.json[APEX configuration]
----
diff --git a/examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc b/examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc
deleted file mode 100644
index 3ee66b3bd..000000000
--- a/examples/examples-periodic/src/site-docs/adoc/fragments/dockerfile.adoc
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// ============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)
-//
-
-== Dockerfile
-
-.Dockerfile
-[source,bash,options="nowrap"]
-----
-include::{adsite-examples-periodic-dir}/../Dockerfile[Dockerfile]
-----
diff --git a/examples/examples-periodic/src/site/asciidoc/dockerfile.adoc b/examples/examples-periodic/src/site/asciidoc/dockerfile.adoc
deleted file mode 100644
index ba5e19bef..000000000
--- a/examples/examples-periodic/src/site/asciidoc/dockerfile.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============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-examples-periodic-dir}/site-docs/adoc/fragments/dockerfile.adoc[]
diff --git a/examples/examples-periodic/src/site/site.xml b/examples/examples-periodic/src/site/site.xml
index fc2b846cb..56e2bda3c 100644
--- a/examples/examples-periodic/src/site/site.xml
+++ b/examples/examples-periodic/src/site/site.xml
@@ -20,7 +20,6 @@
<item href="apex-model.html" name="APEX Model (Policy)" />
<item href="logic-task-output.html" name="Logic: Output Task" />
<item href="logic-task-periodic.html" name="Logic: Periodic Task" />
- <item href="dockerfile.html" name="Dockerfile" />
</menu>
<menu ref="reports" inherit="top" />
<menu ref="modules" />