aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/examples-aadm/pom.xml19
-rw-r--r--examples/examples-aadm/src/site/css/site.css100
-rw-r--r--examples/examples-aadm/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-aadm/src/site/site.xml28
-rw-r--r--examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java5
-rw-r--r--examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java25
-rw-r--r--examples/examples-adaptive/pom.xml19
-rw-r--r--examples/examples-adaptive/src/site/css/site.css100
-rw-r--r--examples/examples-adaptive/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-adaptive/src/site/site.xml28
-rw-r--r--examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java26
-rw-r--r--examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java5
-rw-r--r--examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java5
-rw-r--r--examples/examples-decisionmaker/pom.xml22
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Client.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Server.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Client.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Server.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.adoc14
-rw-r--r--examples/examples-decisionmaker/src/site/css/site.css100
-rw-r--r--examples/examples-decisionmaker/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-decisionmaker/src/site/site.xml44
-rw-r--r--examples/examples-grpc/pom.xml2
-rw-r--r--examples/examples-myfirstpolicy/pom.xml54
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/02-data-models.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/03-policy-step1.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/031-s1-new-model.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/032-s1-new-events.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/033-s1-new-policy.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/034-s1-test-policy.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/035-s1-clieditor.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/04-policy-step2.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/041-s2-extend-model.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/042-s2-test-policy.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/043-s2-clieditor.adoc14
-rw-r--r--examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.adoc16
-rw-r--r--examples/examples-myfirstpolicy/src/site/css/site.css100
-rw-r--r--examples/examples-myfirstpolicy/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-myfirstpolicy/src/site/site.xml44
-rw-r--r--examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java16
-rw-r--r--examples/examples-onap-bbs/pom.xml22
-rw-r--r--examples/examples-onap-bbs/src/site/css/site.css101
-rw-r--r--examples/examples-onap-bbs/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-onap-bbs/src/site/site.xml26
-rw-r--r--examples/examples-onap-vcpe/pom.xml22
-rw-r--r--examples/examples-onap-vcpe/src/site/css/site.css100
-rw-r--r--examples/examples-onap-vcpe/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-onap-vcpe/src/site/site.xml27
-rw-r--r--examples/examples-pcvs/pom.xml52
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/install.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/introduction.adoc16
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/policy.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.adoc14
-rw-r--r--examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.adoc14
-rw-r--r--examples/examples-pcvs/src/site/css/site.css119
-rw-r--r--examples/examples-pcvs/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-pcvs/src/site/site.xml54
-rw-r--r--examples/examples-periodic/pom.xml22
-rw-r--r--examples/examples-periodic/src/site/asciidoc/apex-configuration.adoc14
-rw-r--r--examples/examples-periodic/src/site/asciidoc/apex-model.adoc14
-rw-r--r--examples/examples-periodic/src/site/asciidoc/logic-task-output.adoc14
-rw-r--r--examples/examples-periodic/src/site/asciidoc/logic-task-periodic.adoc14
-rw-r--r--examples/examples-periodic/src/site/css/site.css100
-rw-r--r--examples/examples-periodic/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-periodic/src/site/site.xml31
-rw-r--r--examples/examples-servlet/pom.xml22
-rw-r--r--examples/examples-servlet/src/site/css/site.css100
-rw-r--r--examples/examples-servlet/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/examples-servlet/src/site/site.xml28
-rw-r--r--examples/pom.xml19
-rw-r--r--examples/src/site/css/site.css100
-rw-r--r--examples/src/site/images/logos.pngbin162383 -> 0 bytes
-rw-r--r--examples/src/site/site.xml27
103 files changed, 55 insertions, 2447 deletions
diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml
index 333802471..20b45944d 100644
--- a/examples/examples-aadm/pom.xml
+++ b/examples/examples-aadm/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-aadm</artifactId>
@@ -82,21 +82,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-aadm/src/site/css/site.css b/examples/examples-aadm/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-aadm/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-aadm/src/site/images/logos.png b/examples/examples-aadm/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-aadm/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-aadm/src/site/site.xml b/examples/examples-aadm/src/site/site.xml
deleted file mode 100644
index 281fbc2ea..000000000
--- a/examples/examples-aadm/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples AADM">
- <body>
- <menu name="APEX Examples AADM">
- <item href="javadocs/index.html" name="API Doc" />
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="AADM" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
index a44a4cc1a..fe9914061 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * 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.
@@ -20,7 +21,7 @@
package org.onap.policy.apex.examples.aadm;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class AadmModelTest {
@Test
public void testModelValid() throws Exception {
final AxValidationResult result = testApexModel.testApexModelValid();
- assertTrue(result.toString().equals(VALID_MODEL_STRING));
+ assertEquals(VALID_MODEL_STRING, result.toString());
}
@Test
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
index 8e05aff51..430074ea8 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmUseCaseTest.java
@@ -22,6 +22,7 @@
package org.onap.policy.apex.examples.aadm;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -157,7 +158,7 @@ public class AadmUseCaseTest {
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
// no DOS_IN_eNodeB set so return probe action
- assertTrue(result.get("ACTTASK").equals("probe"));
+ assertEquals("probe", result.get("ACTTASK"));
assertTrue((boolean) result.get("TCP_ON"));
assertTrue((boolean) result.get("PROBE_ON"));
logger.info("Receiving action event with {} action", result.get("ACTTASK"));
@@ -195,7 +196,7 @@ public class AadmUseCaseTest {
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
// DOS_IN_eNodeB set to be more than throughput so return act action
- assertTrue(result.get("ACTTASK").equals("act"));
+ assertEquals("act", result.get("ACTTASK"));
// only one imsi was sent to process, so stop probe and tcp
assertTrue(!(boolean) result.get("TCP_ON"));
assertTrue(!(boolean) result.get("PROBE_ON"));
@@ -232,7 +233,7 @@ public class AadmUseCaseTest {
result = listener.getResult();
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
- assertTrue(result.get("ACTTASK").equals("probe"));
+ assertEquals("probe", result.get("ACTTASK"));
assertTrue((boolean) result.get("TCP_ON"));
assertTrue((boolean) result.get("PROBE_ON"));
assertEquals(99, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -267,7 +268,7 @@ public class AadmUseCaseTest {
result = listener.getResult();
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
- assertTrue(result.get("ACTTASK").equals("act"));
+ assertEquals("act", result.get("ACTTASK"));
assertTrue(!(boolean) result.get("TCP_ON"));
assertTrue(!(boolean) result.get("PROBE_ON"));
assertEquals(98, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -304,7 +305,7 @@ public class AadmUseCaseTest {
result = listener.getResult();
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
- assertTrue(result.get("ACTTASK").equals("act"));
+ assertEquals("act", result.get("ACTTASK"));
assertTrue(!(boolean) result.get("TCP_ON"));
assertTrue(!(boolean) result.get("PROBE_ON"));
assertEquals(100, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -337,7 +338,7 @@ public class AadmUseCaseTest {
result = listener.getResult();
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
- assertTrue(result.get("ACTTASK").equals("probe"));
+ assertEquals("probe", result.get("ACTTASK"));
assertTrue((boolean) result.get("TCP_ON"));
assertTrue((boolean) result.get("PROBE_ON"));
assertEquals(99, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -375,7 +376,7 @@ public class AadmUseCaseTest {
result = listener.getResult();
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
- assertTrue(result.get("ACTTASK").equals("probe"));
+ assertEquals("probe", result.get("ACTTASK"));
assertTrue((boolean) result.get("TCP_ON"));
assertTrue((boolean) result.get("PROBE_ON"));
assertEquals(102, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -408,7 +409,7 @@ public class AadmUseCaseTest {
result = listener.getResult();
assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
- assertTrue(result.get("ACTTASK").equals("probe"));
+ assertEquals("probe", result.get("ACTTASK"));
assertTrue((boolean) result.get("TCP_ON"));
assertTrue((boolean) result.get("PROBE_ON"));
assertEquals(102, ((ENodeBStatus) eNodeBStatusAlbum.get("123")).getDosCount());
@@ -417,8 +418,8 @@ public class AadmUseCaseTest {
apexEngine.handleEvent(result);
result = listener.getResult();
assertTrue(result.getName().startsWith("SAPCBlacklistSubscriberEvent"));
- assertTrue(result.get("PROFILE").equals("ServiceA"));
- assertTrue(result.get("BLACKLIST_ON").equals(true));
+ assertEquals("ServiceA", result.get("PROFILE"));
+ assertTrue((boolean) result.get("BLACKLIST_ON"));
event = apexEngine.createEvent(new AxArtifactKey("PeriodicEvent", "0.0.1"));
event.put("PERIODIC_EVENT_COUNT", (long) 100);
@@ -431,8 +432,8 @@ public class AadmUseCaseTest {
assertTrue(result.getName().startsWith("SAPCBlacklistSubscriberEvent"));
assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId());
assertEquals(0L, result.get("IMSI"));
- assertTrue(result.get("PROFILE").equals("ServiceA"));
- assertTrue(result.get("BLACKLIST_ON").equals(false));
+ assertEquals("ServiceA", result.get("PROFILE"));
+ assertFalse((boolean) result.get("BLACKLIST_ON"));
apexEngine.stop();
}
diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index ade620b1d..3cd580ec1 100644
--- a/examples/examples-adaptive/pom.xml
+++ b/examples/examples-adaptive/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-adaptive</artifactId>
@@ -92,21 +92,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-adaptive/src/site/css/site.css b/examples/examples-adaptive/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-adaptive/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-adaptive/src/site/images/logos.png b/examples/examples-adaptive/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-adaptive/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-adaptive/src/site/site.xml b/examples/examples-adaptive/src/site/site.xml
deleted file mode 100644
index 38b71fe1b..000000000
--- a/examples/examples-adaptive/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples Adaptive">
- <body>
- <menu name="APEX Examples Adaptive">
- <item href="javadocs/index.html" name="API Doc" />
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="Adaptive" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
index f1c8d7dca..d24733224 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionConceptTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (c) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 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.
@@ -23,6 +24,7 @@ package org.onap.policy.apex.examples.adaptive;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.LinkedList;
@@ -65,40 +67,40 @@ public class AnomalyDetectionConceptTest {
public void testEquals() {
AnomalyDetection anomalyDetection = new AnomalyDetection();
AnomalyDetection comparisonDetection = new AnomalyDetection();
- assertTrue(anomalyDetection.equals(comparisonDetection));
+ assertEquals(anomalyDetection, comparisonDetection);
//Compare object to itself
- assertTrue(anomalyDetection.equals(anomalyDetection));
+ assertEquals(anomalyDetection, anomalyDetection);
//Compare object to null
- assertFalse(anomalyDetection.equals(null));
+ assertNotNull(anomalyDetection);
//compare object to string
- assertFalse(anomalyDetection.equals("test"));
+ assertNotEquals(anomalyDetection, "test");
// Anomaly Scores comparison
anomalyDetection.setAnomalyScores(null);
- assertFalse(anomalyDetection.equals(comparisonDetection));
+ assertNotEquals(anomalyDetection, comparisonDetection);
comparisonDetection.setAnomalyScores(null);
- assertTrue(anomalyDetection.equals(comparisonDetection));
+ assertEquals(anomalyDetection, comparisonDetection);
List<Double> anomalyScores = new LinkedList<>();
anomalyScores.add((double) 20);
anomalyDetection.setAnomalyScores(anomalyScores);
- assertFalse(anomalyDetection.equals(comparisonDetection));
+ assertNotEquals(anomalyDetection, comparisonDetection);
comparisonDetection.setAnomalyScores(anomalyScores);
assertTrue(anomalyDetection.checkSetAnomalyScores());
//First Round Checks
anomalyDetection.setFirstRound(false);
- assertFalse(anomalyDetection.equals(comparisonDetection));
+ assertNotEquals(anomalyDetection, comparisonDetection);
anomalyDetection.setFirstRound(true);
//Frequency Checks
anomalyDetection.setFrequency(55);
- assertFalse(anomalyDetection.equals(comparisonDetection));
+ assertNotEquals(anomalyDetection, comparisonDetection);
anomalyDetection.setFrequency(0);
//FrequencyForecasted Checks
List<Double> comparisonFrequency = new LinkedList<>();
comparisonDetection.setFrequencyForecasted(comparisonFrequency);
- assertFalse(anomalyDetection.equals(comparisonDetection));
+ assertNotEquals(anomalyDetection, comparisonDetection);
anomalyDetection.setFrequencyForecasted(anomalyScores);
- assertFalse(anomalyDetection.equals(comparisonDetection));
+ assertNotEquals(anomalyDetection, comparisonDetection);
anomalyDetection.setFrequencyForecasted(comparisonFrequency);
- assertTrue(anomalyDetection.equals(comparisonDetection));
+ assertEquals(anomalyDetection, comparisonDetection);
}
@Test
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
index 5a36d4070..85cecbe8b 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionModelTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -20,7 +21,7 @@
package org.onap.policy.apex.examples.adaptive;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class AnomalyDetectionModelTest {
@Test
public void testModelValid() throws Exception {
final AxValidationResult result = testApexModel.testApexModelValid();
- assertTrue(result.toString().equals(VALID_MODEL_STRING));
+ assertEquals(VALID_MODEL_STRING, result.toString());
}
@Test
diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
index 1823f9871..3479ccc9e 100644
--- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
+++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnModelTest.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -20,7 +21,7 @@
package org.onap.policy.apex.examples.adaptive;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class AutoLearnModelTest {
@Test
public void testModelValid() throws Exception {
final AxValidationResult result = testApexModel.testApexModelValid();
- assertTrue(result.toString().equals(VALID_MODEL_STRING));
+ assertEquals(VALID_MODEL_STRING, result.toString());
}
@Test
diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml
index 279dbd50c..59e010339 100644
--- a/examples/examples-decisionmaker/pom.xml
+++ b/examples/examples-decisionmaker/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-decisionmaker</artifactId>
@@ -110,24 +110,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-decisionmaker-dir>${project.basedir}/src</adsite-examples-decisionmaker-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.adoc
deleted file mode 100644
index 65eae44bd..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.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-decisionmaker-dir}/site-docs/adoc/fragments/AnswerInitTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.adoc b/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.adoc
deleted file mode 100644
index bf92e0f95..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.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-decisionmaker-dir}/site-docs/adoc/fragments/AnswerInitiationEvents.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.adoc b/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.adoc
deleted file mode 100644
index 82edf2a9a..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.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-decisionmaker-dir}/site-docs/adoc/fragments/ApexConfigRESTClient.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.adoc b/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.adoc
deleted file mode 100644
index 3b3609a54..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.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-decisionmaker-dir}/site-docs/adoc/fragments/ApexConfigRESTServer.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.adoc b/examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.adoc
deleted file mode 100644
index 30c65ba4a..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.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-decisionmaker-dir}/site-docs/adoc/fragments/DecisionMakerPolicyModel.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.adoc
deleted file mode 100644
index 3a6b03c67..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/DitheringAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Client.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Client.adoc
deleted file mode 100644
index 9271a7c74..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Client.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-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecisionExtraMode_Client.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Server.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Server.adoc
deleted file mode 100644
index c00131280..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Server.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-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecisionExtraMode_Server.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.adoc
deleted file mode 100644
index ec45f45ee..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.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-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecisionStateTSL.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Client.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Client.adoc
deleted file mode 100644
index 19999abf9..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Client.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-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecision_Client.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Server.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Server.adoc
deleted file mode 100644
index cf45fead6..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Server.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-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecision_Server.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.adoc
deleted file mode 100644
index 4bc4e4f07..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/OptimisticAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.adoc
deleted file mode 100644
index 2a252b326..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/PessimisticAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.adoc
deleted file mode 100644
index d63d41176..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/RandomAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.adoc
deleted file mode 100644
index ddb789dc9..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/RoundRobinAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/css/site.css b/examples/examples-decisionmaker/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-decisionmaker/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-decisionmaker/src/site/images/logos.png b/examples/examples-decisionmaker/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-decisionmaker/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-decisionmaker/src/site/site.xml b/examples/examples-decisionmaker/src/site/site.xml
deleted file mode 100644
index d65f22ee5..000000000
--- a/examples/examples-decisionmaker/src/site/site.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples Decision Maker">
- <body>
- <menu name="APEX Examples Decision Maker">
- <item href="ApexConfigRESTClient.html" name="Config: REST Client" />
- <item href="ApexConfigRESTServer.html" name="Config: REST Server" />
- <item href="AnswerInitiationEvents.html" name="Inititation Events" />
- <item href="MakeDecision_Client.html" name="HTML Client" />
- <item href="MakeDecision_Server.html" name="HTML Server" />
- <item href="MakeDecisionExtraMode_Client.html" name="HTML Client (Extra)" />
- <item href="MakeDecisionExtraMode_Server.html" name="HTML Server (Extra)" />
- <item href="DecisionMakerPolicyModel.html" name="APEX Model (Policy)"
- collapse="true">
- <item href="AnswerInitTask.html" name="Task Logic: Answer Init" />
- <item href="DitheringAnswerTask.html" name="Task Logic: Dithering Answer" />
- <item href="MakeDecisionStateTSL.html" name="Task Selection Logic: Make Decision State" />
- <item href="OptimisticAnswerTask.html" name="Task Logic: Optimistic Answer" />
- <item href="PessimisticAnswerTask.html" name="Task Logic: Pessimistic Answer" />
- <item href="RandomAnswerTask.html" name="Task Logic: Random Answer" />
- <item href="RoundRobinAnswerTask.html" name="Task Logic: RoundRobin Answer" />
- </item>
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="Decision Maker" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml
index de581203b..3e0b699c0 100644
--- a/examples/examples-grpc/pom.xml
+++ b/examples/examples-grpc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-grpc</artifactId>
<name>examples-grpc</name>
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index 9be6be74a..14edad4ec 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-myfirstpolicy</artifactId>
@@ -180,56 +180,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-myfirstpolicy-dir>${project.basedir}/src
- </adsite-examples-myfirstpolicy-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/
- </url>
- </site>
- </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
- <executions>
- <execution>
- <id>copy-domain-mfp-images</id>
- <phase>initialize</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${project.basedir}/src/site-docs/adoc/resources/images</directory>
- <includes>
- <include>**/*.jpg</include>
- <include>**/*.png</include>
- </includes>
- </resource>
- </resources>
- <outputDirectory>${project.build.directory}/site/images</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/02-data-models.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/02-data-models.adoc
deleted file mode 100644
index dca728dfa..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/02-data-models.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-myfirstpolicy-dir}/site-docs/adoc/fragments/02-data-models.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/03-policy-step1.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/03-policy-step1.adoc
deleted file mode 100644
index 2bf3aa44c..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/03-policy-step1.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-myfirstpolicy-dir}/site-docs/adoc/fragments/03-policy-step1.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/031-s1-new-model.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/031-s1-new-model.adoc
deleted file mode 100644
index c3f05c5b0..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/031-s1-new-model.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-myfirstpolicy-dir}/site-docs/adoc/fragments/031-s1-new-model.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/032-s1-new-events.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/032-s1-new-events.adoc
deleted file mode 100644
index 044c21ecd..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/032-s1-new-events.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-myfirstpolicy-dir}/site-docs/adoc/fragments/032-s1-new-events.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/033-s1-new-policy.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/033-s1-new-policy.adoc
deleted file mode 100644
index d7d279b3d..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/033-s1-new-policy.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-myfirstpolicy-dir}/site-docs/adoc/fragments/033-s1-new-policy.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/034-s1-test-policy.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/034-s1-test-policy.adoc
deleted file mode 100644
index 43a026a4c..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/034-s1-test-policy.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-myfirstpolicy-dir}/site-docs/adoc/fragments/034-s1-test-policy.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/035-s1-clieditor.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/035-s1-clieditor.adoc
deleted file mode 100644
index 2c3063055..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/035-s1-clieditor.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-myfirstpolicy-dir}/site-docs/adoc/fragments/035-s1-clieditor.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/04-policy-step2.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/04-policy-step2.adoc
deleted file mode 100644
index 155c888e5..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/04-policy-step2.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-myfirstpolicy-dir}/site-docs/adoc/fragments/04-policy-step2.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/041-s2-extend-model.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/041-s2-extend-model.adoc
deleted file mode 100644
index d2b4a9952..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/041-s2-extend-model.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-myfirstpolicy-dir}/site-docs/adoc/fragments/041-s2-extend-model.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/042-s2-test-policy.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/042-s2-test-policy.adoc
deleted file mode 100644
index 454fee841..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/042-s2-test-policy.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-myfirstpolicy-dir}/site-docs/adoc/fragments/042-s2-test-policy.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/043-s2-clieditor.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/043-s2-clieditor.adoc
deleted file mode 100644
index ca39675c5..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/043-s2-clieditor.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-myfirstpolicy-dir}/site-docs/adoc/fragments/043-s2-clieditor.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.adoc
deleted file mode 100644
index 83fe34043..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.adoc
+++ /dev/null
@@ -1,16 +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)
-//
-
-= HowTo: My First Policy
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/01-introduction.adoc[]
diff --git a/examples/examples-myfirstpolicy/src/site/css/site.css b/examples/examples-myfirstpolicy/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-myfirstpolicy/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-myfirstpolicy/src/site/images/logos.png b/examples/examples-myfirstpolicy/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-myfirstpolicy/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-myfirstpolicy/src/site/site.xml b/examples/examples-myfirstpolicy/src/site/site.xml
deleted file mode 100644
index 4dae4202a..000000000
--- a/examples/examples-myfirstpolicy/src/site/site.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples My First Policy">
- <body>
- <menu name="APEX Examples My First Policy">
- <item href="MyFirstPolicyHowto.html" name="HowTo: My First Policy"
- collapse="true">
- <item href="02-data-models.html" name="Data Models" />
- <item href="03-policy-step1.html" name="Policy Step 1">
- <item href="031-s1-new-model.html" name="New Policy Model" />
- <item href="032-s1-new-events.html" name="Events" />
- <item href="033-s1-new-policy.html" name="New Policy" />
- <item href="034-s1-test-policy.html" name="Test the Policy" />
- <item href="035-s1-clieditor.html" name="CLI Editor File" />
- </item>
- <item href="04-policy-step2.html" name="Policy Step 2">
- <item href="041-s2-extend-model.html" name="Extend Policy Model" />
- <item href="042-s2-test-policy.html" name="Test the Policy" />
- <item href="043-s2-clieditor.html" name="CLI Editor File" />
- </item>
- </item>
- <item href="javadocs/index.html" name="API Doc" />
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="My First Policy" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
index c495bd32b..8afe7d7cd 100644
--- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
+++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpUseCaseTest.java
@@ -308,12 +308,12 @@ public class MfpUseCaseTest {
gb.create().fromJson(ResourceUtils.getResourceAsString(inputFile), JsonObject.class);
assertNotNull(jsonObject);
assertTrue(jsonObject.has("name"));
- assertTrue(ret.getName().equals(jsonObject.get("name").getAsString()));
- assertTrue(ret.getAxEvent().getKey().getName().equals(jsonObject.get("name").getAsString()));
+ assertEquals(ret.getName(), jsonObject.get("name").getAsString());
+ assertEquals(ret.getAxEvent().getKey().getName(), jsonObject.get("name").getAsString());
assertTrue(jsonObject.has("nameSpace"));
- assertTrue(ret.getAxEvent().getNameSpace().equals(jsonObject.get("nameSpace").getAsString()));
+ assertEquals(ret.getAxEvent().getNameSpace(), jsonObject.get("nameSpace").getAsString());
assertTrue(jsonObject.has("version"));
- assertTrue(ret.getAxEvent().getKey().getVersion().equals(jsonObject.get("version").getAsString()));
+ assertEquals(ret.getAxEvent().getKey().getVersion(), jsonObject.get("version").getAsString());
final List<String> reserved = Arrays.asList("name", "nameSpace", "version", "source", "target");
for (final Map.Entry<String, ?> e : jsonObject.entrySet()) {
if (reserved.contains(e.getKey())) {
@@ -375,12 +375,12 @@ public class MfpUseCaseTest {
gb.create().fromJson(ResourceUtils.getResourceAsString(inputFile), JsonObject.class);
assertNotNull(jsonObject);
assertTrue(jsonObject.has("name"));
- assertTrue(ret.getName().equals(jsonObject.get("name").getAsString()));
- assertTrue(ret.getAxEvent().getKey().getName().equals(jsonObject.get("name").getAsString()));
+ assertEquals(ret.getName(), jsonObject.get("name").getAsString());
+ assertEquals(ret.getAxEvent().getKey().getName(), jsonObject.get("name").getAsString());
assertTrue(jsonObject.has("nameSpace"));
- assertTrue(ret.getAxEvent().getNameSpace().equals(jsonObject.get("nameSpace").getAsString()));
+ assertEquals(ret.getAxEvent().getNameSpace(), jsonObject.get("nameSpace").getAsString());
assertTrue(jsonObject.has("version"));
- assertTrue(ret.getAxEvent().getKey().getVersion().equals(jsonObject.get("version").getAsString()));
+ assertEquals(ret.getAxEvent().getKey().getVersion(), jsonObject.get("version").getAsString());
final List<String> reserved = Arrays.asList("name", "nameSpace", "version", "source", "target");
for (final Map.Entry<String, ?> e : jsonObject.entrySet()) {
if (reserved.contains(e.getKey())) {
diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml
index ca82d6af7..1f9d3407c 100644
--- a/examples/examples-onap-bbs/pom.xml
+++ b/examples/examples-onap-bbs/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-onap-bbs</artifactId>
@@ -119,24 +119,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-onap-bbs-dir>${project.basedir}/src</adsite-examples-onap-bbs-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-onap-bbs/src/site/css/site.css b/examples/examples-onap-bbs/src/site/css/site.css
deleted file mode 100644
index 92ddec619..000000000
--- a/examples/examples-onap-bbs/src/site/css/site.css
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Copyright (C) 2019 Huawei. 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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-onap-bbs/src/site/images/logos.png b/examples/examples-onap-bbs/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-onap-bbs/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-onap-bbs/src/site/site.xml b/examples/examples-onap-bbs/src/site/site.xml
deleted file mode 100644
index 9e14cadfe..000000000
--- a/examples/examples-onap-bbs/src/site/site.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2016-2018 Ericsson. All rights reserved.
- Copyright (C) 2019 Huawei. 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=========================================================
-
--->
-
-<project name="APEX Examples ONAP BBS">
- <body>
- <menu name="APEX Examples ONAP BBS">
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="ONAP BBS" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index 172773627..2e3ba979e 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-onap-vcpe</artifactId>
@@ -177,24 +177,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-onap-vcpe-dir>${project.basedir}/src</adsite-examples-onap-vcpe-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-onap-vcpe/src/site/css/site.css b/examples/examples-onap-vcpe/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-onap-vcpe/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-onap-vcpe/src/site/images/logos.png b/examples/examples-onap-vcpe/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-onap-vcpe/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-onap-vcpe/src/site/site.xml b/examples/examples-onap-vcpe/src/site/site.xml
deleted file mode 100644
index f9808e698..000000000
--- a/examples/examples-onap-vcpe/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples ONAP vCPE">
- <body>
- <menu name="APEX Examples ONAP vCPE">
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="ONAP vCPE" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index e62056e3a..9ad46a259 100644
--- a/examples/examples-pcvs/pom.xml
+++ b/examples/examples-pcvs/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-pcvs</artifactId>
@@ -104,54 +104,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-pcvs-dir>${project.basedir}/src</adsite-examples-pcvs-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
- <executions>
- <execution>
- <id>copy-domain-pcvs-images</id>
- <phase>initialize</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
- <directory>${project.basedir}/src/site-docs/adoc/resources/images</directory>
- <includes>
- <include>**/*.jpg</include>
- <include>**/*.png</include>
- </includes>
- </resource>
- </resources>
- <outputDirectory>${project.build.directory}/site/images</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-pcvs/src/site/asciidoc/install.adoc b/examples/examples-pcvs/src/site/asciidoc/install.adoc
deleted file mode 100644
index ea18374d9..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/install.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-pcvs-dir}/site-docs/adoc/fragments/install.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/introduction.adoc b/examples/examples-pcvs/src/site/asciidoc/introduction.adoc
deleted file mode 100644
index e22dc3f2d..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/introduction.adoc
+++ /dev/null
@@ -1,16 +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)
-//
-
-== Policy-controlled Video Streaming (pcvs) with APEX
-
-include::{adsite-examples-pcvs-dir}/site-docs/adoc/fragments/introduction.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla.adoc
deleted file mode 100644
index 92d9037a2..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.adoc
deleted file mode 100644
index 02976d3ed..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/avro-ctxt.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.adoc
deleted file mode 100644
index 34bdee8fa..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/avro-internal.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.adoc
deleted file mode 100644
index 8f015d0fd..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/avro-trigger.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.adoc
deleted file mode 100644
index c5733789e..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/cli-spec.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.adoc
deleted file mode 100644
index 3a5dda657..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-events-customers.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.adoc
deleted file mode 100644
index 14f569303..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-events-edges.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.adoc
deleted file mode 100644
index 7571dad3b..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-events-nodes.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.adoc
deleted file mode 100644
index 9acb06a58..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-logic-customer.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.adoc
deleted file mode 100644
index 5d8a8ddc3..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-logic-edges.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.adoc
deleted file mode 100644
index 207e37700..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-logic-nodes.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.adoc
deleted file mode 100644
index c5727383f..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/events-trigger.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.adoc
deleted file mode 100644
index 0aac08fcf..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-act.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.adoc
deleted file mode 100644
index 1a9f228c5..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-none.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.adoc
deleted file mode 100644
index 8b672f194..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-priority.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.adoc
deleted file mode 100644
index 84173e125..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-sla.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.adoc
deleted file mode 100644
index 60fc26884..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-solved.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.adoc
deleted file mode 100644
index 1e4d6e5c3..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.adoc
deleted file mode 100644
index a2f0b33db..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-establish.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.adoc
deleted file mode 100644
index 2f4842a05..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-match.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/policy.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/policy.adoc
deleted file mode 100644
index a2bf5a7a0..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/policy.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/policy.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.adoc
deleted file mode 100644
index 600caa763..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/python-linkmonitor.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.adoc
deleted file mode 100644
index 925ae3eca..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/python-mininet.adoc[]
diff --git a/examples/examples-pcvs/src/site/css/site.css b/examples/examples-pcvs/src/site/css/site.css
deleted file mode 100644
index 67baa6d52..000000000
--- a/examples/examples-pcvs/src/site/css/site.css
+++ /dev/null
@@ -1,119 +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=========================================================
- */
-
-/*
- * ============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=========================================================
- */
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-pcvs/src/site/images/logos.png b/examples/examples-pcvs/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-pcvs/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-pcvs/src/site/site.xml b/examples/examples-pcvs/src/site/site.xml
deleted file mode 100644
index ddfd850cd..000000000
--- a/examples/examples-pcvs/src/site/site.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples PCVS">
- <body>
- <menu name="APEX Examples PCVS">
- <item href="introduction.html" name="Introduction" />
- <item href="install.html" name="Install Ubuntu Server and SW" />
- <item href="vpnsla.html" name="VPN SLA Demo" />
- <item href="vpnsla/policy.html" name="VPN SLA Policy" collapse="true">
- <item href="vpnsla/avro-ctxt.html" name="Context Schemas" />
- <item href="vpnsla/avro-internal.html" name="Internal Schemas" />
- <item href="vpnsla/avro-trigger.html" name="Trigger Schema" />
- <item href="vpnsla/ctxt-logic-nodes.html" name="Context Logic Nodes" />
- <item href="vpnsla/ctxt-logic-edges.html" name="Context Logic Edges" />
- <item href="vpnsla/ctxt-logic-customer.html" name="Context Logic Customers" />
- <item href="vpnsla/logic-match.html" name="Logic: Match" />
- <item href="vpnsla/logic-establish.html" name="Logic: Establish" />
- <item href="vpnsla/logic-decide.html" name="Logic: Decide" />
- <item href="vpnsla/logic-decide-none.html" name="Logic: Decide None" />
- <item href="vpnsla/logic-decide-solved.html" name="Logic: Decide Solved" />
- <item href="vpnsla/logic-decide-sla.html" name="Logic: Decide SLA" />
- <item href="vpnsla/logic-decide-priority.html" name="Logic: Decide Priority" />
- <item href="vpnsla/logic-act.html" name="Logic: Act" />
- <item href="vpnsla/cli-spec.html" name="CLI Spec" />
- <item href="vpnsla/ctxt-events-nodes.html" name="Context Events Nodes" />
- <item href="vpnsla/ctxt-events-edges.html" name="Context Events Edges" />
- <item href="vpnsla/ctxt-events-customers.html" name="Context Events Customers" />
- <item href="vpnsla/events-trigger.html" name="Trigger Examples" />
- <item href="vpnsla/python-linkmonitor.html" name="Link Monitor" />
- <item href="vpnsla/python-mininet.html" name="Mininet Topology" />
- </item>
- <item href="javadocs/index.html" name="API Doc" />
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="pcvs" href="index.html" />
- </breadcrumbs>
- </body>
-</project>
diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml
index b3528f5c4..dcbfd1084 100644
--- a/examples/examples-periodic/pom.xml
+++ b/examples/examples-periodic/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-periodic</artifactId>
@@ -70,24 +70,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-periodic-dir>${project.basedir}/src</adsite-examples-periodic-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-periodic/src/site/asciidoc/apex-configuration.adoc b/examples/examples-periodic/src/site/asciidoc/apex-configuration.adoc
deleted file mode 100644
index dd244807a..000000000
--- a/examples/examples-periodic/src/site/asciidoc/apex-configuration.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/apex-configuration.adoc[]
diff --git a/examples/examples-periodic/src/site/asciidoc/apex-model.adoc b/examples/examples-periodic/src/site/asciidoc/apex-model.adoc
deleted file mode 100644
index 4a25a7b0a..000000000
--- a/examples/examples-periodic/src/site/asciidoc/apex-model.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/apex-model.adoc[]
diff --git a/examples/examples-periodic/src/site/asciidoc/logic-task-output.adoc b/examples/examples-periodic/src/site/asciidoc/logic-task-output.adoc
deleted file mode 100644
index 9418a817e..000000000
--- a/examples/examples-periodic/src/site/asciidoc/logic-task-output.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/logic-task-output.adoc[]
diff --git a/examples/examples-periodic/src/site/asciidoc/logic-task-periodic.adoc b/examples/examples-periodic/src/site/asciidoc/logic-task-periodic.adoc
deleted file mode 100644
index eec55f1d1..000000000
--- a/examples/examples-periodic/src/site/asciidoc/logic-task-periodic.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/logic-task-periodic.adoc[]
diff --git a/examples/examples-periodic/src/site/css/site.css b/examples/examples-periodic/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-periodic/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-periodic/src/site/images/logos.png b/examples/examples-periodic/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-periodic/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-periodic/src/site/site.xml b/examples/examples-periodic/src/site/site.xml
deleted file mode 100644
index 56e2bda3c..000000000
--- a/examples/examples-periodic/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples Periodic Policy">
- <body>
- <menu name="APEX Domains Periodic Policy">
- <item href="apex-configuration.html" name="APEX Configuration" />
- <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" />
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="Periodic Policy" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml
index 0f6a49275..744293f6f 100644
--- a/examples/examples-servlet/pom.xml
+++ b/examples/examples-servlet/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
<artifactId>examples</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<artifactId>examples-servlet</artifactId>
@@ -77,24 +77,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <properties>
- <adsite-examples-servlet-dir>${project.basedir}/src</adsite-examples-servlet-dir>
- </properties>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/examples-servlet/src/site/css/site.css b/examples/examples-servlet/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-servlet/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-servlet/src/site/images/logos.png b/examples/examples-servlet/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-servlet/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/examples-servlet/src/site/site.xml b/examples/examples-servlet/src/site/site.xml
deleted file mode 100644
index 156a8709b..000000000
--- a/examples/examples-servlet/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples Servlet">
- <body>
- <menu name="APEX Examples Servlet">
- <item href="javadocs/index.html" name="API Doc" />
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="Servlet" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index b457a7ec9..0faa70707 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.apex-pdp</groupId>
<artifactId>apex-pdp</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -53,21 +53,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>apexSite</id>
- <activation>
- <property>
- <name>apexSite</name>
- </property>
- </activation>
- <distributionManagement>
- <site>
- <id>${project.artifactId}-site</id>
- <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
</project>
diff --git a/examples/src/site/css/site.css b/examples/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/src/site/css/site.css
+++ /dev/null
@@ -1,100 +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=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/src/site/images/logos.png b/examples/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/src/site/images/logos.png
+++ /dev/null
Binary files differ
diff --git a/examples/src/site/site.xml b/examples/src/site/site.xml
deleted file mode 100644
index e58f71876..000000000
--- a/examples/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============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)
-
--->
-
-<project name="APEX Examples">
- <body>
- <menu name="APEX Examples">
- </menu>
- <menu ref="reports" inherit="top" />
- <menu ref="modules" />
-
- <breadcrumbs>
- <item name="Examples" href="index.html" />
- </breadcrumbs>
- </body>
-</project> \ No newline at end of file