Refactor unit test data

There were many copies of test policies and examples
strewn through the Apex unit tests. This change cleans
up the unit tests so that a single version of all example
policies is used in all tests.

Also added a new relative file root command line parameter
to Apex to allow the root of relative paths in configuration
files to be set.

Apologies for the size of this review but unfortunately
all of this must be done in one shot.

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

59 files changed, 3083 insertions, 134 deletions

diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java
index db214636b..05829e452 100644
--- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java
@@ -65,7 +65,6 @@ public class EvalDomainModelFactory {
     private static final String EVENT = "Event";
     private static final String TASK_SELECTION_LOGIC = "TaskSelectionLogic";
     private static final String JYTHON = "JYTHON";
-    private static final String JRUBY = "JRUBY";
     private static final String MVEL = "MVEL";
     private static final String ORIENT = "Orient";
     private static final String STATE_NAME = "<STATE_NAME>";
@@ -221,7 +220,7 @@ public class EvalDomainModelFactory {
         obTask.duplicateInputFields(event0000.getParameterMap());
         obTask.duplicateOutputFields(event0001.getParameterMap());
         final AxTaskLogic obAxLogic = new AxTaskLogic(obTask.getKey(), TASK_LOGIC,
-                        (justOneLang == null ? JRUBY : justOneLang), logicReader);
+                        (justOneLang == null ? JAVASCRIPT : justOneLang), logicReader);
         obAxLogic.setLogic(obAxLogic.getLogic().replaceAll(STATE_NAME, OBSERVE)
                         .replaceAll(TASK_NAME, obTask.getKey().getName()).replaceAll(STATE_NUMBER, "1"));
         obTask.setTaskLogic(obAxLogic);
@@ -361,7 +360,6 @@ public class EvalDomainModelFactory {
             axLogicExecutorTypeList.add(JYTHON);
             axLogicExecutorTypeList.add(JYTHON);
             axLogicExecutorTypeList.add(MVEL);
-            axLogicExecutorTypeList.add(JRUBY);
         }
         return axLogicExecutorTypeList;
     }
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
index 854a9bb3c..0dd59ed86 100644
--- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/DefaultTaskLogic.java
@@ -20,7 +20,6 @@
 
 package org.onap.policy.apex.testsuites.integration.common.model.java;
 
-import java.util.Date;
 import java.util.Random;
 
 import org.onap.policy.apex.core.engine.executor.context.TaskExecutionContext;
@@ -49,24 +48,23 @@ public class DefaultTaskLogic {
         String inFieldsString = executor.inFields.toString();
         executor.logger.debug(inFieldsString);
 
-        final Date timeNow = new Date();
         final Random rand = new Random();
 
         if (executor.inFields.containsKey("TestDecideCaseSelected")) {
             executor.outFields.put("TestActCaseSelected", (byte) rand.nextInt(BOUND_FOR_RANDOM_INT));
-            executor.outFields.put("TestActStateTime", timeNow.getTime());
+            executor.outFields.put("TestActStateTime", java.lang.System.nanoTime());
         }
         else if (executor.inFields.containsKey("TestEstablishCaseSelected")) {
             executor.outFields.put("TestDecideCaseSelected", (byte) rand.nextInt(BOUND_FOR_RANDOM_INT));
-            executor.outFields.put("TestDecideStateTime", timeNow.getTime());
+            executor.outFields.put("TestDecideStateTime", java.lang.System.nanoTime());
         }
         else if (executor.inFields.containsKey("TestMatchCaseSelected")) {
             executor.outFields.put("TestEstablishCaseSelected", (byte) rand.nextInt(BOUND_FOR_RANDOM_INT));
-            executor.outFields.put("TestEstablishStateTime", timeNow.getTime());
+            executor.outFields.put("TestEstablishStateTime", java.lang.System.nanoTime());
         }
         else {
             executor.outFields.put("TestMatchCaseSelected", (byte) rand.nextInt(BOUND_FOR_RANDOM_INT));
-            executor.outFields.put("TestMatchStateTime", timeNow.getTime());
+            executor.outFields.put("TestMatchStateTime", java.lang.System.nanoTime());
         }
 
         return true;
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java
index 2d60926f6..29c58f148 100644
--- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/java/EvalTaskLogic.java
@@ -20,8 +20,6 @@
 
 package org.onap.policy.apex.testsuites.integration.common.model.java;
 
-import java.util.Date;
-
 import org.onap.policy.apex.core.engine.executor.context.TaskExecutionContext;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 
@@ -46,8 +44,7 @@ public class EvalTaskLogic {
         
         executor.outFields.putAll(executor.inFields);
 
-        final Date timeNow = new Date();
-        executor.outFields.put("State3Timestamp", timeNow.getTime());
+        executor.outFields.put("State3Timestamp", java.lang.System.nanoTime());
         
         String outFieldString = executor.outFields.toString();
         executor.logger.debug(outFieldString);
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java
new file mode 100644
index 000000000..31e0f3978
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/PingTestClass.java
@@ -0,0 +1,147 @@
+/*-
+ * ============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=========================================================
+ */
+
+package org.onap.policy.apex.testsuites.integration.common.testclasses;
+
+import java.io.Serializable;
+
+import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
+
+/**
+ * The Class TestPing.
+ *
+ * @author Liam Fallon (liam.fallon@ericsson.com)
+ */
+public class PingTestClass implements Serializable {
+    private static final long serialVersionUID = -3400711508992955886L;
+
+    private String name = "Rose";
+    private String description = "A rose by any other name would smell as sweet";
+    private long pingTime = System.currentTimeMillis();
+    private long pongTime = -1;
+
+    /**
+     * Gets the name.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the name.
+     *
+     * @param name the new name
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * Gets the description.
+     *
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the description.
+     *
+     * @param description the new description
+     */
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    /**
+     * Gets the ping time.
+     *
+     * @return the ping time
+     */
+    public long getPingTime() {
+        return pingTime;
+    }
+
+    /**
+     * Sets the ping time.
+     *
+     * @param pingTime the new ping time
+     */
+    public void setPingTime(final long pingTime) {
+        this.pingTime = pingTime;
+    }
+
+    /**
+     * Gets the pong time.
+     *
+     * @return the pong time
+     */
+    public long getPongTime() {
+        return pongTime;
+    }
+
+    /**
+     * Sets the pong time.
+     *
+     * @param pongTime the new pong time
+     */
+    public void setPongTime(final long pongTime) {
+        this.pongTime = pongTime;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "TestPing [name=" + name + ", description=" + description + ", pingTime=" + pingTime + ", pongTime="
+                + pongTime + "]";
+    }
+
+    /**
+     * Verify the class.
+     *
+     * @throws ApexException the apex event exception
+     */
+    public void verify() throws ApexException {
+        if (name == null || name.length() < 4) {
+            throw new ApexException("TestPing is not valid, name length null or less than 4");
+        }
+
+        if (!name.startsWith("Rose")) {
+            throw new ApexException("TestPing is not valid, name does not start with \"Rose\"");
+        }
+
+        if (description == null || description.length() <= 44) {
+            throw new ApexException("TestPing is not valid, description length null or less than 44");
+        }
+
+        if (!description.startsWith("A rose by any other name would smell as sweet")) {
+            throw new ApexException("TestPing is not valid, description is incorrect");
+        }
+
+        if (pongTime <= pingTime) {
+            throw new ApexException("TestPing is not valid, pong time is not greater than ping time");
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/package-info.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/package-info.java
new file mode 100644
index 000000000..320b36467
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/testclasses/package-info.java
@@ -0,0 +1,26 @@
+/*-
+ * ============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=========================================================
+ */
+
+/**
+ * Package for common test classes for Apex.
+ *
+ * @author Liam Fallon (liam.fallon@ericsson.com)
+ */
+package org.onap.policy.apex.testsuites.integration.common.testclasses;
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/JMS/JMS2JMSJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/JMS/JMS2JMSJsonEvent.json
new file mode 100644
index 000000000..dbab4827b
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/JMS/JMS2JMSJsonEvent.json
@@ -0,0 +1,59 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12553,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "JMS",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters",
+                "parameters": {
+                    "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory",
+                    "connectionFactory": "ConnectionFactory",
+                    "providerURL": "remote://localhost:5445",
+                    "securityPrincipal": "guest",
+                    "securityCredentials": "IAmAGuest",
+                    "producerTopic": "jms/topic/apexOut",
+                    "objectMessageSending": "false"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JMSTEXT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsTextEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "JMS",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters",
+                "parameters": {
+                    "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory",
+                    "connectionFactory": "ConnectionFactory",
+                    "providerURL": "remote://localhost:5445",
+                    "securityPrincipal": "guest",
+                    "securityCredentials": "IAmAGuest",
+                    "consumerTopic": "jms/topic/apexIn"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JMSTEXT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsTextEventProtocolParameters"
+            }
+        }
+    }
+}
+
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/JMS/JMS2JMSObjectEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/JMS/JMS2JMSObjectEvent.json
new file mode 100644
index 000000000..1df3febfb
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/JMS/JMS2JMSObjectEvent.json
@@ -0,0 +1,58 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12553,
+        "policyModelFileName": "examples/models/JMS/JMSTestModel.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "JMS",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters",
+                "parameters": {
+                    "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory",
+                    "connectionFactory": "ConnectionFactory",
+                    "providerURL": "remote://localhost:5445",
+                    "securityPrincipal": "guest",
+                    "securityCredentials": "IAmAGuest",
+                    "producerTopic": "jms/topic/apexOut"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JMSOBJECT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsObjectEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "JMS",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.jms.JmsCarrierTechnologyParameters",
+                "parameters": {
+                    "initialContextFactory": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms.TestInitialContextFactory",
+                    "connectionFactory": "ConnectionFactory",
+                    "providerURL": "remote://localhost:5445",
+                    "securityPrincipal": "guest",
+                    "securityCredentials": "IAmAGuest",
+                    "consumerTopic": "jms/topic/apexIn"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JMSOBJECT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.jms.JmsObjectEventProtocolParameters"
+            }
+        }
+    }
+}
+
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredInJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredInJsonEvent.json
new file mode 100644
index 000000000..9b621b70f
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredInJsonEvent.json
@@ -0,0 +1,44 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "inputZero": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]000$"
+        }
+    },
+    "eventOutputParameters": {
+        "outputZero": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/Events0004Out.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredInOutJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredInOutJsonEvent.json
new file mode 100644
index 000000000..bab8191dd
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredInOutJsonEvent.json
@@ -0,0 +1,69 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "inputZero": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]000$"
+        },
+        "inputOne": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]100$"
+        }
+    },
+    "eventOutputParameters": {
+        "outputZero": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/Events0004Out.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]004$"
+        },
+        "outputOne": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/Events0104Out.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]104$"
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredOutJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredOutJsonEvent.json
new file mode 100644
index 000000000..e0257699b
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileFilteredOutJsonEvent.json
@@ -0,0 +1,56 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "inputZero": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "outputZero": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/Events0004Out.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]004$"
+        },
+        "outputOne": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/Events0104Out.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "eventNameFilter": "^E[Vv][Ee][Nn][Tt][0-9]104$"
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEvent.json
new file mode 100644
index 000000000..bfd399263
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEvent.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOut.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncMIMO.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncMIMO.json
new file mode 100644
index 000000000..b8fe2f9ed
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncMIMO.json
@@ -0,0 +1,87 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer0": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti0.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aConsumer1": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti1.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aConsumer2": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti2.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer0": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti0.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aProducer1": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti1.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aProducer2": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti2.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncMISO.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncMISO.json
new file mode 100644
index 000000000..b02c5ee71
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncMISO.json
@@ -0,0 +1,65 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer0": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti0.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aConsumer1": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti1.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aConsumer2": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti2.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutSingle.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncSIMO.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncSIMO.json
new file mode 100644
index 000000000..79ec1557c
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncSIMO.json
@@ -0,0 +1,65 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer0": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti0.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aProducer1": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti1.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        },
+        "aProducer2": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti2.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncSISO.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncSISO.json
new file mode 100644
index 000000000..3308d08e5
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventAsyncSISO.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutSingle.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventSyncMIMO.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventSyncMIMO.json
new file mode 100644
index 000000000..fea2f5319
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventSyncMIMO.json
@@ -0,0 +1,105 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer0": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti0.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "aProducer0",
+            "synchronousTimeout": 1000
+        },
+        "aConsumer1": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti1.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "aProducer1",
+            "synchronousTimeout": 1000
+        },
+        "aConsumer2": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsInMulti2.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "aProducer2",
+            "synchronousTimeout": 1000
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer0": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti0.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "aConsumer0",
+            "synchronousTimeout": 1000
+        },
+        "aProducer1": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti1.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "aConsumer1",
+            "synchronousTimeout": 1000
+        },
+        "aProducer2": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutMulti2.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "aConsumer2",
+            "synchronousTimeout": 1000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventSyncSISO.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventSyncSISO.json
new file mode 100644
index 000000000..7aac345cb
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileJsonEventSyncSISO.json
@@ -0,0 +1,49 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12545,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "SyncProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOutSingle.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SyncConsumer",
+            "synchronousTimeout": 1000
+        }
+    },
+    "eventInputParameters": {
+        "SyncConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SyncProducer",
+            "synchronousTimeout": 1000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileXmlEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileXmlEvent.json
new file mode 100644
index 000000000..e985b10d4
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2FileXmlEvent.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12546,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOut.xmlfile"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.xmlfile"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2RESTJsonEventPost.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2RESTJsonEventPost.json
new file mode 100644
index 000000000..54955eb54
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2RESTJsonEventPost.json
@@ -0,0 +1,44 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestFile2Rest/apex/event/PostEvent"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2RESTJsonEventPut.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2RESTJsonEventPut.json
new file mode 100644
index 000000000..70d8deded
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2RESTJsonEventPut.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestFile2Rest/apex/event/PutEvent",
+                    "httpMethod": "PUT"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StderrJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StderrJsonEvent.json
new file mode 100644
index 000000000..429e9564f
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StderrJsonEvent.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardError": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEvent.json
new file mode 100644
index 000000000..06af5e66c
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEvent.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json
new file mode 100644
index 000000000..06af5e66c
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json
new file mode 100644
index 000000000..1415ee607
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.json",
+        "engineParameters": {
+            "executorParameters": {
+                "MVEL": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutXmlEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutXmlEvent.json
new file mode 100644
index 000000000..6d9bad4fd
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/File2StdoutXmlEvent.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsIn.xmlfile"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2FileJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2FileJsonEvent.json
new file mode 100644
index 000000000..e72a6474a
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2FileJsonEvent.json
@@ -0,0 +1,55 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOut.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "KAFKA",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
+                "parameters": {
+                    "bootstrapServers": "localhost:49092",
+                    "groupId": "apex-group-id",
+                    "enableAutoCommit": true,
+                    "autoCommitTime": 1000,
+                    "sessionTimeout": 30000,
+                    "consumerPollTime": 100,
+                    "consumerTopicList": [
+                        "apex-in-0",
+                        "apex-in-1"
+                    ],
+                    "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer",
+                    "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2KafkaJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2KafkaJsonEvent.json
new file mode 100644
index 000000000..6b13db7d4
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2KafkaJsonEvent.json
@@ -0,0 +1,63 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12547,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "KAFKA",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
+                "parameters": {
+                    "bootstrapServers": "localhost:39902",
+                    "acks": "all",
+                    "retries": 0,
+                    "batchSize": 16384,
+                    "lingerTime": 1,
+                    "bufferMemory": 33554432,
+                    "producerTopic": "apex-out-json",
+                    "keySerializer": "org.apache.kafka.common.serialization.StringSerializer",
+                    "valueSerializer": "org.apache.kafka.common.serialization.StringSerializer"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "KAFKA",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
+                "parameters": {
+                    "bootstrapServers": "localhost:39902",
+                    "groupId": "apex-group-id",
+                    "enableAutoCommit": true,
+                    "autoCommitTime": 1000,
+                    "sessionTimeout": 30000,
+                    "consumerPollTime": 100,
+                    "consumerTopicList": [
+                        "apex-in-json"
+                    ],
+                    "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer",
+                    "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2KafkaXmlEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2KafkaXmlEvent.json
new file mode 100644
index 000000000..abb61802c
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2KafkaXmlEvent.json
@@ -0,0 +1,65 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 3,
+        "deploymentPort": 12548,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "KAFKA",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
+                "parameters": {
+                    "bootstrapServers": "localhost:39902",
+                    "acks": "all",
+                    "retries": 0,
+                    "batchSize": 16384,
+                    "lingerTime": 1,
+                    "bufferMemory": 33554432,
+                    "producerTopic": "apex-out-xml",
+                    "keySerializer": "org.apache.kafka.common.serialization.StringSerializer",
+                    "valueSerializer": "org.apache.kafka.common.serialization.StringSerializer"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "KAFKA",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
+                "parameters": {
+                    "bootstrapServers": "localhost:39902",
+                    "groupId": "apex-group-id",
+                    "enableAutoCommit": true,
+                    "autoCommitTime": 1000,
+                    "sessionTimeout": 30000,
+                    "consumerPollTime": 100,
+                    "consumerTopicList": [
+                        "apex-in-xml"
+                    ],
+                    "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer",
+                    "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2RESTJsonEventJava.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2RESTJsonEventJava.json
new file mode 100644
index 000000000..32defff92
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Kafka2RESTJsonEventJava.json
@@ -0,0 +1,56 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVA": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestFile2Rest/apex/event/PostEvent"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "TheKafkaConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "KAFKA",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
+                "parameters": {
+                    "bootstrapServers": "localhost:49092",
+                    "groupId": "apex-group-id",
+                    "enableAutoCommit": true,
+                    "autoCommitTime": 1000,
+                    "sessionTimeout": 30000,
+                    "consumerPollTime": 100,
+                    "consumerTopicList": [
+                        "apex-in-0",
+                        "apex-in-1"
+                    ],
+                    "keyDeserializer": "org.apache.kafka.common.serialization.StringDeserializer",
+                    "valueDeserializer": "org.apache.kafka.common.serialization.StringDeserializer"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2FileJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2FileJsonEvent.json
new file mode 100644
index 000000000..f83541340
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2FileJsonEvent.json
@@ -0,0 +1,44 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestRest2File/apex/event/GetEvent"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "fileName": "examples/events/SampleDomain/EventsOut.json"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2RESTJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2RESTJsonEvent.json
new file mode 100644
index 000000000..fca96852a
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2RESTJsonEvent.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestRest2REST/apex/event/GetEvent"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestRest2REST/apex/event/PostEvent"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2RESTONAPJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2RESTONAPJsonEvent.json
new file mode 100644
index 000000000..e8a23e4f5
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/REST2RESTONAPJsonEvent.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://192.168.219.142:3904/events/apexDMaaP/apexCG/apexC?timeout=10000"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://192.168.219.142:3904/events/apexDMaaPOut"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerJsonEvent.json
new file mode 100644
index 000000000..7b84b7246
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerJsonEvent.json
@@ -0,0 +1,50 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                "parameters": {
+                    "standalone": true,
+                    "host": "0.0.0.0",
+                    "port": 23324
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstProducer",
+            "synchronousTimeout": 2000
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstConsumer",
+            "synchronousTimeout": 2000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerJsonEventMultiIn.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerJsonEventMultiIn.json
new file mode 100644
index 000000000..366dea3cb
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerJsonEventMultiIn.json
@@ -0,0 +1,79 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                "parameters": {
+                    "standalone": true,
+                    "host": "localhost",
+                    "port": 23324
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstProducer",
+            "synchronousTimeout": 2000
+        },
+        "SecondConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                "parameters": {
+                    "standalone": true,
+                    "host": "localhost",
+                    "port": 23325
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SecondProducer",
+            "synchronousTimeout": 2000
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstConsumer",
+            "synchronousTimeout": 2000
+        },
+        "SecondProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SecondConsumer",
+            "synchronousTimeout": 2000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerStandaloneJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerStandaloneJsonEvent.json
new file mode 100644
index 000000000..8c99fc188
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerStandaloneJsonEvent.json
@@ -0,0 +1,50 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                "parameters": {
+                    "standalone": true,
+                    "host": "localhost",
+                    "port": 23324
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstProducer",
+            "synchronousTimeout": 2000
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstConsumer",
+            "synchronousTimeout": 2000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerStandaloneJsonEventMultiIn.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerStandaloneJsonEventMultiIn.json
new file mode 100644
index 000000000..4058517ae
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerStandaloneJsonEventMultiIn.json
@@ -0,0 +1,79 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                "parameters": {
+                    "standalone": true,
+                    "host": "localhost",
+                    "port": 23324
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstProducer",
+            "synchronousTimeout": 2000
+        },
+        "SecondConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
+                "parameters": {
+                    "standalone": true,
+                    "host": "localhost",
+                    "port": 23325
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SecondProducer",
+            "synchronousTimeout": 2000
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstConsumer",
+            "synchronousTimeout": 2000
+        },
+        "SecondProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SecondConsumer",
+            "synchronousTimeout": 2000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerTomcatJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerTomcatJsonEvent.json
new file mode 100644
index 000000000..12337346f
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerTomcatJsonEvent.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstProducer",
+            "synchronousTimeout": 2000
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstConsumer",
+            "synchronousTimeout": 2000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerTomcatJsonEventMultiIn.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerTomcatJsonEventMultiIn.json
new file mode 100644
index 000000000..55fdfc82f
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/RESTServerTomcatJsonEventMultiIn.json
@@ -0,0 +1,69 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12561,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstProducer",
+            "synchronousTimeout": 2000
+        },
+        "SecondConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SecondProducer",
+            "synchronousTimeout": 2000
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "FirstConsumer",
+            "synchronousTimeout": 2000
+        },
+        "SecondProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTSERVER",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            },
+            "synchronousMode": true,
+            "synchronousPeer": "SecondConsumer",
+            "synchronousTimeout": 2000
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json
new file mode 100644
index 000000000..18447dfe1
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json
@@ -0,0 +1,44 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVA": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "RESTCLIENT",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
+                "parameters": {
+                    "url": "http://localhost:32801/TestFile2Rest/apex/event/PostEvent"
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "TheFileConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json
new file mode 100644
index 000000000..bae4f4130
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJRUBY.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JRUBY": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.jruby.JrubyExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json
new file mode 100644
index 000000000..3167fff37
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVA.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVA": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json
new file mode 100644
index 000000000..c9ab0c065
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json
new file mode 100644
index 000000000..d547c6805
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJYTHON.json",
+        "engineParameters": {
+            "executorParameters": {
+                "JYTHON": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.jython.JythonExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json
new file mode 100644
index 000000000..cb3ace171
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json
@@ -0,0 +1,43 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelMVEL.json",
+        "engineParameters": {
+            "executorParameters": {
+                "MVEL": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json
new file mode 100644
index 000000000..f87adffd8
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json
@@ -0,0 +1,45 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12345,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "FirstProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "FirstConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "FILE",
+                "parameters": {
+                    "standardIo": true
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsClientJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsClientJsonEvent.json
new file mode 100644
index 000000000..2b0805736
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsClientJsonEvent.json
@@ -0,0 +1,47 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12552,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "host": "localhost",
+                    "port": 42453
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "host": "localhost",
+                    "port": 42451
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsClientXMLEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsClientXMLEvent.json
new file mode 100644
index 000000000..f6ad417a7
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsClientXMLEvent.json
@@ -0,0 +1,49 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12553,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "host": "localhost",
+                    "port": 42453
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "host": "localhost",
+                    "port": 42451
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsServerJsonEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsServerJsonEvent.json
new file mode 100644
index 000000000..ef5a258c2
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsServerJsonEvent.json
@@ -0,0 +1,47 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12554,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "wsClient": false,
+                    "port": 42452
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "wsClient": false,
+                    "port": 42450
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "JSON"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsServerXMLEvent.json b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsServerXMLEvent.json
new file mode 100644
index 000000000..9251d80c9
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/config/SampleDomain/Ws2WsServerXMLEvent.json
@@ -0,0 +1,49 @@
+{
+    "engineServiceParameters": {
+        "name": "MyApexEngine",
+        "version": "0.0.1",
+        "id": 45,
+        "instanceCount": 4,
+        "deploymentPort": 12555,
+        "policyModelFileName": "examples/models/SampleDomain/SamplePolicyModelJAVASCRIPT.xml",
+        "engineParameters": {
+            "executorParameters": {
+                "JAVASCRIPT": {
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
+                }
+            }
+        }
+    },
+    "eventOutputParameters": {
+        "aProducer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "wsClient": false,
+                    "port": 42452
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    },
+    "eventInputParameters": {
+        "aConsumer": {
+            "carrierTechnologyParameters": {
+                "carrierTechnology": "WEBSOCKET",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.websocket.WebSocketCarrierTechnologyParameters",
+                "parameters": {
+                    "wsClient": false,
+                    "port": 42450
+                }
+            },
+            "eventProtocolParameters": {
+                "eventProtocol": "XML",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.protocol.xml.XmlEventProtocolParameters"
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.xmlfile b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.xmlfile
index 21b9b1975..3c42ddcb2 100644
--- a/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.xmlfile
+++ b/testsuites/integration/integration-common/src/main/resources/examples/events/SampleDomain/EventsIn.xmlfile
@@ -20,11 +20,11 @@
 -->
 
 <!-- This file contains multiple XML documents containing events, it is used to represent a stream of events as contiguous XML documents-->
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
+	<!-- This is the first event-->
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -48,7 +48,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -72,7 +72,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -96,7 +96,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -120,7 +120,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -144,7 +144,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -168,7 +168,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -192,7 +192,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -216,7 +216,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -240,7 +240,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -264,7 +264,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -288,7 +288,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -312,7 +312,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -336,7 +336,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -360,7 +360,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -384,7 +384,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -408,7 +408,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -432,7 +432,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -456,7 +456,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -480,7 +480,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -504,7 +504,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -528,7 +528,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -552,7 +552,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -576,7 +576,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -600,7 +600,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -624,7 +624,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -648,7 +648,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -672,7 +672,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -696,7 +696,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -720,7 +720,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -744,7 +744,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -768,7 +768,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -792,7 +792,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -816,7 +816,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -840,7 +840,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -864,7 +864,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -888,7 +888,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -912,7 +912,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -936,7 +936,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -960,7 +960,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -984,7 +984,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1008,7 +1008,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1032,7 +1032,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1056,7 +1056,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1080,7 +1080,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1104,7 +1104,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1128,7 +1128,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1152,7 +1152,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1176,7 +1176,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1200,7 +1200,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1224,7 +1224,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1248,7 +1248,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1272,7 +1272,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1296,7 +1296,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1320,7 +1320,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1344,7 +1344,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1368,7 +1368,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1392,7 +1392,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1416,7 +1416,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1440,7 +1440,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1464,7 +1464,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1488,7 +1488,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1512,7 +1512,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1536,7 +1536,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1560,7 +1560,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1584,7 +1584,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1608,7 +1608,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1632,7 +1632,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1656,7 +1656,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1680,7 +1680,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1704,7 +1704,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1728,7 +1728,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1752,7 +1752,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1776,7 +1776,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1800,7 +1800,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1824,7 +1824,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1848,7 +1848,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1872,7 +1872,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1896,7 +1896,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1920,7 +1920,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1944,7 +1944,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1968,7 +1968,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -1992,7 +1992,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2016,7 +2016,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2040,7 +2040,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2064,7 +2064,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2088,7 +2088,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2112,7 +2112,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2136,7 +2136,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2160,7 +2160,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2184,7 +2184,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2208,7 +2208,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2232,7 +2232,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2256,7 +2256,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2280,7 +2280,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0100</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2304,7 +2304,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2328,7 +2328,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2352,7 +2352,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2376,7 +2376,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
@@ -2400,7 +2400,7 @@
 <xmlApexEvent xmlns="http://www.onap.org/policy/apex-pdp/apexevent">
   <name>Event0000</name>
   <version>0.0.1</version>
-  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>
+  <nameSpace>org.onap.policy.apex.domains.sample.events</nameSpace>
   <source>test</source>
   <target>apex</target>
   <data>
diff --git a/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json b/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json
new file mode 100644
index 000000000..02365bcdb
--- /dev/null
+++ b/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json
@@ -0,0 +1,456 @@
+{
+    "apexPolicyModel": {
+        "key": {
+            "name": "JMSTestModel",
+            "version": "0.0.1"
+        },
+        "keyInformation": {
+            "key": {
+                "name": "JMSTestModel_KeyInfo",
+                "version": "0.0.1"
+            },
+            "keyInfoMap": {
+                "entry": [
+                    {
+                        "key": {
+                            "name": "JMSCopyInOutTask",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSCopyInOutTask",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "b59815ef-fc5b-4e44-9f6e-2f6212bb7296",
+                            "description": "Generated description for a concept called \"JMSCopyInOutTask\" with version \"null\" and UUID \"b59815ef-fc5b-4e44-9f6e-2f6212bb7296\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "a731a845-f984-46a9-adf4-c6c7ca0baa0d",
+                            "description": "Generated description for a concept called \"JMSTestModel\" with version \"null\" and UUID \"a731a845-f984-46a9-adf4-c6c7ca0baa0d\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel_Albums",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel_Albums",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "b580c2e2-067e-452c-8410-d69344fa718c",
+                            "description": "Generated description for concept referred to by key \"JMSTestModel_Albums:0.0.1\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel_Events",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel_Events",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "463f3fa6-2be3-4ded-a015-1f045ee8991e",
+                            "description": "Generated description for concept referred to by key \"JMSTestModel_Events:0.0.1\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel_KeyInfo",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel_KeyInfo",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "b14d97fb-f215-4b70-9cd6-cbfb3ed085ee",
+                            "description": "Generated description for concept referred to by key \"JMSTestModel_KeyInfo:0.0.1\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel_Policies",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel_Policies",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "9ae9047f-e0d8-42c4-b3a6-e32954ace3b6",
+                            "description": "Generated description for concept referred to by key \"JMSTestModel_Policies:0.0.1\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel_Schemas",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel_Schemas",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "adc30c29-d4b9-4408-9213-6d86b051d59c",
+                            "description": "Generated description for concept referred to by key \"JMSTestModel_Schemas:0.0.1\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestModel_Tasks",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestModel_Tasks",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "c3545f15-710c-4339-9a4e-e0eacffac52e",
+                            "description": "Generated description for concept referred to by key \"JMSTestModel_Tasks:0.0.1\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "JMSTestPolicy",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSTestPolicy",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "fdda6a40-6767-45b0-8703-3b5b3bafaf19",
+                            "description": "Generated description for a concept called \"JMSTestPolicy\" with version \"null\" and UUID \"fdda6a40-6767-45b0-8703-3b5b3bafaf19\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "PingTestClassIncomingEvent",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "PingTestClassIncomingEvent",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "6cdd11f3-5fe8-4510-81b9-af3be303ebae",
+                            "description": "Generated description for a concept called \"PingTestClassIncomingEvent\" with version \"null\" and UUID \"6cdd11f3-5fe8-4510-81b9-af3be303ebae\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "PingTestClassOutgoingEvent",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "PingTestClassOutgoingEvent",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "dc04de01-2284-4461-9fe2-da58a2122a73",
+                            "description": "Generated description for a concept called \"PingTestClassOutgoingEvent\" with version \"0.0.1\" and UUID \"dc04de01-2284-4461-9fe2-da58a2122a73\""
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "PingTestClassType",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "PingTestClassType",
+                                "version": "0.0.1"
+                            },
+                            "UUID": "bdc2f70a-de52-4127-8012-b9593657da3c",
+                            "description": "Generated description for a concept called \"PingTestClassType\" with version \"null\" and UUID \"bdc2f70a-de52-4127-8012-b9593657da3c\""
+                        }
+                    }
+                ]
+            }
+        },
+        "policies": {
+            "key": {
+                "name": "JMSTestModel_Policies",
+                "version": "0.0.1"
+            },
+            "policyMap": {
+                "entry": [
+                    {
+                        "key": {
+                            "name": "JMSTestPolicy",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "policyKey": {
+                                "name": "JMSTestPolicy",
+                                "version": "0.0.1"
+                            },
+                            "template": "FREEFORM",
+                            "state": {
+                                "entry": [
+                                    {
+                                        "key": "TestJMSState",
+                                        "value": {
+                                            "stateKey": {
+                                                "parentKeyName": "JMSTestPolicy",
+                                                "parentKeyVersion": "0.0.1",
+                                                "parentLocalName": "NULL",
+                                                "localName": "TestJMSState"
+                                            },
+                                            "trigger": {
+                                                "name": "PingTestClassIncomingEvent",
+                                                "version": "0.0.1"
+                                            },
+                                            "stateOutputs": {
+                                                "entry": [
+                                                    {
+                                                        "key": "InOutOutputMapping",
+                                                        "value": {
+                                                            "key": {
+                                                                "parentKeyName": "JMSTestPolicy",
+                                                                "parentKeyVersion": "0.0.1",
+                                                                "parentLocalName": "TestJMSState",
+                                                                "localName": "InOutOutputMapping"
+                                                            },
+                                                            "outgoingEvent": {
+                                                                "name": "PingTestClassOutgoingEvent",
+                                                                "version": "0.0.1"
+                                                            },
+                                                            "nextState": {
+                                                                "parentKeyName": "NULL",
+                                                                "parentKeyVersion": "0.0.0",
+                                                                "parentLocalName": "NULL",
+                                                                "localName": "NULL"
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            },
+                                            "contextAlbumReference": [],
+                                            "taskSelectionLogic": {
+                                                "key": "NULL",
+                                                "logicFlavour": "UNDEFINED",
+                                                "logic": ""
+                                            },
+                                            "stateFinalizerLogicMap": {
+                                                "entry": []
+                                            },
+                                            "defaultTask": {
+                                                "name": "JMSCopyInOutTask",
+                                                "version": "0.0.1"
+                                            },
+                                            "taskReferences": {
+                                                "entry": [
+                                                    {
+                                                        "key": {
+                                                            "name": "JMSCopyInOutTask",
+                                                            "version": "0.0.1"
+                                                        },
+                                                        "value": {
+                                                            "key": {
+                                                                "parentKeyName": "JMSTestPolicy",
+                                                                "parentKeyVersion": "0.0.1",
+                                                                "parentLocalName": "TestJMSState",
+                                                                "localName": "InOutTask"
+                                                            },
+                                                            "outputType": "DIRECT",
+                                                            "output": {
+                                                                "parentKeyName": "JMSTestPolicy",
+                                                                "parentKeyVersion": "0.0.1",
+                                                                "parentLocalName": "TestJMSState",
+                                                                "localName": "InOutOutputMapping"
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        }
+                                    }
+                                ]
+                            },
+                            "firstState": "TestJMSState"
+                        }
+                    }
+                ]
+            }
+        },
+        "tasks": {
+            "key": {
+                "name": "JMSTestModel_Tasks",
+                "version": "0.0.1"
+            },
+            "taskMap": {
+                "entry": [
+                    {
+                        "key": {
+                            "name": "JMSCopyInOutTask",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "JMSCopyInOutTask",
+                                "version": "0.0.1"
+                            },
+                            "inputFields": {
+                                "entry": [
+                                    {
+                                        "key": "PingTestClass",
+                                        "value": {
+                                            "key": "PingTestClass",
+                                            "fieldSchemaKey": {
+                                                "name": "PingTestClassType",
+                                                "version": "0.0.1"
+                                            },
+                                            "optional": false
+                                        }
+                                    }
+                                ]
+                            },
+                            "outputFields": {
+                                "entry": [
+                                    {
+                                        "key": "PingTestClass",
+                                        "value": {
+                                            "key": "PingTestClass",
+                                            "fieldSchemaKey": {
+                                                "name": "PingTestClassType",
+                                                "version": "0.0.1"
+                                            },
+                                            "optional": false
+                                        }
+                                    }
+                                ]
+                            },
+                            "taskParameters": {
+                                "entry": []
+                            },
+                            "contextAlbumReference": [],
+                            "taskLogic": {
+                                "key": "TaskLogic",
+                                "logicFlavour": "JAVASCRIPT",
+                                "logic": "var outFieldType = Java.type(\"org.onap.policy.apex.testsuites.integration.common.testclasses.PingTestClass\");\nvar outValue = new outFieldType();\n\nvar inValue = executor.inFields.get(\"PingTestClass\");\n\nexecutor.logger.info(inValue);\n\noutValue.setPingTime(inValue.getPingTime());\noutValue.setPongTime(new Date().getTime());\noutValue.setName(inValue.getName() + \"_out\");\n\noutValue.setDescription(\ninValue.getDescription() +\n\". So Romeo would, were he not Romeo call'd,\" +\n\" retain that dear perfection which he owes, without that title.\");\n\nexecutor.logger.info(outValue);\nexecutor.outFields.put(\"PingTestClass\", outValue)\n\nvar returnValueType = Java.type(\"java.lang.Boolean\");\nvar returnValue = new returnValueType(true);"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "events": {
+            "key": {
+                "name": "JMSTestModel_Events",
+                "version": "0.0.1"
+            },
+            "eventMap": {
+                "entry": [
+                    {
+                        "key": {
+                            "name": "PingTestClassIncomingEvent",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "PingTestClassIncomingEvent",
+                                "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms",
+                            "source": "JMS",
+                            "target": "Apex",
+                            "parameter": {
+                                "entry": [
+                                    {
+                                        "key": "PingTestClass",
+                                        "value": {
+                                            "key": "PingTestClass",
+                                            "fieldSchemaKey": {
+                                                "name": "PingTestClassType",
+                                                "version": "0.0.1"
+                                            },
+                                            "optional": false
+                                        }
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "key": {
+                            "name": "PingTestClassOutgoingEvent",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "PingTestClassOutgoingEvent",
+                                "version": "0.0.1"
+                            },
+                            "nameSpace": "org.onap.policy.apex.testsuites.integration.uservice.adapt.jms",
+                            "source": "Apex",
+                            "target": "JMS",
+                            "parameter": {
+                                "entry": [
+                                    {
+                                        "key": "PingTestClass",
+                                        "value": {
+                                            "key": "PingTestClass",
+                                            "fieldSchemaKey": {
+                                                "name": "PingTestClassType",
+                                                "version": "0.0.1"
+                                            },
+                                            "optional": false
+                                        }
+                                    }
+                                ]
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        "albums": {
+            "key": {
+                "name": "JMSTestModel_Albums",
+                "version": "0.0.1"
+            },
+            "albums": {
+                "entry": []
+            }
+        },
+        "schemas": {
+            "key": {
+                "name": "JMSTestModel_Schemas",
+                "version": "0.0.1"
+            },
+            "schemas": {
+                "entry": [
+                    {
+                        "key": {
+                            "name": "PingTestClassType",
+                            "version": "0.0.1"
+                        },
+                        "value": {
+                            "key": {
+                                "name": "PingTestClassType",
+                                "version": "0.0.1"
+                            },
+                            "schemaFlavour": "Java",
+                            "schemaDefinition": "org.onap.policy.apex.testsuites.integration.common.testclasses.PingTestClass"
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript
index f98e16555..158e49eea 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript
@@ -26,9 +26,7 @@ executor.logger.debug(executor.inFields);
 var caseSelectedType = Java.type("java.lang.Byte");
 executor.outFields.put("Test<STATE_NAME>CaseSelected", new caseSelectedType(<RANDOM_BYTE_VALUE>));
 
-var JavaDate = Java.type("java.util.Date");
-timeNow = new JavaDate();
-executor.outFields.put("Test<STATE_NAME>StateTime", timeNow.getTime());
+executor.outFields.put("Test<STATE_NAME>StateTime", java.lang.System.nanoTime());
 executor.logger.debug(executor.eo);
 
 var returnValue = executor.isTrue;
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript
index b0756504c..efbe5cb4d 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript
@@ -21,9 +21,7 @@
 executor.logger.debug(executor.subject.id);
 executor.logger.debug(executor.inFields);
 
-var JavaDate = Java.type("java.util.Date");
-timeNow = new JavaDate();
-executor.outFields.put("State<STATE_NUMBER>Timestamp", timeNow.getTime());
+executor.outFields.put("State<STATE_NUMBER>Timestamp",  java.lang.System.nanoTime());
 executor.logger.debug(executor.outFields);
 
 var returnValue = executor.isTrue;
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby
index 4ad39f57e..5a88d4f07 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/DefaultTaskLogic.jruby
@@ -26,8 +26,7 @@ executor.logger.debug("inFields: " + executor.inFields.toString())
 
 executor.outFields.put("Test<STATE_NAME>CaseSelected", <RANDOM_BYTE_VALUE>.to_java(:byte))
 
-timeNow = java.util.Date.new()
-executor.outFields.put("Test<STATE_NAME>StateTime", timeNow.getTime())
+executor.outFields.put("Test<STATE_NAME>StateTime",  java.lang.System.nanoTime())
 executor.logger.debug("outFields: " + executor.outFields.toString())
 
 return true
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby
index 72a4ee607..a5a86a132 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jruby/EvalTaskLogic.jruby
@@ -25,8 +25,7 @@ executor.logger.debug("inFields: " + executor.inFields.toString());
 
 executor.outFields.putAll(executor.inFields);
 
-timeNow = java.util.Date.new();
-executor.outFields.put("State<STATE_NUMBER>Timestamp", timeNow.getTime());
+executor.outFields.put("State<STATE_NUMBER>Timestamp",  java.lang.System.nanoTime());
 executor.logger.debug("outFields: " + executor.outFields.toString());
 
 return true;
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython
index f57ce3f0a..824c32bde 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/DefaultTaskLogic.jython
@@ -20,7 +20,7 @@
 
 from java.lang import Byte
 from java.lang import Long
-from java.util import Date
+from java.lang import System
 
 executor.logger.debug('id: ' + executor.subject.id)
 
@@ -29,7 +29,7 @@ executor.logger.debug('inFields: ' + executor.inFields.toString())
 
 executor.outFields["Test<STATE_NAME>CaseSelected"] = Byte("<RANDOM_BYTE_VALUE>")
 
-timeValue = Long(Date().getTime());
+timeValue = Long(System.nanoTime());
 executor.outFields["Test<STATE_NAME>StateTime"] = timeValue
 executor.logger.debug('outFields: ' + executor.outFields.toString())
 returnValue = executor.isTrue
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython
index aa6525673..15981aa2d 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/jython/EvalTaskLogic.jython
@@ -20,13 +20,14 @@
 
 from java.lang import Boolean
 from java.lang import Long
-from java.util import Date
+from java.lang import System
 
 executor.logger.debug('id: ' + executor.subject.id)
 
 executor.logger.debug('inFields: ' + executor.inFields.toString())
 executor.outFields.putAll(executor.inFields)
 
-executor.outFields["State<STATE_NUMBER>Timestamp"] = Long(Date().getTime())
+timeValue = Long(System.nanoTime());
+executor.outFields["State<STATE_NUMBER>Timestamp"] = timeValue
 executor.logger.debug('outFields: ' + executor.outFields.toString())
 returnValue = Boolean.TRUE
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel
index 9a1a4bad1..ffe3dd0e4 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/DefaultTaskLogic.mvel
@@ -18,13 +18,11 @@
  * ============LICENSE_END=========================================================
  */
 
-import java.util.Date;
 logger.debug(subject.id);
 gc = getContextAlbum("GlobalContextAlbum");
 logger.debug(gc);
 logger.debug(inFields);
 outFields["Test<STATE_NAME>CaseSelected"] = (byte)<RANDOM_BYTE_VALUE>;
-timeNow = new Date();
-outFields["Test<STATE_NAME>StateTime"] = timeNow.getTime();
+outFields["Test<STATE_NAME>StateTime"] = java.lang.System.nanoTime();
 logger.debug(outFields);
 return true;
\ No newline at end of file
diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel
index e15a4beec..869def02c 100644
--- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel
+++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/mvel/EvalTaskLogic.mvel
@@ -18,9 +18,8 @@
  * ============LICENSE_END=========================================================
  */
 
-import java.util.Date;
 logger.debug(subject.id);
 logger.debug(inFields);
-timeNow = new Date();
-outFields["State<STATE_NUMBER>Timestamp"] = timeNow.getTime();
+
+outFields["State<STATE_NUMBER>Timestamp"] = java.lang.System.nanoTime();
 return true;
\ No newline at end of file