Fix examples broken by checkstyle changes

Checkstyle changes to some class names must be propgated
into example configurations and name changes meant some
examples were not being packaged.

Issue-ID: POLICY-1034
Change-Id: I5485fc2ffc22c496bbae9465e1c3b09c4feade97
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

14 files changed, 29 insertions, 29 deletions

diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index fbfce9ade..070d2d86f 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -331,8 +331,8 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/models/DecisionMaker</outputDirectory>
-                                    <includes>/DecisionMakerPolicyModel.json</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -340,8 +340,8 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/models/Periodic</outputDirectory>
-                                    <includes>/PeriodicPolicyModel.json</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -349,8 +349,8 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/models/ONAPvCPE</outputDirectory>
-                                    <includes>/ONAPvCPEPolicyModel.json</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
@@ -358,8 +358,8 @@
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/etc</outputDirectory>
-                                    <includes>/readme_examples-servlet.txt</includes>
+                                    <outputDirectory>${project.build.directory}/examples/servlet</outputDirectory>
+                                    <includes>readme_examples-servlet.txt</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.tools</groupId>
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSJsonEvent.json
index 7f671bb63..7a2a0c4ea 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSJsonEvent.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSJsonEvent.json
@@ -22,7 +22,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "producerTopic": "jms/topic/apexOut",
@@ -43,7 +43,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "consumerTopic": "jms/topic/apexIn"
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSObjectEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSObjectEvent.json
index 1860e9823..9554ad062 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSObjectEvent.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSObjectEvent.json
@@ -22,7 +22,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "producerTopic": "jms/topic/apexOut"
@@ -42,7 +42,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "consumerTopic": "jms/topic/apexIn"
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEvent.json
index 593a27249..06af5e66c 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEvent.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEvent.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json
index 593a27249..06af5e66c 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json
index 4b44ac891..1415ee607 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutXmlEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutXmlEvent.json
index 48e60f8ac..6d9bad4fd 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutXmlEvent.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutXmlEvent.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json
index a7dc1577a..18447dfe1 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json
@@ -33,7 +33,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json
index 060e083a3..bae4f4130 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json
index b5c73eb23..3167fff37 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json
index 415a09481..c9ab0c065 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json
index a6095dcb3..d547c6805 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json
index c5f2b30f6..cb3ace171 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
diff --git a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json
index 692807a54..f87adffd8 100644
--- a/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json
+++ b/packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -33,7 +33,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {