From 6abeb297254942c48722c2da0e7c355d523fe307 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Fri, 28 Jul 2017 08:23:01 +0000
Subject: [POLICY-72] replace openecomp for drools-pdp

Change-Id: I8aa8e32d3ba10f7c655b50e97aaf6865514d4777
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 README.md                                          |    2 +-
 feature-eelf/pom.xml                               |   10 +-
 .../org/onap/policy/drools/eelf/EelfFeature.java   |   72 +
 .../openecomp/policy/drools/eelf/EelfFeature.java  |   72 -
 ...p.policy.drools.features.PolicyEngineFeatureAPI |    1 +
 ...p.policy.drools.features.PolicyEngineFeatureAPI |    1 -
 .../org/onap/policy/drools/eelf/test/EElfTest.java |  146 ++
 .../policy/drools/eelf/test/EElfTest.java          |  146 --
 feature-healthcheck/pom.xml                        |   10 +-
 .../feature/config/feature-healthcheck.properties  |    2 +-
 .../policy/drools/healthcheck/HealthCheck.java     |  277 +++
 .../drools/healthcheck/HealthCheckFeature.java     |   78 +
 .../policy/drools/healthcheck/RestHealthCheck.java |   77 +
 .../policy/drools/healthcheck/HealthCheck.java     |  277 ---
 .../drools/healthcheck/HealthCheckFeature.java     |   78 -
 .../policy/drools/healthcheck/RestHealthCheck.java |   77 -
 ...p.policy.drools.features.PolicyEngineFeatureAPI |    1 +
 ...p.policy.drools.features.PolicyEngineFeatureAPI |    1 -
 packages/base/pom.xml                              |    2 +-
 packages/install/pom.xml                           |   10 +-
 packages/install/src/files/policy-management.conf  |    2 +-
 packages/pom.xml                                   |    4 +-
 policy-core/pom.xml                                |    6 +-
 .../onap/policy/drools/core/PolicyContainer.java   |  848 +++++++
 .../org/onap/policy/drools/core/PolicySession.java |  576 +++++
 .../drools/core/PolicySessionFeatureAPI.java       |  107 +
 .../org/onap/policy/drools/core/jmx/PdpJmx.java    |   47 +
 .../policy/drools/core/jmx/PdpJmxListener.java     |   67 +
 .../onap/policy/drools/core/jmx/PdpJmxMBean.java   |   27 +
 .../onap/policy/drools/properties/Lockable.java    |   45 +
 .../policy/drools/properties/PolicyProperties.java |  116 +
 .../onap/policy/drools/properties/Startable.java   |   65 +
 .../policy/drools/core/PolicyContainer.java        |  848 -------
 .../policy/drools/core/PolicySession.java          |  576 -----
 .../drools/core/PolicySessionFeatureAPI.java       |  107 -
 .../openecomp/policy/drools/core/jmx/PdpJmx.java   |   47 -
 .../policy/drools/core/jmx/PdpJmxListener.java     |   67 -
 .../policy/drools/core/jmx/PdpJmxMBean.java        |   27 -
 .../policy/drools/properties/Lockable.java         |   45 -
 .../policy/drools/properties/PolicyProperties.java |  116 -
 .../policy/drools/properties/Startable.java        |   65 -
 policy-endpoints/pom.xml                           |    6 +-
 .../org/onap/policy/drools/event/comm/Topic.java   |   86 +
 .../policy/drools/event/comm/TopicEndpoint.java    |  729 ++++++
 .../policy/drools/event/comm/TopicListener.java    |   37 +
 .../drools/event/comm/TopicRegisterable.java       |   42 +
 .../onap/policy/drools/event/comm/TopicSink.java   |   40 +
 .../onap/policy/drools/event/comm/TopicSource.java |   37 +
 .../drools/event/comm/bus/ApiKeyEnabled.java       |   36 +
 .../policy/drools/event/comm/bus/BusTopicSink.java |   47 +
 .../drools/event/comm/bus/BusTopicSource.java      |   83 +
 .../drools/event/comm/bus/DmaapTopicSink.java      |   30 +
 .../event/comm/bus/DmaapTopicSinkFactory.java      |  499 +++++
 .../drools/event/comm/bus/DmaapTopicSource.java    |   29 +
 .../event/comm/bus/DmaapTopicSourceFactory.java    |  598 +++++
 .../drools/event/comm/bus/NoopTopicSink.java       |  126 ++
 .../event/comm/bus/NoopTopicSinkFactory.java       |  226 ++
 .../policy/drools/event/comm/bus/UebTopicSink.java |   32 +
 .../drools/event/comm/bus/UebTopicSinkFactory.java |  334 +++
 .../drools/event/comm/bus/UebTopicSource.java      |   34 +
 .../event/comm/bus/UebTopicSourceFactory.java      |  404 ++++
 .../event/comm/bus/internal/BusConsumer.java       |  456 ++++
 .../event/comm/bus/internal/BusPublisher.java      |  390 ++++
 .../event/comm/bus/internal/BusTopicBase.java      |  112 +
 .../comm/bus/internal/InlineBusTopicSink.java      |  196 ++
 .../comm/bus/internal/InlineDmaapTopicSink.java    |  151 ++
 .../comm/bus/internal/InlineUebTopicSink.java      |   95 +
 .../bus/internal/SingleThreadedBusTopicSource.java |  349 +++
 .../internal/SingleThreadedDmaapTopicSource.java   |  202 ++
 .../bus/internal/SingleThreadedUebTopicSource.java |   96 +
 .../drools/event/comm/bus/internal/TopicBase.java  |  229 ++
 .../onap/policy/drools/http/client/HttpClient.java |   48 +
 .../drools/http/client/HttpClientFactory.java      |  192 ++
 .../drools/http/client/internal/JerseyClient.java  |  250 +++
 .../drools/http/server/HttpServletServer.java      |   81 +
 .../http/server/HttpServletServerFactory.java      |  265 +++
 .../http/server/internal/JettyJerseyServer.java    |  241 ++
 .../http/server/internal/JettyServletServer.java   |  346 +++
 .../openecomp/policy/drools/event/comm/Topic.java  |   86 -
 .../policy/drools/event/comm/TopicEndpoint.java    |  729 ------
 .../policy/drools/event/comm/TopicListener.java    |   37 -
 .../drools/event/comm/TopicRegisterable.java       |   42 -
 .../policy/drools/event/comm/TopicSink.java        |   40 -
 .../policy/drools/event/comm/TopicSource.java      |   37 -
 .../drools/event/comm/bus/ApiKeyEnabled.java       |   36 -
 .../policy/drools/event/comm/bus/BusTopicSink.java |   47 -
 .../drools/event/comm/bus/BusTopicSource.java      |   83 -
 .../drools/event/comm/bus/DmaapTopicSink.java      |   30 -
 .../event/comm/bus/DmaapTopicSinkFactory.java      |  499 -----
 .../drools/event/comm/bus/DmaapTopicSource.java    |   29 -
 .../event/comm/bus/DmaapTopicSourceFactory.java    |  598 -----
 .../drools/event/comm/bus/NoopTopicSink.java       |  126 --
 .../event/comm/bus/NoopTopicSinkFactory.java       |  226 --
 .../policy/drools/event/comm/bus/UebTopicSink.java |   32 -
 .../drools/event/comm/bus/UebTopicSinkFactory.java |  334 ---
 .../drools/event/comm/bus/UebTopicSource.java      |   34 -
 .../event/comm/bus/UebTopicSourceFactory.java      |  404 ----
 .../event/comm/bus/internal/BusConsumer.java       |  456 ----
 .../event/comm/bus/internal/BusPublisher.java      |  390 ----
 .../event/comm/bus/internal/BusTopicBase.java      |  112 -
 .../comm/bus/internal/InlineBusTopicSink.java      |  196 --
 .../comm/bus/internal/InlineDmaapTopicSink.java    |  151 --
 .../comm/bus/internal/InlineUebTopicSink.java      |   95 -
 .../bus/internal/SingleThreadedBusTopicSource.java |  349 ---
 .../internal/SingleThreadedDmaapTopicSource.java   |  202 --
 .../bus/internal/SingleThreadedUebTopicSource.java |   96 -
 .../drools/event/comm/bus/internal/TopicBase.java  |  229 --
 .../policy/drools/http/client/HttpClient.java      |   48 -
 .../drools/http/client/HttpClientFactory.java      |  192 --
 .../drools/http/client/internal/JerseyClient.java  |  250 ---
 .../drools/http/server/HttpServletServer.java      |   81 -
 .../http/server/HttpServletServerFactory.java      |  265 ---
 .../http/server/internal/JettyJerseyServer.java    |  241 --
 .../http/server/internal/JettyServletServer.java   |  346 ---
 .../drools/http/server/test/HttpClientTest.java    |  218 ++
 .../drools/http/server/test/HttpServerTest.java    |  207 ++
 .../drools/http/server/test/NoopTopicTest.java     |  117 +
 .../drools/http/server/test/RestEchoService.java   |   46 +
 .../drools/http/server/test/RestEndpoints.java     |   45 +
 .../http/server/test/RestMockHealthCheck.java      |   48 +
 .../drools/http/server/test/HttpClientTest.java    |  218 --
 .../drools/http/server/test/HttpServerTest.java    |  207 --
 .../drools/http/server/test/NoopTopicTest.java     |  117 -
 .../drools/http/server/test/RestEchoService.java   |   46 -
 .../drools/http/server/test/RestEndpoints.java     |   45 -
 .../http/server/test/RestMockHealthCheck.java      |   48 -
 .../src/test/resources/logback-test.xml            |    2 +-
 policy-management/config/policy-engine.properties  |    8 +-
 policy-management/pom.xml                          |    8 +-
 .../policy/drools/controller/DroolsController.java |  218 ++
 .../drools/controller/DroolsControllerFactory.java |  555 +++++
 .../controller/internal/MavenDroolsController.java |  910 ++++++++
 .../controller/internal/NullDroolsController.java  |  262 +++
 .../features/PolicyControllerFeatureAPI.java       |  222 ++
 .../drools/features/PolicyEngineFeatureAPI.java    |  202 ++
 .../drools/persistence/SystemPersistence.java      |  248 +++
 .../drools/protocol/coders/EventProtocolCoder.java | 1393 ++++++++++++
 .../drools/protocol/coders/JsonProtocolFilter.java |  308 +++
 .../protocol/coders/ProtocolCoderToolset.java      |  683 ++++++
 .../coders/TopicCoderFilterConfiguration.java      |  309 +++
 .../configuration/ControllerConfiguration.java     |  280 +++
 .../configuration/DroolsConfiguration.java         |  278 +++
 .../protocol/configuration/PdpdConfiguration.java  |  283 +++
 .../policy/drools/server/restful/RestManager.java  | 2335 ++++++++++++++++++++
 .../java/org/onap/policy/drools/system/Main.java   |  135 ++
 .../policy/drools/system/PolicyController.java     |  110 +
 .../drools/system/PolicyControllerFactory.java     |  522 +++++
 .../onap/policy/drools/system/PolicyEngine.java    | 1461 ++++++++++++
 .../internal/AggregatedPolicyController.java       |  626 ++++++
 .../policy/drools/controller/DroolsController.java |  218 --
 .../drools/controller/DroolsControllerFactory.java |  555 -----
 .../controller/internal/MavenDroolsController.java |  910 --------
 .../controller/internal/NullDroolsController.java  |  262 ---
 .../features/PolicyControllerFeatureAPI.java       |  222 --
 .../drools/features/PolicyEngineFeatureAPI.java    |  202 --
 .../drools/persistence/SystemPersistence.java      |  248 ---
 .../drools/protocol/coders/EventProtocolCoder.java | 1393 ------------
 .../drools/protocol/coders/JsonProtocolFilter.java |  308 ---
 .../protocol/coders/ProtocolCoderToolset.java      |  683 ------
 .../coders/TopicCoderFilterConfiguration.java      |  309 ---
 .../configuration/ControllerConfiguration.java     |  280 ---
 .../configuration/DroolsConfiguration.java         |  278 ---
 .../protocol/configuration/PdpdConfiguration.java  |  283 ---
 .../policy/drools/server/restful/RestManager.java  | 2335 --------------------
 .../org/openecomp/policy/drools/system/Main.java   |  135 --
 .../policy/drools/system/PolicyController.java     |  110 -
 .../drools/system/PolicyControllerFactory.java     |  522 -----
 .../policy/drools/system/PolicyEngine.java         | 1461 ------------
 .../internal/AggregatedPolicyController.java       |  626 ------
 policy-management/src/main/server-gen/bin/features |    2 +-
 .../server-gen/bin/policy-management-controller    |    2 +-
 .../main/server/config/policy-engine.properties    |    2 +-
 .../drools/system/test/PolicyEngineTest.java       |   98 +
 .../drools/system/test/PolicyEngineTest.java       |   98 -
 .../src/test/resources/logback-test.xml            |    2 +-
 policy-utils/pom.xml                               |    4 +-
 .../onap/policy/drools/utils/OrderedService.java   |   41 +
 .../policy/drools/utils/OrderedServiceImpl.java    |  156 ++
 .../java/org/onap/policy/drools/utils/Pair.java    |   51 +
 .../org/onap/policy/drools/utils/PropertyUtil.java |  385 ++++
 .../onap/policy/drools/utils/ReflectionUtil.java   |   88 +
 .../java/org/onap/policy/drools/utils/Triple.java  |   45 +
 .../policy/drools/utils/OrderedService.java        |   41 -
 .../policy/drools/utils/OrderedServiceImpl.java    |  156 --
 .../org/openecomp/policy/drools/utils/Pair.java    |   51 -
 .../policy/drools/utils/PropertyUtil.java          |  385 ----
 .../policy/drools/utils/ReflectionUtil.java        |   88 -
 .../org/openecomp/policy/drools/utils/Triple.java  |   45 -
 .../onap/policy/drools/utils/PropertyUtilTest.java |  201 ++
 .../policy/drools/utils/PropertyUtilTest.java      |  201 --
 pom.xml                                            |   32 +-
 191 files changed, 22842 insertions(+), 22842 deletions(-)
 create mode 100644 feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
 delete mode 100644 feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java
 create mode 100644 feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
 delete mode 100644 feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
 create mode 100644 feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
 delete mode 100644 feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java
 create mode 100644 feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
 create mode 100644 feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
 create mode 100644 feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
 delete mode 100644 feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
 delete mode 100644 feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
 delete mode 100644 feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
 create mode 100644 feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
 delete mode 100644 feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
 create mode 100644 policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java
 delete mode 100644 policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java
 create mode 100644 policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java
 delete mode 100644 policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java
 create mode 100644 policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java
 create mode 100644 policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java
 create mode 100644 policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java
 create mode 100644 policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java
 create mode 100644 policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java
 create mode 100644 policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java
 delete mode 100644 policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java
 delete mode 100644 policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java
 delete mode 100644 policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java
 delete mode 100644 policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java
 delete mode 100644 policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java
 delete mode 100644 policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/system/Main.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
 create mode 100644 policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java
 delete mode 100644 policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java
 create mode 100644 policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java
 delete mode 100644 policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java
 create mode 100644 policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java
 create mode 100644 policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java
 create mode 100644 policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java
 create mode 100644 policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
 create mode 100644 policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java
 create mode 100644 policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java
 delete mode 100644 policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java
 delete mode 100644 policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java
 delete mode 100644 policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java
 delete mode 100644 policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java
 delete mode 100644 policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java
 delete mode 100644 policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java
 create mode 100644 policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java
 delete mode 100644 policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java

diff --git a/README.md b/README.md
index 6614ee66..8eae27be 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-This source repository contains the OpenECOMP Policy DroolsPDP code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
+This source repository contains the ONAP Policy DroolsPDP code. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
 
 To build it using Maven 3, first build 'policy-common-modules' (which contains dependencies), and then run: mvn clean install
diff --git a/feature-eelf/pom.xml b/feature-eelf/pom.xml
index 3138c8d3..a18b2892 100644
--- a/feature-eelf/pom.xml
+++ b/feature-eelf/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>drools-pdp</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -104,12 +104,12 @@
 			<version>1.0.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.common</groupId>
-			<artifactId>ECOMP-Logging</artifactId>
+			<groupId>org.onap.policy.common</groupId>
+			<artifactId>ONAP-Logging</artifactId>
 			<version>${common-modules.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>policy-management</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
diff --git a/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java b/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
new file mode 100644
index 00000000..e0ada747
--- /dev/null
+++ b/feature-eelf/src/main/java/org/onap/policy/drools/eelf/EelfFeature.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-eelf
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.eelf;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.onap.policy.common.logging.eelf.Configuration;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.Main;
+import org.onap.policy.drools.system.PolicyEngine;
+
+/**
+ * Feature EELF : Enables EELF Logging Libraries 
+ */
+public class EelfFeature implements PolicyEngineFeatureAPI {
+
+	@Override
+	public boolean beforeBoot(PolicyEngine engine, String cliArgs[]) {
+		
+		String logback = System.getProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, 
+				                            Main.LOGBACK_CONFIGURATION_FILE_DEFAULT);		
+		Path logbackPath = Paths.get(logback);
+		
+		if (System.getProperty(Configuration.PROPERTY_LOGGING_FILE_PATH) == null)
+			System.setProperty(Configuration.PROPERTY_LOGGING_FILE_PATH, 
+					           logbackPath.toAbsolutePath().getParent().toString());
+		
+		if (System.getProperty(Configuration.PROPERTY_LOGGING_FILE_NAME) == null)
+			System.setProperty(Configuration.PROPERTY_LOGGING_FILE_NAME, 
+					           logbackPath.getFileName().toString());
+		
+		Logger logger = FlexLogger.getLogger(this.getClass(), true);
+		
+		if (logger.isInfoEnabled()) {
+			logger.info("eelf-feature: Property " + Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY + "=" + 
+			            System.getProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY));
+			logger.info("eelf-feature: Property " + Configuration.PROPERTY_LOGGING_FILE_PATH + "=" + 
+		                System.getProperty(Configuration.PROPERTY_LOGGING_FILE_PATH));
+			logger.info("eelf-feature: Property " + Configuration.PROPERTY_LOGGING_FILE_NAME + "=" + 
+	                    System.getProperty(Configuration.PROPERTY_LOGGING_FILE_NAME));
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public int getSequenceNumber() {
+		return 0;
+	}
+
+}
diff --git a/feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java b/feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java
deleted file mode 100644
index 83e7a4be..00000000
--- a/feature-eelf/src/main/java/org/openecomp/policy/drools/eelf/EelfFeature.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-eelf
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.eelf;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.openecomp.policy.common.logging.eelf.Configuration;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
-
-/**
- * Feature EELF : Enables EELF Logging Libraries 
- */
-public class EelfFeature implements PolicyEngineFeatureAPI {
-
-	@Override
-	public boolean beforeBoot(PolicyEngine engine, String cliArgs[]) {
-		
-		String logback = System.getProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, 
-				                            Main.LOGBACK_CONFIGURATION_FILE_DEFAULT);		
-		Path logbackPath = Paths.get(logback);
-		
-		if (System.getProperty(Configuration.PROPERTY_LOGGING_FILE_PATH) == null)
-			System.setProperty(Configuration.PROPERTY_LOGGING_FILE_PATH, 
-					           logbackPath.toAbsolutePath().getParent().toString());
-		
-		if (System.getProperty(Configuration.PROPERTY_LOGGING_FILE_NAME) == null)
-			System.setProperty(Configuration.PROPERTY_LOGGING_FILE_NAME, 
-					           logbackPath.getFileName().toString());
-		
-		Logger logger = FlexLogger.getLogger(this.getClass(), true);
-		
-		if (logger.isInfoEnabled()) {
-			logger.info("eelf-feature: Property " + Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY + "=" + 
-			            System.getProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY));
-			logger.info("eelf-feature: Property " + Configuration.PROPERTY_LOGGING_FILE_PATH + "=" + 
-		                System.getProperty(Configuration.PROPERTY_LOGGING_FILE_PATH));
-			logger.info("eelf-feature: Property " + Configuration.PROPERTY_LOGGING_FILE_NAME + "=" + 
-	                    System.getProperty(Configuration.PROPERTY_LOGGING_FILE_NAME));
-		}
-		
-		return false;
-	}
-	
-	@Override
-	public int getSequenceNumber() {
-		return 0;
-	}
-
-}
diff --git a/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 00000000..f2bcc4cb
--- /dev/null
+++ b/feature-eelf/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.eelf.EelfFeature
diff --git a/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 70d1bb8e..00000000
--- a/feature-eelf/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.eelf.EelfFeature
diff --git a/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java b/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
new file mode 100644
index 00000000..f7003706
--- /dev/null
+++ b/feature-eelf/src/test/java/org/onap/policy/drools/eelf/test/EElfTest.java
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-eelf
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.eelf.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.drools.eelf.EelfFeature;
+import org.onap.policy.drools.system.Main;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.att.eelf.configuration.Configuration;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFLogger.Level;
+import com.att.eelf.configuration.EELFManager;
+
+import ch.qos.logback.classic.LoggerContext;
+
+/**
+ * Logger Tests
+ */
+public class EElfTest {
+	
+	/**
+	 * logback configuration location
+	 */
+	public final static String LOGBACK_CONFIGURATION_FILE_DEFAULT = "src/main/feature/config/logback-eelf.xml";
+	
+	/**
+	 * SLF4J Logger
+	 */
+	private final Logger slf4jLogger = LoggerFactory.getLogger(EElfTest.class);
+	
+	/**
+	 * get all loggers
+	 * @return list of all loggers
+	 */
+	protected List<String> loggers() {
+		List<String> loggers = new ArrayList<String>();
+		LoggerContext context = 
+    			(LoggerContext) org.slf4j.LoggerFactory.getILoggerFactory();
+    	for (org.slf4j.Logger logger: context.getLoggerList()) {
+    		loggers.add(logger.getName());
+    	}
+    	slf4jLogger.info(loggers.toString());
+		return loggers;
+	}
+	
+	/**
+	 * Assert Log Levels are the same between an EELF Logger and an SLF4J Logger
+	 * 
+	 * @param eelfLogger EELF Logger
+	 * @param slf4jLogger SLF4J Logger
+	 */
+	protected void assertLogLevels(EELFLogger eelfLogger, Logger slf4jLogger) {
+		assertTrue(slf4jLogger.isDebugEnabled() == eelfLogger.isDebugEnabled());
+		assertTrue(slf4jLogger.isInfoEnabled() == eelfLogger.isInfoEnabled());
+		assertTrue(slf4jLogger.isErrorEnabled() == eelfLogger.isErrorEnabled());
+		assertTrue(slf4jLogger.isWarnEnabled() == eelfLogger.isWarnEnabled());
+		assertTrue(slf4jLogger.isTraceEnabled() == eelfLogger.isTraceEnabled());
+	}
+	
+	@Test
+	public void slf4jLog() {
+		
+		/* standard slf4j using defaults */
+		
+		slf4jLogger.info("slf4j info");
+		
+		List<String> loggers = loggers();  	
+    	
+		assertFalse(loggers.contains(Configuration.DEBUG_LOGGER_NAME));
+		assertFalse(loggers.contains(Configuration.AUDIT_LOGGER_NAME));
+		assertFalse(loggers.contains(Configuration.ERROR_LOGGER_NAME));
+		assertFalse(loggers.contains(Configuration.METRICS_LOGGER_NAME));
+		
+		/* set logback configuration */
+		
+    	System.setProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, 
+                           LOGBACK_CONFIGURATION_FILE_DEFAULT);
+    	
+    	/* set up eelf throuth common loggings library */
+    	
+		EelfFeature feature = new EelfFeature();
+		feature.beforeBoot(PolicyEngine.manager, null);
+		
+		loggers = loggers();
+		assertTrue(loggers.contains(Configuration.DEBUG_LOGGER_NAME));
+		assertTrue(loggers.contains(Configuration.AUDIT_LOGGER_NAME));
+		assertTrue(loggers.contains(Configuration.ERROR_LOGGER_NAME));
+		assertTrue(loggers.contains(Configuration.METRICS_LOGGER_NAME));
+		
+		EELFLogger eelfAuditLogger = EELFManager.getInstance().getAuditLogger();
+		Logger slf4jAuditLogger = org.slf4j.LoggerFactory.getLogger(Configuration.AUDIT_LOGGER_NAME);
+		org.onap.policy.common.logging.flexlogger.Logger flexLogger = 
+												FlexLogger.getLogger(EElfTest.class, true);
+		
+		/* generate an error entry */
+		
+		Exception testException = new IllegalStateException("exception test");
+		flexLogger.error("flex-logger exception", testException);
+		EELFManager.getInstance().getErrorLogger().error("eelf-logger exception", testException);
+		org.slf4j.LoggerFactory.getLogger(Configuration.ERROR_LOGGER_NAME).error("slf4j-logger", testException);
+
+		
+		/* generate an audit entry through all logs */
+		
+		flexLogger.audit("flexlogger audit");
+		eelfAuditLogger.info("eelf audit");
+		slf4jAuditLogger.info("slf4j audit");
+		
+		/* check log levels in eelf and standard slf4j  change in both directions */
+		
+		/* eelf initiated */
+		eelfAuditLogger.setLevel(Level.ERROR);		
+		assertLogLevels(eelfAuditLogger, slf4jAuditLogger);
+		
+		/* slf4j initiated */
+		((ch.qos.logback.classic.Logger) slf4jLogger).setLevel((ch.qos.logback.classic.Level.INFO));		
+		assertLogLevels(eelfAuditLogger, slf4jAuditLogger);
+	}
+}
diff --git a/feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java b/feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java
deleted file mode 100644
index 6023622d..00000000
--- a/feature-eelf/src/test/java/org/openecomp/policy/drools/eelf/test/EElfTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-eelf
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.eelf.test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.drools.eelf.EelfFeature;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.att.eelf.configuration.Configuration;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFLogger.Level;
-import com.att.eelf.configuration.EELFManager;
-
-import ch.qos.logback.classic.LoggerContext;
-
-/**
- * Logger Tests
- */
-public class EElfTest {
-	
-	/**
-	 * logback configuration location
-	 */
-	public final static String LOGBACK_CONFIGURATION_FILE_DEFAULT = "src/main/feature/config/logback-eelf.xml";
-	
-	/**
-	 * SLF4J Logger
-	 */
-	private final Logger slf4jLogger = LoggerFactory.getLogger(EElfTest.class);
-	
-	/**
-	 * get all loggers
-	 * @return list of all loggers
-	 */
-	protected List<String> loggers() {
-		List<String> loggers = new ArrayList<String>();
-		LoggerContext context = 
-    			(LoggerContext) org.slf4j.LoggerFactory.getILoggerFactory();
-    	for (org.slf4j.Logger logger: context.getLoggerList()) {
-    		loggers.add(logger.getName());
-    	}
-    	slf4jLogger.info(loggers.toString());
-		return loggers;
-	}
-	
-	/**
-	 * Assert Log Levels are the same between an EELF Logger and an SLF4J Logger
-	 * 
-	 * @param eelfLogger EELF Logger
-	 * @param slf4jLogger SLF4J Logger
-	 */
-	protected void assertLogLevels(EELFLogger eelfLogger, Logger slf4jLogger) {
-		assertTrue(slf4jLogger.isDebugEnabled() == eelfLogger.isDebugEnabled());
-		assertTrue(slf4jLogger.isInfoEnabled() == eelfLogger.isInfoEnabled());
-		assertTrue(slf4jLogger.isErrorEnabled() == eelfLogger.isErrorEnabled());
-		assertTrue(slf4jLogger.isWarnEnabled() == eelfLogger.isWarnEnabled());
-		assertTrue(slf4jLogger.isTraceEnabled() == eelfLogger.isTraceEnabled());
-	}
-	
-	@Test
-	public void slf4jLog() {
-		
-		/* standard slf4j using defaults */
-		
-		slf4jLogger.info("slf4j info");
-		
-		List<String> loggers = loggers();  	
-    	
-		assertFalse(loggers.contains(Configuration.DEBUG_LOGGER_NAME));
-		assertFalse(loggers.contains(Configuration.AUDIT_LOGGER_NAME));
-		assertFalse(loggers.contains(Configuration.ERROR_LOGGER_NAME));
-		assertFalse(loggers.contains(Configuration.METRICS_LOGGER_NAME));
-		
-		/* set logback configuration */
-		
-    	System.setProperty(Main.LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, 
-                           LOGBACK_CONFIGURATION_FILE_DEFAULT);
-    	
-    	/* set up eelf throuth common loggings library */
-    	
-		EelfFeature feature = new EelfFeature();
-		feature.beforeBoot(PolicyEngine.manager, null);
-		
-		loggers = loggers();
-		assertTrue(loggers.contains(Configuration.DEBUG_LOGGER_NAME));
-		assertTrue(loggers.contains(Configuration.AUDIT_LOGGER_NAME));
-		assertTrue(loggers.contains(Configuration.ERROR_LOGGER_NAME));
-		assertTrue(loggers.contains(Configuration.METRICS_LOGGER_NAME));
-		
-		EELFLogger eelfAuditLogger = EELFManager.getInstance().getAuditLogger();
-		Logger slf4jAuditLogger = org.slf4j.LoggerFactory.getLogger(Configuration.AUDIT_LOGGER_NAME);
-		org.openecomp.policy.common.logging.flexlogger.Logger flexLogger = 
-												FlexLogger.getLogger(EElfTest.class, true);
-		
-		/* generate an error entry */
-		
-		Exception testException = new IllegalStateException("exception test");
-		flexLogger.error("flex-logger exception", testException);
-		EELFManager.getInstance().getErrorLogger().error("eelf-logger exception", testException);
-		org.slf4j.LoggerFactory.getLogger(Configuration.ERROR_LOGGER_NAME).error("slf4j-logger", testException);
-
-		
-		/* generate an audit entry through all logs */
-		
-		flexLogger.audit("flexlogger audit");
-		eelfAuditLogger.info("eelf audit");
-		slf4jAuditLogger.info("slf4j audit");
-		
-		/* check log levels in eelf and standard slf4j  change in both directions */
-		
-		/* eelf initiated */
-		eelfAuditLogger.setLevel(Level.ERROR);		
-		assertLogLevels(eelfAuditLogger, slf4jAuditLogger);
-		
-		/* slf4j initiated */
-		((ch.qos.logback.classic.Logger) slf4jLogger).setLevel((ch.qos.logback.classic.Level.INFO));		
-		assertLogLevels(eelfAuditLogger, slf4jAuditLogger);
-	}
-}
diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml
index 12c6b4d8..3355a2a5 100644
--- a/feature-healthcheck/pom.xml
+++ b/feature-healthcheck/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -99,19 +99,19 @@
 	  <scope>provided</scope>
 	</dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-management</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
index d91c2cc4..cb31e8f0 100644
--- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
+++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties
@@ -21,7 +21,7 @@
 http.server.services=HEALTHCHECK
 http.server.services.HEALTHCHECK.host=0.0.0.0
 http.server.services.HEALTHCHECK.port=6969
-http.server.services.HEALTHCHECK.restClasses=org.openecomp.policy.drools.healthcheck.RestHealthCheck
+http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck
 http.server.services.HEALTHCHECK.managed=false
 http.server.services.HEALTHCHECK.swagger=true
 
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
new file mode 100644
index 00000000..0e4ed792
--- /dev/null
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java
@@ -0,0 +1,277 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-healthcheck
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.healthcheck;
+
+import java.util.ArrayList;
+import java.util.Properties;
+
+import javax.ws.rs.core.Response;
+
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Healthcheck
+ */
+public interface HealthCheck extends Startable {
+	
+	/**
+	 * Healthcheck Report
+	 */
+	public static class Report {
+		/**
+		 * Named Entity in the report
+		 */
+		public String name;
+		
+		/**
+		 * URL queried
+		 */
+		public String url;
+		
+		/**
+		 * healthy?
+		 */
+		public boolean healthy;
+		
+		/**
+		 * return code
+		 */
+		public int code;
+		
+		/**
+		 * Message from remote entity
+		 */
+		public String message;
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("Report [name=");
+			builder.append(name);
+			builder.append(", url=");
+			builder.append(url);
+			builder.append(", healthy=");
+			builder.append(healthy);
+			builder.append(", code=");
+			builder.append(code);
+			builder.append(", message=");
+			builder.append(message);
+			builder.append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * Report aggregation
+	 */
+	public static class Reports {
+		public boolean healthy;
+		public ArrayList<Report> details = new ArrayList<>();
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("Reports [healthy=");
+			builder.append(healthy);
+			builder.append(", details=");
+			builder.append(details);
+			builder.append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * perform a healthcheck
+	 * @return a report
+	 */
+	public Reports healthCheck();
+
+	/**
+	 * Healthcheck Monitor
+	 */
+	public static final HealthCheck monitor = new HealthCheckMonitor();
+}
+
+/**
+ * Healthcheck Monitor
+ */
+class HealthCheckMonitor implements HealthCheck {
+
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(HealthCheckMonitor.class);
+	
+	/**
+	 * attached http servers
+	 */
+	protected volatile ArrayList<HttpServletServer> servers = new ArrayList<>();
+	
+	/**
+	 * attached http clients
+	 */
+	protected volatile ArrayList<HttpClient> clients = new ArrayList<>();
+	
+	/**
+	 * healthcheck configuration
+	 */
+	protected volatile Properties healthCheckProperties = null; 
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public Reports healthCheck() {	
+		Reports reports = new Reports();
+		reports.healthy = PolicyEngine.manager.isAlive();
+		
+		HealthCheck.Report engineReport = new Report();
+		engineReport.healthy = PolicyEngine.manager.isAlive();
+		engineReport.name = "PDP-D";
+		engineReport.url = "self";
+		engineReport.code = (PolicyEngine.manager.isAlive()) ? 200 : 500;
+		engineReport.message = (PolicyEngine.manager.isAlive()) ? "alive" : "not alive";
+		reports.details.add(engineReport);
+		
+		for (HttpClient client : clients) {
+			HealthCheck.Report report = new Report();
+			report.name = client.getName();
+			report.url = client.getBaseUrl();
+			report.healthy = true;
+			try {
+				Response response = client.get();
+				report.code = response.getStatus();
+				if (report.code != 200) {
+					report.healthy = false;
+					reports.healthy = false;
+				}
+					
+				try {
+					report.message = HttpClient.getBody(response, String.class);
+				} catch (Exception e) {
+					logger.warn("{}: cannot get body from http-client {}", this, client, e);
+				}
+			} catch (Exception e) {
+				report.healthy = false;
+				reports.healthy = false;
+			}
+			reports.details.add(report);
+		}
+		return reports;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {
+		
+		try {
+			this.healthCheckProperties = SystemPersistence.manager.getProperties(HealthCheckFeature.CONFIGURATION_PROPERTIES_NAME);
+			this.servers = HttpServletServer.factory.build(healthCheckProperties);
+			this.clients = HttpClient.factory.build(healthCheckProperties);
+			
+			for (HttpServletServer server : servers) {
+				try {
+					server.start();
+				} catch (Exception e) {
+					logger.warn("{}: cannot start http-server {}", this, server, e);
+				}
+			}
+		} catch (Exception e) {
+			return false;
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() throws IllegalStateException {
+		
+		for (HttpServletServer server : servers) {
+			try {
+				server.stop();
+			} catch (Exception e) {
+				logger.warn("{}: cannot stop http-server {}", this, server, e);
+			}
+		}
+		
+		for (HttpClient client : clients) {
+			try {
+				client.stop();
+			} catch (Exception e) {
+				logger.warn("{}: cannot stop http-client {}", this, client, e);
+			}
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		this.stop();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean isAlive() {
+		return this.healthCheckProperties != null;
+	}
+	
+	/**
+	 * @return list of attached Http Servers
+	 */
+	public ArrayList<HttpServletServer> getServers() {
+		return this.servers;
+	}
+	
+	/**
+	 * @return list of attached Http Clients
+	 */
+	public ArrayList<HttpClient> getClients() {
+		return this.clients;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("HealthCheckMonitor [servers=");
+		builder.append(servers);
+		builder.append(", clients=");
+		builder.append(clients);
+		builder.append("]");
+		return builder.toString();
+	}
+	
+}
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
new file mode 100644
index 00000000..34c1fe3a
--- /dev/null
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheckFeature.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-healthcheck
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.healthcheck;
+
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This feature provides healthcheck verification of remotely associated RESTful components
+ */
+public class HealthCheckFeature implements PolicyEngineFeatureAPI {	
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(HealthCheckFeature.class); 
+	
+	/**
+	 * Properties Configuration Name
+	 */
+	public static final String CONFIGURATION_PROPERTIES_NAME = "feature-healthcheck";
+
+	@Override
+	public int getSequenceNumber() {
+		return 1000;
+	}
+
+	@Override
+	public boolean afterStart(PolicyEngine engine) {
+		try {
+			HealthCheck.monitor.start();
+		} catch (IllegalStateException e) {
+			logger.error("Healthcheck Monitor cannot be started", e);
+		}
+		
+		return false;
+	}
+
+	@Override
+	public boolean afterShutdown(PolicyEngine engine) {
+		try {
+			HealthCheck.monitor.stop();
+		} catch (IllegalStateException e) {
+			logger.error("Healthcheck Monitor cannot be stopped", e);
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * gets the monitor
+	 * @return the healthcheck monitor
+	 */
+	public HealthCheck getMonitor() {
+		return HealthCheck.monitor;
+	}
+
+}
diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
new file mode 100644
index 00000000..3f51ba46
--- /dev/null
+++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/RestHealthCheck.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * feature-healthcheck
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.healthcheck;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.onap.policy.drools.healthcheck.HealthCheck.Reports;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
+
+@Path("/")
+@Api
+@Produces(MediaType.APPLICATION_JSON)
+@SwaggerDefinition(
+    info = @Info(
+        description = "PDP-D Healthcheck Service",
+        version = "v1.0",
+        title = "PDP-D Healthcheck"
+    ),
+    consumes = {MediaType.APPLICATION_JSON},
+    produces = {MediaType.APPLICATION_JSON},
+    schemes = {SwaggerDefinition.Scheme.HTTP},
+    tags = {
+        @Tag(name = "pdp-d-healthcheck", description = "Drools PDP Healthcheck Operations")
+    }
+)
+public class RestHealthCheck {
+	
+    @GET
+    @Path("healthcheck")
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(
+        	value="Perform a system healthcheck", 
+        	notes="Provides healthy status of the PDP-D plus the components defined in its configuration by using a REST interface",
+        	response=Reports.class
+    )
+    public Response healthcheck() {  
+		return Response.status(Response.Status.OK).entity(HealthCheck.monitor.healthCheck()).build();
+    }
+    
+    @GET
+    @Path("healthcheck/configuration")
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(
+        	value="Configuration", 
+        	notes="Provides the Healthcheck server configuration and monitored REST clients",
+        	response=HealthCheck.class
+    )
+    public HealthCheck configuration() {  
+    	return HealthCheck.monitor;
+    }
+}
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
deleted file mode 100644
index 324ea11b..00000000
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheck.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-healthcheck
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.healthcheck;
-
-import java.util.ArrayList;
-import java.util.Properties;
-
-import javax.ws.rs.core.Response;
-
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Healthcheck
- */
-public interface HealthCheck extends Startable {
-	
-	/**
-	 * Healthcheck Report
-	 */
-	public static class Report {
-		/**
-		 * Named Entity in the report
-		 */
-		public String name;
-		
-		/**
-		 * URL queried
-		 */
-		public String url;
-		
-		/**
-		 * healthy?
-		 */
-		public boolean healthy;
-		
-		/**
-		 * return code
-		 */
-		public int code;
-		
-		/**
-		 * Message from remote entity
-		 */
-		public String message;
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("Report [name=");
-			builder.append(name);
-			builder.append(", url=");
-			builder.append(url);
-			builder.append(", healthy=");
-			builder.append(healthy);
-			builder.append(", code=");
-			builder.append(code);
-			builder.append(", message=");
-			builder.append(message);
-			builder.append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * Report aggregation
-	 */
-	public static class Reports {
-		public boolean healthy;
-		public ArrayList<Report> details = new ArrayList<>();
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("Reports [healthy=");
-			builder.append(healthy);
-			builder.append(", details=");
-			builder.append(details);
-			builder.append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * perform a healthcheck
-	 * @return a report
-	 */
-	public Reports healthCheck();
-
-	/**
-	 * Healthcheck Monitor
-	 */
-	public static final HealthCheck monitor = new HealthCheckMonitor();
-}
-
-/**
- * Healthcheck Monitor
- */
-class HealthCheckMonitor implements HealthCheck {
-
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(HealthCheckMonitor.class);
-	
-	/**
-	 * attached http servers
-	 */
-	protected volatile ArrayList<HttpServletServer> servers = new ArrayList<>();
-	
-	/**
-	 * attached http clients
-	 */
-	protected volatile ArrayList<HttpClient> clients = new ArrayList<>();
-	
-	/**
-	 * healthcheck configuration
-	 */
-	protected volatile Properties healthCheckProperties = null; 
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Reports healthCheck() {	
-		Reports reports = new Reports();
-		reports.healthy = PolicyEngine.manager.isAlive();
-		
-		HealthCheck.Report engineReport = new Report();
-		engineReport.healthy = PolicyEngine.manager.isAlive();
-		engineReport.name = "PDP-D";
-		engineReport.url = "self";
-		engineReport.code = (PolicyEngine.manager.isAlive()) ? 200 : 500;
-		engineReport.message = (PolicyEngine.manager.isAlive()) ? "alive" : "not alive";
-		reports.details.add(engineReport);
-		
-		for (HttpClient client : clients) {
-			HealthCheck.Report report = new Report();
-			report.name = client.getName();
-			report.url = client.getBaseUrl();
-			report.healthy = true;
-			try {
-				Response response = client.get();
-				report.code = response.getStatus();
-				if (report.code != 200) {
-					report.healthy = false;
-					reports.healthy = false;
-				}
-					
-				try {
-					report.message = HttpClient.getBody(response, String.class);
-				} catch (Exception e) {
-					logger.warn("{}: cannot get body from http-client {}", this, client, e);
-				}
-			} catch (Exception e) {
-				report.healthy = false;
-				reports.healthy = false;
-			}
-			reports.details.add(report);
-		}
-		return reports;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {
-		
-		try {
-			this.healthCheckProperties = SystemPersistence.manager.getProperties(HealthCheckFeature.CONFIGURATION_PROPERTIES_NAME);
-			this.servers = HttpServletServer.factory.build(healthCheckProperties);
-			this.clients = HttpClient.factory.build(healthCheckProperties);
-			
-			for (HttpServletServer server : servers) {
-				try {
-					server.start();
-				} catch (Exception e) {
-					logger.warn("{}: cannot start http-server {}", this, server, e);
-				}
-			}
-		} catch (Exception e) {
-			return false;
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() throws IllegalStateException {
-		
-		for (HttpServletServer server : servers) {
-			try {
-				server.stop();
-			} catch (Exception e) {
-				logger.warn("{}: cannot stop http-server {}", this, server, e);
-			}
-		}
-		
-		for (HttpClient client : clients) {
-			try {
-				client.stop();
-			} catch (Exception e) {
-				logger.warn("{}: cannot stop http-client {}", this, client, e);
-			}
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		this.stop();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean isAlive() {
-		return this.healthCheckProperties != null;
-	}
-	
-	/**
-	 * @return list of attached Http Servers
-	 */
-	public ArrayList<HttpServletServer> getServers() {
-		return this.servers;
-	}
-	
-	/**
-	 * @return list of attached Http Clients
-	 */
-	public ArrayList<HttpClient> getClients() {
-		return this.clients;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("HealthCheckMonitor [servers=");
-		builder.append(servers);
-		builder.append(", clients=");
-		builder.append(clients);
-		builder.append("]");
-		return builder.toString();
-	}
-	
-}
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java b/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
deleted file mode 100644
index ac5b4b49..00000000
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/HealthCheckFeature.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-healthcheck
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.healthcheck;
-
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This feature provides healthcheck verification of remotely associated RESTful components
- */
-public class HealthCheckFeature implements PolicyEngineFeatureAPI {	
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(HealthCheckFeature.class); 
-	
-	/**
-	 * Properties Configuration Name
-	 */
-	public static final String CONFIGURATION_PROPERTIES_NAME = "feature-healthcheck";
-
-	@Override
-	public int getSequenceNumber() {
-		return 1000;
-	}
-
-	@Override
-	public boolean afterStart(PolicyEngine engine) {
-		try {
-			HealthCheck.monitor.start();
-		} catch (IllegalStateException e) {
-			logger.error("Healthcheck Monitor cannot be started", e);
-		}
-		
-		return false;
-	}
-
-	@Override
-	public boolean afterShutdown(PolicyEngine engine) {
-		try {
-			HealthCheck.monitor.stop();
-		} catch (IllegalStateException e) {
-			logger.error("Healthcheck Monitor cannot be stopped", e);
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * gets the monitor
-	 * @return the healthcheck monitor
-	 */
-	public HealthCheck getMonitor() {
-		return HealthCheck.monitor;
-	}
-
-}
diff --git a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java b/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
deleted file mode 100644
index f90363fc..00000000
--- a/feature-healthcheck/src/main/java/org/openecomp/policy/drools/healthcheck/RestHealthCheck.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * feature-healthcheck
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.healthcheck;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.openecomp.policy.drools.healthcheck.HealthCheck.Reports;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Info;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
-
-@Path("/")
-@Api
-@Produces(MediaType.APPLICATION_JSON)
-@SwaggerDefinition(
-    info = @Info(
-        description = "PDP-D Healthcheck Service",
-        version = "v1.0",
-        title = "PDP-D Healthcheck"
-    ),
-    consumes = {MediaType.APPLICATION_JSON},
-    produces = {MediaType.APPLICATION_JSON},
-    schemes = {SwaggerDefinition.Scheme.HTTP},
-    tags = {
-        @Tag(name = "pdp-d-healthcheck", description = "Drools PDP Healthcheck Operations")
-    }
-)
-public class RestHealthCheck {
-	
-    @GET
-    @Path("healthcheck")
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-        	value="Perform a system healthcheck", 
-        	notes="Provides healthy status of the PDP-D plus the components defined in its configuration by using a REST interface",
-        	response=Reports.class
-    )
-    public Response healthcheck() {  
-		return Response.status(Response.Status.OK).entity(HealthCheck.monitor.healthCheck()).build();
-    }
-    
-    @GET
-    @Path("healthcheck/configuration")
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-        	value="Configuration", 
-        	notes="Provides the Healthcheck server configuration and monitored REST clients",
-        	response=HealthCheck.class
-    )
-    public HealthCheck configuration() {  
-    	return HealthCheck.monitor;
-    }
-}
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 00000000..2ae820ac
--- /dev/null
+++ b/feature-healthcheck/src/main/resources/META-INF/services/org.Onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.healthcheck.HealthCheckFeature
diff --git a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 7e307d08..00000000
--- a/feature-healthcheck/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.healthcheck.HealthCheckFeature
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 47486bfb..4e57cd92 100644
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 7a00999b..e85dc53f 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>packages</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -60,25 +60,25 @@
 	<!--  List any dependencies here that should be included in the installer zip -->
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>base</artifactId>
 			<version>${project.version}</version>
 			<type>tar.gz</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>policy-management</artifactId>
 			<version>${project.version}</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>feature-healthcheck</artifactId>
 			<version>${project.version}</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>feature-eelf</artifactId>
 			<version>${project.version}</version>
 			<type>zip</type>
diff --git a/packages/install/src/files/policy-management.conf b/packages/install/src/files/policy-management.conf
index 609aa868..1e5fd76b 100644
--- a/packages/install/src/files/policy-management.conf
+++ b/packages/install/src/files/policy-management.conf
@@ -1,5 +1,5 @@
 CONTROLLER_ARTIFACT_ID=policy-management
 CONTROLLER_NAME=policy-management-controller
 CONTROLLER_PORT=9696
-RULES_ARTIFACT=org.openecomp.policy:dummy-artifact:1.0.0-SNAPSHOT
+RULES_ARTIFACT=org.onap.policy:dummy-artifact:1.0.0-SNAPSHOT
 UEB_TOPIC=policyengine-develop
diff --git a/packages/pom.xml b/packages/pom.xml
index 9ed60d10..50021c1d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>drools-pdp</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index d0cd873b..902c38cb 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -25,7 +25,7 @@
 
   <artifactId>policy-core</artifactId>
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -54,7 +54,7 @@
       <version>6.5.0.Final</version>
     </dependency>
     <dependency>
-       <groupId>org.openecomp.policy.drools-pdp</groupId>
+       <groupId>org.onap.policy.drools-pdp</groupId>
        <artifactId>policy-utils</artifactId>
        <version>${project.version}</version>  
      </dependency>
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
new file mode 100644
index 00000000..cf94bfcb
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
@@ -0,0 +1,848 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.core;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.kie.api.KieBase;
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieScanner;
+import org.kie.api.builder.Message;
+import org.kie.api.builder.ReleaseId;
+import org.kie.api.builder.Results;
+import org.kie.api.runtime.KieContainer;
+import org.kie.api.runtime.KieSession;
+import org.onap.policy.drools.properties.Startable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class is a wrapper around 'KieContainer', which adds the ability
+ * to automatically create and track KieSession instances.
+ */
+public class PolicyContainer implements Startable
+{
+	// get an instance of logger 
+  private static Logger logger = LoggerFactory.getLogger(PolicyContainer.class);	
+  // 'KieServices' singleton
+  static private KieServices kieServices = KieServices.Factory.get();
+
+  // set of all 'PolicyContainer' instances
+  static private HashSet<PolicyContainer> containers =
+	new HashSet<PolicyContainer>();
+
+  // maps feature objects to per-PolicyContainer data
+  private ConcurrentHashMap<Object, Object> adjuncts =
+	new ConcurrentHashMap<Object, Object>();
+
+  // 'KieContainer' associated with this 'PolicyContainer'
+  private KieContainer kieContainer;
+
+  // indicates whether the PolicyContainer is 'started'
+  // (started = sessions created, threads running)
+  private volatile boolean isStarted = false;
+
+  // maps session name into the associated 'PolicySession' instance
+  private HashMap<String, PolicySession> sessions =
+	new HashMap<String, PolicySession>();
+
+  // if not null, this is a 'KieScanner' looking for updates
+  private KieScanner scanner = null;
+  
+  // indicates whether the scanner has been started
+  // (it can block for a long time)
+  private boolean scannerStarted = false;
+
+  /**
+   * uses 'groupId', 'artifactId' and 'version', and fetches the associated
+   * artifact and remaining dependencies from the Maven repository to create
+   * the 'PolicyContainer' and associated 'KieContainer'.
+   *
+   * An exception occurs if the creation of the 'KieContainer' fails.
+   *
+   * @param groupId the 'groupId' associated with the artifact
+   * @param artifactId the artifact name
+   * @param version a comma-separated list of possible versions
+   */
+  public PolicyContainer(String groupId, String artifactId, String version)
+  {
+	this(kieServices.newReleaseId(groupId, artifactId, version));
+  }
+
+  /**
+   * uses the 'groupId', 'artifactId' and 'version' information in 'ReleaseId',
+   * and fetches the associated artifact and remaining dependencies from the
+   * Maven repository to create the 'PolicyContainer' and associated
+   * 'KieContainer'.
+   *
+   * An exception occurs if the creation of the 'KieContainer' fails.
+   *
+   * @param releaseId indicates the artifact that is to be installed in this
+   *	container
+   */
+  public PolicyContainer(ReleaseId releaseId)
+  {
+	if (releaseId.getVersion().contains(","))
+	  {
+		// this is actually a comma-separated list of release ids
+		releaseId = loadArtifact(releaseId.getGroupId(),
+								 releaseId.getArtifactId(),
+								 releaseId.getVersion());
+	  }
+	else
+	  {
+		kieContainer = kieServices.newKieContainer(releaseId);
+	  }
+	synchronized(containers)
+	  {
+		if(releaseId != null){
+		   logger.info("Add a new kieContainer in containers: releaseId: " + releaseId.toString());
+		}else{
+		   logger.warn("input releaseId is null");
+		}
+		containers.add(this);
+	  }
+	// 'startScanner(releaseId)' was called at this point, but we have seen
+	// at least one case where the Drools container was repeatedly updated
+	// every 60 seconds. It isn't clear what conditions resulted in this
+	// behavior, so the call was removed. If needed, it can be explicitly
+	// called from a feature.
+  }
+
+  /**
+   * Load an artifact into a new KieContainer. This method handles the
+   * case where the 'version' is actually a comma-separated list of
+   * versions.
+   *
+   * @param groupId the 'groupId' associated with the artifact
+   * @param artifactId the artifact name
+   * @param version a comma-separated list of possible versions
+   */
+  private ReleaseId loadArtifact
+	(String groupId, String artifactId, String version)
+  {
+	String[] versions = version.split(",");
+	if (versions.length > 1)
+	  {
+		logger.info("Multiple KieContainer versions are specified: "
+						  + version);
+	  }
+
+	// indicates a 'newKieContainer' call failed
+	RuntimeException exception = null;
+
+	// set prior to every 'newKieContainer' invocation
+	// (if we are able to create the container, it will be the last
+	// one that was successful)
+	ReleaseId releaseId = null;
+	for (String ver : versions)
+	  {
+		try
+		  {
+			// Create a 'ReleaseId' object describing the artifact, and
+			// create a 'KieContainer' based upon it.
+			logger.info("Create new KieContainer start, version = "
+							  + ver + " ...");
+
+			releaseId = kieServices.newReleaseId(groupId, artifactId, ver);
+			kieContainer = kieServices.newKieContainer(releaseId);
+
+			// clear any exception, and break out of the loop
+			exception = null;
+			break;
+		  }
+		catch (RuntimeException e)
+		  {
+			exception = e;
+		  }
+	  }
+	if (exception != null)
+	  {
+		// all of the 'newKieContainer' invocations failed -- throw the
+		// most recent exception
+		throw(exception);
+	  }
+	return(releaseId);
+  }
+
+  /**
+   * @return the name of the container, which is the String equivalent of
+   * the 'ReleaseId'. It has the form:
+   *
+   *	(groupId + ":" + artifactId + ":" + version)
+   *
+   * Note that the name changes after a successful call to 'updateToVersion',
+   * although typically only the 'version' part changes.
+   */
+  public String getName()
+  {
+	return(kieContainer.getReleaseId().toString());
+  }
+
+  /**
+   * @return the associated 'KieContainer' instance
+   */
+  public KieContainer getKieContainer()
+  {
+	return(kieContainer);
+  }
+
+  /**
+   * @return the 'ClassLoader' associated with the 'KieContainer' instance
+   */
+  public ClassLoader getClassLoader()
+  {
+	return(kieContainer.getClassLoader());
+  }
+
+  /**
+   * @return the Maven GroupId of the top-level artifact wrapped
+   *	by the container.
+   */
+  public String getGroupId()
+  {
+	return(kieContainer.getReleaseId().getGroupId());
+  }
+
+  /**
+   * @return the Maven ArtifactId of the top-level artifact wrapped
+   *	by the container.
+   */
+  public String getArtifactId()
+  {
+	return(kieContainer.getReleaseId().getArtifactId());
+  }
+
+  /**
+   * @return the version of the top-level artifact wrapped by the
+   *	container (this may change as updates occur)
+   */
+  public String getVersion()
+  {
+	return(kieContainer.getReleaseId().getVersion());
+  }
+
+  /**
+   * Fetch the named 'PolicySession'.
+   *
+   * @param name the name of the KieSession (which is also the name of
+   *	the associated PolicySession)
+   * @return a PolicySession if found, 'null' if not
+   */
+  public PolicySession getPolicySession(String name)
+  {
+	return(sessions.get(name));
+  }
+
+  /**
+   * Internal method to create a PolicySession, possibly restoring it
+   * from persistent storage.
+   *
+   * @param name of the KieSession and PolicySession
+   * @param kieBaseName name of the associated 'KieBase' instance
+   * @return a new or existing PolicySession, or 'null' if not found
+   */
+  private PolicySession activatePolicySession(String name, String kieBaseName)
+  {
+	synchronized(sessions)
+	  {
+		logger.info("activatePolicySession:name :" + name);
+		PolicySession session = sessions.get(name);
+		if (session == null)
+		  {
+			KieSession kieSession = null;
+
+			// loop through all of the features, and give each one
+			// a chance to create the 'KieSession'
+			for (PolicySessionFeatureAPI feature :
+				   PolicySessionFeatureAPI.impl.getList())
+			  {
+				try
+				  {
+					if ((kieSession = feature.activatePolicySession
+						 (this, name, kieBaseName)) != null)
+					  break;
+				  }
+				catch (Exception e)
+				  {
+					logger.error("ERROR: Feature API: "
+								 + feature.getClass().getName(), e);
+				  }
+			  }
+
+			// if none of the features created the session, create one now
+			if (kieSession == null)
+			  {
+				kieSession = kieContainer.newKieSession(name);
+			  }
+
+			if (kieSession != null)
+			  {
+				// creation of 'KieSession' was successful - build
+				// a PolicySession
+				session = new PolicySession(name, this, kieSession);
+				sessions.put(name, session);
+
+				// notify features
+				for (PolicySessionFeatureAPI feature :
+					   PolicySessionFeatureAPI.impl.getList())
+				  {
+					try
+					  {
+						feature.newPolicySession(session);
+					  }
+					catch (Exception e)
+					  {
+						logger.error("ERROR: Feature API: "
+									 + feature.getClass().getName(), e);
+					  }
+				  }
+				logger.info("activatePolicySession:new session was added in sessions with name " + name);
+			  }
+		  }
+		logger.info("activatePolicySession:session - "
+						  + (session == null ? "null" : session.getFullName())
+						  + " is returned.");
+		return(session);
+	  }
+  }
+
+  /**
+   * This creates a 'PolicySession' instance within this 'PolicyContainer',
+   * and ties it to the specified 'KieSession'. 'name' must not currently
+   * exist within the 'PolicyContainer', and the 'KieBase' object associated
+   * with 'KieSession' must belong to the 'KieContainer'. This method provides
+   * a way for 'KieSession' instances that are created programmatically to fit
+   * into this framework.
+   *
+   * @param name the name for the new 'PolicySession'
+   * @param kieSession a 'KieSession' instance, that will be included in
+   *	this infrastructure
+   * @return the new 'PolicySession'
+   * @throws IllegalArgumentException if 'kieSession' does not reside within
+   *	this container
+   * @throws IllegalStateException if a 'PolicySession' already exists
+   *	with this name
+   */
+  public PolicySession adoptKieSession(String name, KieSession kieSession)
+	throws IllegalArgumentException, IllegalStateException
+  {
+
+	if(name == null){
+		logger.warn("adoptKieSession:input name is null");
+		throw(new IllegalArgumentException
+				  ("KieSession input name is null "
+				   + getName()));
+	}else if(kieSession == null){
+		logger.warn("adoptKieSession:input kieSession is null");
+		throw(new IllegalArgumentException
+				  ("KieSession '" + name + "' is null "
+				   + getName()));
+	}else {
+		logger.info("adoptKieSession:name: " + name + " kieSession: " + kieSession);
+	}
+	// fetch KieBase, and verify it belongs to this KieContainer
+	boolean match = false;
+	KieBase kieBase = kieSession.getKieBase();
+	logger.info("adoptKieSession:kieBase: " + kieBase);
+	for (String kieBaseName : kieContainer.getKieBaseNames())
+	  {
+		logger.info("adoptKieSession:kieBaseName: " + kieBaseName);
+		if (kieBase == kieContainer.getKieBase(kieBaseName))
+		  {
+			match = true;
+			break;
+		  }
+	  }
+	logger.info("adoptKieSession:match " + match);
+	// if we don't have a match yet, the last chance is to look at the
+	// default KieBase, if it exists
+	if (!match && kieBase != kieContainer.getKieBase())
+	  {
+		throw(new IllegalArgumentException
+			  ("KieSession '" + name + "' does not reside within container "
+			   + getName()));
+	  }
+
+	synchronized (sessions)
+	  {
+		if (sessions.get(name) != null)
+		  {
+			throw(new IllegalStateException
+				  ("PolicySession '" + name + "' already exists"));
+		  }
+
+		// create the new 'PolicySession', add it to the table,
+		// and return the object to the caller
+		logger.info("adoptKieSession:create a new policySession with name " + name);
+		PolicySession policySession =
+		  new PolicySession(name, this, kieSession);
+		sessions.put(name, policySession);
+
+		// notify features
+		for (PolicySessionFeatureAPI feature :
+			   PolicySessionFeatureAPI.impl.getList())
+		  {
+			try
+			  {
+				feature.newPolicySession(policySession);
+			  }
+			catch (Exception e)
+			  {
+				logger.error("ERROR: Feature API: "
+							 + feature.getClass().getName(), e);
+			  }
+		  }
+		return(policySession);
+	  }
+  }
+
+  /**
+   * This call 'KieContainer.updateToVersion()', and returns the associated
+   * response as a String. If successful, the name of this 'PolicyContainer'
+   * changes to match the new version.
+   *
+   * @param newVersion this is the version to update to (the 'groupId'
+   *	and 'artifactId' remain the same)
+   * @return the list of messages associated with the update (not sure if
+   *	this can be 'null', or how to determine success/failure)
+   */
+  public String updateToVersion(String newVersion)
+  {
+	ReleaseId releaseId = kieContainer.getReleaseId();
+	Results results = this.updateToVersion
+	  (kieServices.newReleaseId(releaseId.getGroupId(),
+								releaseId.getArtifactId(),
+								newVersion));
+
+	List<Message> messages = (results == null ? null : results.getMessages());
+	return(messages == null ? null : messages.toString());
+  }
+
+  /**
+   * This calls 'KieContainer.updateToVersion()', and returns the associated
+   * response. If successful, the name of this 'PolicyContainer' changes to
+   * match the new version.
+   *
+   * @param releaseId the new artifact (usually new version) to be installed
+   * @return the 'Results' parameter from 'KieContainer.updateToVersion'
+   */
+  public Results updateToVersion(ReleaseId releaseId)
+  {
+    if(releaseId == null){
+	   logger.warn("updateToVersion:input releaseId is null");
+    }else {
+       logger.info("updateToVersion:releaseId " + releaseId.toString());
+    }
+
+	// notify all 'PolicySession' instances
+	Results results = kieContainer.updateToVersion(releaseId);
+	for (PolicySession session : sessions.values())
+	  {
+		session.updated();
+	  }
+
+	return(results);
+  }
+
+  /**
+   * @return all existing 'PolicyContainer' instances
+   */
+  public static Collection<PolicyContainer> getPolicyContainers()
+  {
+	synchronized(containers)
+	  {
+		return(new HashSet<PolicyContainer>(containers));
+	  }
+  }
+
+  /**
+   * @return all of the 'PolicySession' instances
+   */
+  public Collection<PolicySession> getPolicySessions()
+  {
+	// KLUDGE WARNING: this is a temporary workaround -- if there are
+	// no features, we don't have persistence, and 'activate' is never
+	// called. In this case, make sure the container is started.
+	if (PolicySessionFeatureAPI.impl.getList().size() == 0)
+	  {
+		start();
+	  }
+
+	// return current set of PolicySessions
+	synchronized(sessions)
+	  {
+		return(new HashSet<PolicySession>(sessions.values()));
+	  }
+  }
+
+  /**
+   * This method will start a 'KieScanner' (if not currently running),
+   * provided that the ReleaseId version is 'LATEST' or 'RELEASE',
+   * or refers to a SNAPSHOT version.
+   *
+   * @param releaseId the release id used to create the container
+   */
+  public synchronized void startScanner(ReleaseId releaseId)
+  {
+	String version = releaseId.getVersion();
+	if (scannerStarted == false && scanner == null && version != null
+		&& (version.equals("LATEST") || version.equals("RELEASE")
+			|| version.endsWith("-SNAPSHOT")))
+	  {
+		// create the scanner, and poll at 60 second intervals
+		try
+		  {
+			scannerStarted = true;
+
+			// start this in a separate thread -- it can block for a long time
+			new Thread("Scanner Starter " + getName())
+			{
+			  public void run()
+			  {
+				scanner = kieServices.newKieScanner(kieContainer);
+				scanner.start(60000L);
+			  }
+			}.start();
+		  }
+		catch (Exception e)
+		  {
+			// sometimes the scanner initialization fails for some reason
+			logger.error("startScanner error", e);
+		  }
+	  }
+  }
+
+  /**
+   * Insert a fact into a specific named session
+   *
+   * @param name this is the session name
+   * @param object this is the fact to be inserted into the session
+   * @return 'true' if the named session was found, 'false' if not
+   */
+  public boolean insert(String name, Object object)
+  {
+	// TODO: Should the definition of 'name' be expanded to include an
+	// alternate entry point as well? For example, 'name.entryPoint' (or
+	// something other than '.' if that is a problem).
+	synchronized (sessions)
+	  {
+		PolicySession session = sessions.get(name);
+		if (session != null)
+		  {
+			session.getKieSession().insert(object);
+			return(true);
+		  }
+	  }
+	return(false);
+  }
+
+  /**
+   * Insert a fact into all sessions associated with this container
+   *
+   * @param object this is the fact to be inserted into the sessions
+   * @return 'true' if the fact was inserted into at least one session,
+   *	'false' if not
+   */
+  public boolean insertAll(Object object)
+  {
+	boolean rval = false;
+	synchronized (sessions)
+	  {
+		for (PolicySession session : sessions.values())
+		  {
+			session.getKieSession().insert(object);
+			rval = true;
+		  }
+	  }
+	return(rval);
+  }
+
+  /*************************/
+  /* 'Startable' interface */
+  /*************************/
+
+  /**
+   * {@inheritDoc}
+   */
+  public synchronized boolean start()
+  {
+	if (!isStarted)
+	  {
+		// This will create all 'PolicySession' instances specified in the
+		// 'kmodule.xml' file that don't exist yet
+		for (String kieBaseName : kieContainer.getKieBaseNames())
+		  {
+			for (String kieSessionName :
+				   kieContainer.getKieSessionNamesInKieBase(kieBaseName))
+			  {
+				// if the 'PolicySession' does not currently exist, this method
+				// call will attempt to create it
+				PolicySession session =
+				  activatePolicySession(kieSessionName, kieBaseName);
+				if (session != null)
+				  {
+					session.startThread();
+				  }
+			  }
+		  }
+		isStarted = true;
+	  }
+	return(true);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public synchronized boolean stop()
+  {
+	if (isStarted)
+	  {
+		Collection<PolicySession> localSessions;
+
+		synchronized (sessions)
+		  {
+			// local set containing all of the sessions
+			localSessions = new HashSet<PolicySession>(sessions.values());
+
+			// clear the 'name->session' map in 'PolicyContainer'
+			sessions.clear();
+		  }
+		for (PolicySession session : localSessions)
+		  {
+			// stop session thread
+			session.stopThread();
+
+			// free KieSession resources
+			session.getKieSession().dispose();
+
+			// notify features
+			for (PolicySessionFeatureAPI feature :
+				   PolicySessionFeatureAPI.impl.getList())
+			  {
+				try
+				  {
+					feature.disposeKieSession(session);
+				  }
+				catch (Exception e)
+				  {
+					logger.error("ERROR: Feature API: "
+								 + feature.getClass().getName(), e);
+				  }
+			  }
+		  }
+		isStarted = false;
+	  }
+	return(true);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public synchronized void shutdown()
+  {
+	// Note that this method does not call 'destroy' on the 'KieSession'
+	// instances, which would remove any associated information in persistent
+	// storage. Should it do this?
+
+	stop();
+	synchronized(containers)
+	  {
+		containers.remove(this);
+	  }
+
+	// How do we free the resources associated with the KieContainer?
+	// Is garbage collection sufficient?
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public boolean isAlive()
+  {
+	return(isStarted);
+  }
+
+  /*************************/
+
+  /**
+   * This method is similar to 'shutdown', but it also frees any persistence
+   * resources as well.
+   */
+  public synchronized void destroy()
+  {
+	// we need all KieSession instances running in order to free
+	// resources associated with persistence
+	start();
+	Collection<PolicySession> localSessions;
+
+	synchronized (sessions)
+	  {
+		// local set containing all of the sessions
+		localSessions = new HashSet<PolicySession>(sessions.values());
+
+		// clear the 'name->session' map in 'PolicyContainer'
+		sessions.clear();
+	  }
+	for (PolicySession session : localSessions)
+	  {
+		// stop session thread
+		session.stopThread();
+
+		// free KieSession resources
+		session.getKieSession().destroy();
+
+		// notify features
+		for (PolicySessionFeatureAPI feature :
+			   PolicySessionFeatureAPI.impl.getList())
+		  {
+			try
+			  {
+				feature.destroyKieSession(session);
+			  }
+			catch (Exception e)
+			  {
+				logger.error("ERROR: Feature API: "
+							 + feature.getClass().getName(), e);
+			  }
+		  }
+	  }
+	isStarted = false;
+
+	synchronized(containers)
+	  {
+		containers.remove(this);
+	  }
+
+	// How do we free the resources associated with the KieContainer?
+	// Is garbage collection sufficient?
+  }
+
+  /**
+   * This method is called when the host goes from the 'standby->active' state.
+   */
+  static public void activate()
+  {
+	// start all of the 'PolicyContainer' instances
+	for (PolicyContainer container : containers)
+	  {
+		try
+		  {
+			container.start();
+		  }
+		catch (Exception e)
+		  {
+			logger.error("PolicyContainer.start() error in activate", e);
+		  }
+	  }
+  }
+
+  /**
+   * This method is called when the host goes from the 'active->standby' state.
+   */
+  static public void deactivate()
+  {
+	// deactivate all of the 'PolicyContainer' instances
+	for (PolicyContainer container : containers)
+	  {
+		try
+		  {
+			container.stop();
+		  }
+		catch (Exception e)
+		  {
+			logger.error("PolicyContainer.start() error in deactivate", e);
+		  }
+	  }
+  }
+
+  /**
+   * This method does the following:
+   *
+   *	1) Initializes logging
+   *	2) Starts the DroolsPDP Integrity Monitor
+   *	3) Initilaizes persistence
+   *
+   * It no longer reads in properties files, o creates 'PolicyContainer'
+   * instances.
+   *
+   * @param args standard 'main' arguments, which are currently ignored
+   */
+  public static void globalInit(String args[])
+  {
+	String configDir = "config";
+	logger.info("PolicyContainer.main: configDir=" + configDir);
+
+	// invoke 'globalInit' on all of the features
+	for (PolicySessionFeatureAPI feature :
+		   PolicySessionFeatureAPI.impl.getList())
+	  {
+		try
+		  {
+			feature.globalInit(args, configDir);
+		  }
+		catch (Exception e)
+		  {
+			logger.error("ERROR: Feature API: "
+						 + feature.getClass().getName(), e);
+		  }
+	  }
+  }
+	
+  /**
+   * Fetch the adjunct object associated with a given feature
+   *
+   * @param object this is typically the singleton feature object that is
+   *	used as a key, but it might also be useful to use nested objects
+   *	within the feature as keys.
+   * @return a feature-specific object associated with the key, or 'null'
+   *	if it is not found.
+   */
+  public Object getAdjunct(Object object)
+  {
+	return(adjuncts.get(object));
+  }
+
+  /**
+   * Store the adjunct object associated with a given feature
+   *
+   * @param object this is typically the singleton feature object that is
+   *	used as a key, but it might also be useful to use nested objects
+   *	within the feature as keys.
+   * @param value a feature-specific object associated with the key, or 'null'
+   *	if the feature-specific object should be removed
+   */
+  public void setAdjunct(Object object, Object value)
+  {
+	if (value == null)
+	  {
+		adjuncts.remove(object);
+	  }
+	else
+	  {
+		adjuncts.put(object, value);
+	  }
+  }
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
new file mode 100644
index 00000000..77e16804
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java
@@ -0,0 +1,576 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.core;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.kie.api.event.rule.AfterMatchFiredEvent;
+import org.kie.api.event.rule.AgendaEventListener;
+import org.kie.api.event.rule.AgendaGroupPoppedEvent;
+import org.kie.api.event.rule.AgendaGroupPushedEvent;
+import org.kie.api.event.rule.BeforeMatchFiredEvent;
+import org.kie.api.event.rule.MatchCancelledEvent;
+import org.kie.api.event.rule.MatchCreatedEvent;
+import org.kie.api.event.rule.ObjectDeletedEvent;
+import org.kie.api.event.rule.ObjectInsertedEvent;
+import org.kie.api.event.rule.ObjectUpdatedEvent;
+import org.kie.api.event.rule.RuleFlowGroupActivatedEvent;
+import org.kie.api.event.rule.RuleFlowGroupDeactivatedEvent;
+import org.kie.api.event.rule.RuleRuntimeEventListener;
+import org.kie.api.runtime.KieSession;
+import org.onap.policy.drools.core.jmx.PdpJmx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * This class is a wrapper around 'KieSession', which adds the following:
+ *
+ * 1) A thread running 'KieSession.fireUntilHalt()'
+ * 2) Access to UEB
+ * 3) Logging of events
+ */
+public class PolicySession
+  implements AgendaEventListener, RuleRuntimeEventListener
+{
+	// get an instance of logger 
+  private static Logger  logger = LoggerFactory.getLogger(PolicySession.class);		
+  // name of the 'PolicySession' and associated 'KieSession'
+  private String name;
+
+  // the associated 'PolicyContainer', which may have additional
+  // 'PolicySession' instances in addition to this one
+  private PolicyContainer container;
+
+  // maps feature objects to per-PolicyContainer data
+  private ConcurrentHashMap<Object, Object> adjuncts =
+	new ConcurrentHashMap<Object, Object>();
+
+  // associated 'KieSession' instance
+  private KieSession kieSession;
+
+  // if not 'null', this is the thread model processing the 'KieSession'
+  private ThreadModel threadModel = null;
+
+  // supports 'getCurrentSession()' method
+  static private ThreadLocal<PolicySession> policySession =
+	new ThreadLocal<PolicySession>();
+
+  /**
+   * Internal constructor - create a 'PolicySession' instance
+   *
+   * @param name the name of this 'PolicySession' (and 'kieSession')
+   * @param container the 'PolicyContainer' instance containing this session
+   * @param kieSession the associated 'KieSession' instance
+   */
+  protected PolicySession(String name,
+						  PolicyContainer container, KieSession kieSession)
+  {
+	this.name = name;
+	this.container = container;
+	this.kieSession = kieSession;
+	kieSession.addEventListener((AgendaEventListener)this);
+	kieSession.addEventListener((RuleRuntimeEventListener)this);
+  }
+
+  /**
+   * @return the 'PolicyContainer' object containing this session
+   */
+  public PolicyContainer getPolicyContainer()
+  {
+	return(container);
+  }
+
+  /**
+   * @return the associated 'KieSession' instance
+   */
+  public KieSession getKieSession()
+  {
+	return(kieSession);
+  }
+
+  /**
+   * @return the local name of this session, which should either match the
+   * name specified in 'kmodule.xml' file associated with this session, or the
+   * name passed on the 'PolicyContainer.adoptKieSession' method.
+   */
+  public String getName()
+  {
+	return(name);
+  }
+
+  /**
+   * @return the 'PolicyContainer' name, followed by ':', followed by the
+   * local name of the session. It should be useful in log messages.
+   */
+  public String getFullName()
+  {
+	return(container.getName() + ":" + name);
+  }
+
+  /**
+   * If no 'ThreadModel' is currently running, this method will create one,
+   * and invoke it's 'start()' method. Features implementing
+   * 'PolicySessionFeatureAPI.selectThreadModel(...)' get a chance to create
+   * the ThreadModel instance.
+   */
+  public synchronized void startThread()
+  {
+	if (threadModel == null)
+	  {
+		// loop through all of the features, and give each one
+		// a chance to create the 'ThreadModel'
+		for (PolicySessionFeatureAPI feature :
+			   PolicySessionFeatureAPI.impl.getList())
+		  {
+			try
+			  {
+				if ((threadModel = feature.selectThreadModel(this)) != null)
+				  break;
+			  }
+			catch (Exception e)
+			  {
+				logger.error("ERROR: Feature API: "
+							 + feature.getClass().getName(), e);
+			  }
+		  }		
+		if (threadModel == null)
+		  {
+			// no feature created a ThreadModel -- select the default
+			threadModel = new DefaultThreadModel(this);
+		  }
+		logger.info("starting ThreadModel for session " + getFullName());
+		threadModel.start();
+	  }
+  }
+
+  /**
+   * If a 'ThreadModel' is currently running, this calls the 'stop()' method,
+   * and sets the 'threadModel' reference to 'null'.
+   */
+  public synchronized void stopThread()
+  {
+	if (threadModel != null)
+	  {
+		threadModel.stop();
+		threadModel = null;
+	  }
+  }
+
+  /**
+   * Notification that 'updateToVersion' was called on the container
+   */
+  void updated()
+  {
+	if (threadModel != null)
+	  {
+		// notify the 'ThreadModel', which may change one or more Thread names
+		threadModel.updated();
+	  }
+  }
+
+  /**
+   * Set this 'PolicySession' instance as the one associated with the
+   * currently-running thread.
+   */
+  public void setPolicySession()
+  {
+	// this sets a 'ThreadLocal' variable
+	policySession.set(this);
+  }
+
+  /**
+   * @return the 'PolicySession' instance associated with the current thread
+   *	(Note that this only works if the current thread is the one running
+   *	'kieSession.fireUntilHalt()'.)
+   */
+  public static PolicySession getCurrentSession()
+  {
+	return(policySession.get());
+  }
+	
+  /**
+   * Fetch the adjunct object associated with a given feature
+   *
+   * @param object this is typically the singleton feature object that is
+   *	used as a key, but it might also be useful to use nested objects
+   *	within the feature as keys.
+   * @return a feature-specific object associated with the key, or 'null'
+   *	if it is not found.
+   */
+  public Object getAdjunct(Object object)
+  {
+	return(adjuncts.get(object));
+  }
+
+  /**
+   * Store the adjunct object associated with a given feature
+   *
+   * @param object this is typically the singleton feature object that is
+   *	used as a key, but it might also be useful to use nested objects
+   *	within the feature as keys.
+   * @param value a feature-specific object associated with the key, or 'null'
+   *	if the feature-specific object should be removed
+   */
+  public void setAdjunct(Object object, Object value)
+  {
+	if (value == null)
+	  {
+		adjuncts.remove(object);
+	  }
+	else
+	  {
+		adjuncts.put(object, value);
+	  }
+  }
+
+  /***********************************/
+  /* 'AgendaEventListener' interface */
+  /***********************************/
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void afterMatchFired(AfterMatchFiredEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("afterMatchFired: " + getFullName()
+					 + ": AgendaEventListener.afterMatchFired(" + event + ")");
+	  }
+	PdpJmx.getInstance().ruleFired();
+ }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void afterRuleFlowGroupActivated(RuleFlowGroupActivatedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+	logger.debug("afterRuleFlowGroupActivated: " + getFullName()
+				 + ": AgendaEventListener.afterRuleFlowGroupActivated("
+				 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void afterRuleFlowGroupDeactivated
+	(RuleFlowGroupDeactivatedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("afterRuleFlowGroupDeactivated: " + getFullName()
+					 + ": AgendaEventListener.afterRuleFlowGroupDeactivated("
+					 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void agendaGroupPopped(AgendaGroupPoppedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("agendaGroupPopped: " + getFullName()
+					 + ": AgendaEventListener.agendaGroupPopped("
+					 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void agendaGroupPushed(AgendaGroupPushedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("agendaGroupPushed: " + getFullName()
+					 + ": AgendaEventListener.agendaGroupPushed("
+					 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void beforeMatchFired(BeforeMatchFiredEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("beforeMatchFired: " + getFullName()
+					 + ": AgendaEventListener.beforeMatchFired("
+					 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void beforeRuleFlowGroupActivated
+	(RuleFlowGroupActivatedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("beforeRuleFlowGroupActivated: " + getFullName()
+					 + ": AgendaEventListener.beforeRuleFlowGroupActivated("
+					 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void beforeRuleFlowGroupDeactivated
+	(RuleFlowGroupDeactivatedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("beforeRuleFlowGroupDeactivated: " + getFullName()
+					 + ": AgendaEventListener.beforeRuleFlowGroupDeactivated("
+					 + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void matchCancelled(MatchCancelledEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("matchCancelled: " + getFullName()
+					 + ": AgendaEventListener.matchCancelled(" + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void matchCreated(MatchCreatedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("matchCreated: " + getFullName()
+					 + ": AgendaEventListener.matchCreated(" + event + ")");
+	  }
+  }
+
+  /****************************************/
+  /* 'RuleRuntimeEventListener' interface */
+  /****************************************/
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void objectDeleted(ObjectDeletedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("objectDeleted: " + getFullName()
+					 + ": AgendaEventListener.objectDeleted(" + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void objectInserted(ObjectInsertedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("objectInserted: " + getFullName()
+					 + ": AgendaEventListener.objectInserted(" + event + ")");
+	  }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+	public void objectUpdated(ObjectUpdatedEvent event)
+  {
+	if (logger.isDebugEnabled())
+	  {
+		logger.debug("objectUpdated: " + getFullName()
+					 + ": AgendaEventListener.objectUpdated(" + event + ")");
+	  }
+  }
+
+  /* ============================================================ */
+
+  /**
+   * This interface helps support the ability for features to choose the
+   * thread or threads that processes the 'KieSession'.
+   */
+  public interface ThreadModel
+  {
+	/**
+	 * Start the thread or threads that do the 'KieSession' processing
+	 */
+	public void start();
+
+	/**
+	 * Stop the thread or threads that do the 'KieSession' processing
+	 */
+	public void stop();
+
+	/**
+	 * This method is called to notify the running session that
+	 * 'KieContainer.updateToVersion(...)' has been called (meaning the
+	 * full name of this session has changed).
+	 */
+	default public void updated() {}
+  }
+
+  /* ============================================================ */
+
+  /**
+   * This 'ThreadModel' variant uses 'KieSession.fireUntilHalt()'.
+   */
+  public static class DefaultThreadModel implements Runnable,ThreadModel
+  {
+	// session associated with this persistent thread
+	PolicySession session;
+
+	// the session thread
+	Thread thread;
+
+	// controls whether the thread loops or terminates
+	volatile boolean repeat = true;
+
+	/**
+	 * Constructor - initialize 'session' and create thread
+	 *
+	 * @param session the 'PolicySession' instance
+	 */
+	public DefaultThreadModel(PolicySession session)
+	{
+	  this.session = session;
+	  thread = new Thread(this,getThreadName());
+	}
+
+	/**
+	 * @return the String to use as the thread name
+	 */
+	private String getThreadName()
+	{
+	  return("Session " + session.getFullName());
+	}
+
+	/***************************/
+	/* 'ThreadModel' interface */
+	/***************************/
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	  public void start()
+	{
+	  repeat = true;
+	  thread.start();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	  public void stop()
+	{
+	  repeat = false;
+
+	  // this should cause the thread to exit		
+	  session.getKieSession().halt();
+	  try
+		{
+		  // wait up to 10 seconds for the thread to stop
+		  thread.join(10000);
+
+		  // one more interrupt, just in case the 'kieSession.halt()'
+		  // didn't work for some reason
+		  thread.interrupt();
+		}
+	  catch (Exception e)
+		{
+		  logger.error("stopThread in thread.join error");
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	  public void updated()
+	{
+	  // the container artifact has been updated -- adjust the thread name
+	  thread.setName(getThreadName());
+	}
+
+	/************************/
+	/* 'Runnable' interface */
+	/************************/
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	  public void run()
+	{
+	  // set thread local variable
+	  session.setPolicySession();
+
+	  // We want to continue looping, despite any exceptions that occur
+	  // while rules are fired.
+	  KieSession kieSession = session.getKieSession();
+	  while (repeat)
+		{
+		  try
+			{
+			  kieSession.fireUntilHalt();
+
+			  // if we fall through, it means 'KieSession.halt()' was called,
+			  // but this may be a result of 'KieScanner' doing an update
+			}
+		  catch (Exception | LinkageError e)
+			{
+			  logger.error("startThread error in kieSession.fireUntilHalt", e);						
+			}
+		}
+	  logger.info("fireUntilHalt() returned");
+	}
+  }
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
new file mode 100644
index 00000000..6777eb59
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySessionFeatureAPI.java
@@ -0,0 +1,107 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.core;
+
+import org.kie.api.runtime.KieSession;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
+
+/**
+ * This interface provides a way to invoke optional features at various
+ * points in the code. At appropriate points in the
+ * application, the code iterates through this list, invoking these optional
+ * methods. Most of the methods here are notification only -- these tend to
+ * return a 'void' value. In other cases, such as 'activatePolicySession',
+ * may 
+ */
+public interface PolicySessionFeatureAPI extends OrderedService
+{
+  /**
+   * 'FeatureAPI.impl.getList()' returns an ordered list of objects
+   * implementing the 'FeatureAPI' interface.
+   */
+  static public OrderedServiceImpl<PolicySessionFeatureAPI> impl =
+	new OrderedServiceImpl<PolicySessionFeatureAPI>(PolicySessionFeatureAPI.class);
+
+  /**
+   * This method is called during initialization at a point right after
+   * 'PolicyContainer' initialization has completed.
+   *
+   * @param args standard 'main' arguments, which are currently ignored
+   * @param configDir the relative directory containing configuration files
+   */
+  default public void globalInit(String args[], String configDir) {}
+
+  /**
+   * This method is used to create a 'KieSession' as part of a
+   * 'PolicyContainer'. The caller of this method will iterate over the
+   * implementers of this interface until one returns a non-null value.
+   *
+   * @param policyContainer the 'PolicyContainer' instance containing this
+   *	session
+   * @param name the name of the KieSession (which is also the name of
+   *	the associated PolicySession)
+   * @param kieBaseName the name of the 'KieBase' instance containing
+   *	this session
+   * @return a new KieSession, if one was created, or 'null' if not
+   *	(this depends on the capabilities and state of the object implementing
+   *	this interface)
+   */
+  default public KieSession activatePolicySession
+	(PolicyContainer policyContainer, String name, String kieBaseName)
+  {
+	return(null);
+  }
+
+  /**
+   * This method is called after a new 'PolicySession' has been initialized,
+   * and linked to the 'PolicyContainer'.
+   *
+   * @param policySession the new 'PolicySession' instance
+   */
+  default public void newPolicySession(PolicySession policySession) {}
+
+  /**
+   * This method is called to select the 'ThreadModel' instance associated
+   * with a 'PolicySession' instance.
+   */
+  default public PolicySession.ThreadModel selectThreadModel
+	(PolicySession session)
+  {
+	return(null);
+  }
+
+  /**
+   * This method is called after 'KieSession.dispose()' is called
+   *
+   * @param policySession the 'PolicySession' object that wrapped the
+   *	'KieSession'
+   */
+  default public void disposeKieSession(PolicySession policySession) {}
+
+  /**
+   * This method is called after 'KieSession.destroy()' is called
+   *
+   * @param policySession the 'PolicySession' object that wrapped the
+   *	'KieSession'
+   */
+  default public void destroyKieSession(PolicySession policySession) {}
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java
new file mode 100644
index 00000000..d3cf2e9d
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmx.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.core.jmx;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+public class PdpJmx implements PdpJmxMBean  {
+
+	private static PdpJmx instance = new PdpJmx();
+	private final AtomicLong updates = new AtomicLong();
+	private final AtomicLong actions = new AtomicLong();
+
+	public static PdpJmx getInstance() {
+		return instance;
+	}
+	
+	public long getUpdates(){
+		return updates.longValue();
+	}
+	public long getRulesFired(){
+		return actions.longValue();
+	}
+	public void updateOccured(){
+		updates.incrementAndGet();
+	}
+	public void ruleFired(){
+		actions.incrementAndGet();
+	}
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java
new file mode 100644
index 00000000..ceb7049e
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxListener.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.core.jmx;
+
+import java.lang.management.ManagementFactory;
+
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PdpJmxListener {
+
+	public static final Logger logger = LoggerFactory.getLogger(PdpJmxListener.class);
+	
+	public static void stop() {
+		final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+		try {
+			server.unregisterMBean(new ObjectName("PolicyEngine:type=PdpJmx"));
+		} catch (MBeanRegistrationException | InstanceNotFoundException
+				| MalformedObjectNameException e) {
+			logger.error("PdpJmxListener.stop(): " + 
+				         "Could not unregister PolicyEngine:type=PdpJmx MBean " +
+					     "with the MBean server", e);
+		}
+		
+	}
+
+	
+	public static void start() {
+		final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+		try {
+			server.registerMBean(PdpJmx.getInstance(), new ObjectName("PolicyEngine:type=PdpJmx"));
+		} catch (InstanceAlreadyExistsException | MBeanRegistrationException
+				| NotCompliantMBeanException | MalformedObjectNameException e) {
+			logger.error("PdpJmxListener.start(): " + 
+			             "Could not unregister PolicyEngine:type=PdpJmx MBean " +
+				         "with the MBean server", e);
+		}
+		
+	}
+
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java
new file mode 100644
index 00000000..37a9e4dc
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/jmx/PdpJmxMBean.java
@@ -0,0 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.core.jmx;
+
+public interface PdpJmxMBean {
+
+	public long getRulesFired();
+	public long getUpdates();
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java b/policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
new file mode 100644
index 00000000..ee1e7400
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.properties;
+
+/**
+ * Marks a entity as able to lock and unlock.
+ */
+public interface Lockable {
+	
+	/**
+	 * locks this entity
+	 * @return true is the lock operation was successful, false otherwise
+	 */
+	public boolean lock();
+	
+	/**
+	 * unlocks this entity
+	 * @return true is the unlock operation was successful, false otherwise
+	 */
+	public boolean unlock();
+	
+	/**
+	 * is this entity locked?
+	 * @return true if the entity is in a locked state, false otherwise
+	 */
+	public boolean isLocked();
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java b/policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
new file mode 100644
index 00000000..4cb5ef43
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.properties;
+
+public interface PolicyProperties {
+	
+	/* Controller Properties */
+	
+	public static final String PROPERTY_CONTROLLER_NAME = "controller.name";
+	
+	/* Generic property suffixes */
+	
+	public static final String PROPERTY_TOPIC_SERVERS_SUFFIX = ".servers";
+	public static final String PROPERTY_TOPIC_API_KEY_SUFFIX = ".apiKey";
+	public static final String PROPERTY_TOPIC_API_SECRET_SUFFIX = ".apiSecret";	
+	public static final String PROPERTY_TOPIC_AAF_MECHID_SUFFIX = ".aafMechId";
+	public static final String PROPERTY_TOPIC_AAF_PASSWORD_SUFFIX = ".aafPassword";	
+	public static final String PROPERTY_TOPIC_EVENTS_SUFFIX =".events";
+	public static final String PROPERTY_TOPIC_EVENTS_FILTER_SUFFIX =".filter";
+	public static final String PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_GSON_SUFFIX =".events.custom.gson";
+	public static final String PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_JACKSON_SUFFIX =".events.custom.jackson";
+	
+	public static final String PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX = ".consumerGroup";
+	public static final String PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX = ".consumerInstance";
+	public static final String PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX = ".fetchTimeout";
+	public static final String PROPERTY_TOPIC_SOURCE_FETCH_LIMIT_SUFFIX = ".fetchLimit";
+	public static final String PROPERTY_MANAGED_SUFFIX =".managed";
+	
+	public static final String PROPERTY_TOPIC_SINK_PARTITION_KEY_SUFFIX =".partitionKey";
+	
+	public static final String PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX = ".selfSignedCertificates";
+		
+	/* UEB Properties */
+	
+	public static final String PROPERTY_UEB_SOURCE_TOPICS = "ueb.source.topics";	
+	public static final String PROPERTY_UEB_SINK_TOPICS = "ueb.sink.topics";	
+	
+	/* DMAAP Properties */
+	
+	public static final String PROPERTY_DMAAP_SOURCE_TOPICS = "dmaap.source.topics";
+	public static final String PROPERTY_DMAAP_SINK_TOPICS = "dmaap.sink.topics";
+	
+	public static final String PROPERTY_DMAAP_DME2_PARTNER_SUFFIX = ".dme2.partner";
+	public static final String PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX = ".dme2.routeOffer";
+	public static final String PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX = ".dme2.environment";
+	public static final String PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX = ".dme2.aft.environment";
+	public static final String PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX = ".dme2.latitude";
+	public static final String PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX = ".dme2.longitude";
+	
+	public static final String PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX = ".dme2.epReadTimeoutMs";
+	public static final String PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX = ".dme2.epConnTimeout";
+	public static final String PROPERTY_DMAAP_DME2_ROUNDTRIP_TIMEOUT_MS_SUFFIX = ".dme2.roundtripTimeoutMs";
+	public static final String PROPERTY_DMAAP_DME2_VERSION_SUFFIX = ".dme2.version";
+	public static final String PROPERTY_DMAAP_DME2_SERVICE_NAME_SUFFIX = ".dme2.serviceName";
+	public static final String PROPERTY_DMAAP_DME2_SUB_CONTEXT_PATH_SUFFIX = ".dme2.subContextPath";
+	public static final String PROPERTY_DMAAP_DME2_SESSION_STICKINESS_REQUIRED_SUFFIX = ".dme2.sessionStickinessRequired";
+	
+	public static final String PROPERTY_NOOP_SINK_TOPICS = "noop.sink.topics";
+	
+	/* HTTP Server Properties */
+	
+	public static final String PROPERTY_HTTP_SERVER_SERVICES = "http.server.services";
+	
+	public static final String PROPERTY_HTTP_HOST_SUFFIX = ".host";
+	public static final String PROPERTY_HTTP_PORT_SUFFIX = ".port";
+	public static final String PROPERTY_HTTP_CONTEXT_URIPATH_SUFFIX = ".contextUriPath";
+	
+	public static final String PROPERTY_HTTP_AUTH_USERNAME_SUFFIX = ".userName";
+	public static final String PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX = ".password";
+	public static final String PROPERTY_HTTP_AUTH_URIPATH_SUFFIX = ".authUriPath";
+	
+	public static final String PROPERTY_HTTP_REST_CLASSES_SUFFIX = ".restClasses";
+	public static final String PROPERTY_HTTP_REST_PACKAGES_SUFFIX = ".restPackages";
+	public static final String PROPERTY_HTTP_REST_URIPATH_SUFFIX = ".restUriPath";
+	
+	public static final String PROPERTY_HTTP_HTTPS_SUFFIX = ".https";
+	public static final String PROPERTY_HTTP_SWAGGER_SUFFIX = ".swagger";
+	
+	/* HTTP Client Properties */
+	
+	public static final String PROPERTY_HTTP_CLIENT_SERVICES = "http.client.services";
+	
+	public static final String PROPERTY_HTTP_URL_SUFFIX = PROPERTY_HTTP_CONTEXT_URIPATH_SUFFIX;
+	
+	/* Drools Properties */
+	
+	public static final String RULES_GROUPID = "rules.groupId";
+	public static final String RULES_ARTIFACTID = "rules.artifactId";
+	public static final String RULES_VERSION = "rules.version";
+	
+	/* Management Server Properties */	
+	
+	public static final String ENV_MANAGEMENT_SERVER_PORT = "ENGINE_MANAGEMENT_PORT";
+	public static final String ENV_MANAGEMENT_SERVER_HOST = "ENGINE_MANAGEMENT_HOST";
+	public static final String ENV_MANAGEMENT_AUTH_USER = "ENGINE_MANAGEMENT_USER";
+	public static final String ENV_MANAGEMENT_AUTH_PASSWD = "ENGINE_MANAGEMENT_PASSWORD";
+	
+}
diff --git a/policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java b/policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
new file mode 100644
index 00000000..e0f03bb1
--- /dev/null
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-core
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.properties;
+
+/**
+ * Declares the Startable property of any class class implementing
+ * this interface.   This implies that the implementing class supports
+ * start-like operations.
+ */
+public interface Startable {
+	
+	/**
+	 * Start operation.  This operation starts the entity.
+	 * 
+	 * @return boolean.  true if the start operation was successful, 
+	 * otherwise false.
+	 * @throws IllegalStateException. if the element is in a state that
+	 * conflicts with the start operation.
+	 */
+	public boolean start() throws IllegalStateException;
+	
+	/**
+	 * Stop operation.  The entity can be restarted again by invoking
+	 * the start operation.
+	 * 
+	 * @return boolean.  true if the stop operation was successful, 
+	 * otherwise false.
+	 * @throws IllegalStateException. if the element is in a state that
+	 * conflicts with the stop operation.
+	 */
+	public boolean stop()throws IllegalStateException;
+	
+	/**
+	 * shutdown operation.   The terminate operation yields the entity
+	 * unusuable.  It cannot be (re)started.
+	 * 
+	 * @throws IllegalStateException. if the element is in a state that
+	 * conflicts with the stop operation.
+	 */
+	public void shutdown()throws IllegalStateException;
+	
+	/**
+	 * is it alive?
+	 * @return boolean.  true if alive, otherwise false
+	 */
+	public boolean isAlive();
+}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java b/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java
deleted file mode 100644
index 65bd5470..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicyContainer.java
+++ /dev/null
@@ -1,848 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.core;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.kie.api.KieBase;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieScanner;
-import org.kie.api.builder.Message;
-import org.kie.api.builder.ReleaseId;
-import org.kie.api.builder.Results;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.properties.Startable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class is a wrapper around 'KieContainer', which adds the ability
- * to automatically create and track KieSession instances.
- */
-public class PolicyContainer implements Startable
-{
-	// get an instance of logger 
-  private static Logger logger = LoggerFactory.getLogger(PolicyContainer.class);	
-  // 'KieServices' singleton
-  static private KieServices kieServices = KieServices.Factory.get();
-
-  // set of all 'PolicyContainer' instances
-  static private HashSet<PolicyContainer> containers =
-	new HashSet<PolicyContainer>();
-
-  // maps feature objects to per-PolicyContainer data
-  private ConcurrentHashMap<Object, Object> adjuncts =
-	new ConcurrentHashMap<Object, Object>();
-
-  // 'KieContainer' associated with this 'PolicyContainer'
-  private KieContainer kieContainer;
-
-  // indicates whether the PolicyContainer is 'started'
-  // (started = sessions created, threads running)
-  private volatile boolean isStarted = false;
-
-  // maps session name into the associated 'PolicySession' instance
-  private HashMap<String, PolicySession> sessions =
-	new HashMap<String, PolicySession>();
-
-  // if not null, this is a 'KieScanner' looking for updates
-  private KieScanner scanner = null;
-  
-  // indicates whether the scanner has been started
-  // (it can block for a long time)
-  private boolean scannerStarted = false;
-
-  /**
-   * uses 'groupId', 'artifactId' and 'version', and fetches the associated
-   * artifact and remaining dependencies from the Maven repository to create
-   * the 'PolicyContainer' and associated 'KieContainer'.
-   *
-   * An exception occurs if the creation of the 'KieContainer' fails.
-   *
-   * @param groupId the 'groupId' associated with the artifact
-   * @param artifactId the artifact name
-   * @param version a comma-separated list of possible versions
-   */
-  public PolicyContainer(String groupId, String artifactId, String version)
-  {
-	this(kieServices.newReleaseId(groupId, artifactId, version));
-  }
-
-  /**
-   * uses the 'groupId', 'artifactId' and 'version' information in 'ReleaseId',
-   * and fetches the associated artifact and remaining dependencies from the
-   * Maven repository to create the 'PolicyContainer' and associated
-   * 'KieContainer'.
-   *
-   * An exception occurs if the creation of the 'KieContainer' fails.
-   *
-   * @param releaseId indicates the artifact that is to be installed in this
-   *	container
-   */
-  public PolicyContainer(ReleaseId releaseId)
-  {
-	if (releaseId.getVersion().contains(","))
-	  {
-		// this is actually a comma-separated list of release ids
-		releaseId = loadArtifact(releaseId.getGroupId(),
-								 releaseId.getArtifactId(),
-								 releaseId.getVersion());
-	  }
-	else
-	  {
-		kieContainer = kieServices.newKieContainer(releaseId);
-	  }
-	synchronized(containers)
-	  {
-		if(releaseId != null){
-		   logger.info("Add a new kieContainer in containers: releaseId: " + releaseId.toString());
-		}else{
-		   logger.warn("input releaseId is null");
-		}
-		containers.add(this);
-	  }
-	// 'startScanner(releaseId)' was called at this point, but we have seen
-	// at least one case where the Drools container was repeatedly updated
-	// every 60 seconds. It isn't clear what conditions resulted in this
-	// behavior, so the call was removed. If needed, it can be explicitly
-	// called from a feature.
-  }
-
-  /**
-   * Load an artifact into a new KieContainer. This method handles the
-   * case where the 'version' is actually a comma-separated list of
-   * versions.
-   *
-   * @param groupId the 'groupId' associated with the artifact
-   * @param artifactId the artifact name
-   * @param version a comma-separated list of possible versions
-   */
-  private ReleaseId loadArtifact
-	(String groupId, String artifactId, String version)
-  {
-	String[] versions = version.split(",");
-	if (versions.length > 1)
-	  {
-		logger.info("Multiple KieContainer versions are specified: "
-						  + version);
-	  }
-
-	// indicates a 'newKieContainer' call failed
-	RuntimeException exception = null;
-
-	// set prior to every 'newKieContainer' invocation
-	// (if we are able to create the container, it will be the last
-	// one that was successful)
-	ReleaseId releaseId = null;
-	for (String ver : versions)
-	  {
-		try
-		  {
-			// Create a 'ReleaseId' object describing the artifact, and
-			// create a 'KieContainer' based upon it.
-			logger.info("Create new KieContainer start, version = "
-							  + ver + " ...");
-
-			releaseId = kieServices.newReleaseId(groupId, artifactId, ver);
-			kieContainer = kieServices.newKieContainer(releaseId);
-
-			// clear any exception, and break out of the loop
-			exception = null;
-			break;
-		  }
-		catch (RuntimeException e)
-		  {
-			exception = e;
-		  }
-	  }
-	if (exception != null)
-	  {
-		// all of the 'newKieContainer' invocations failed -- throw the
-		// most recent exception
-		throw(exception);
-	  }
-	return(releaseId);
-  }
-
-  /**
-   * @return the name of the container, which is the String equivalent of
-   * the 'ReleaseId'. It has the form:
-   *
-   *	(groupId + ":" + artifactId + ":" + version)
-   *
-   * Note that the name changes after a successful call to 'updateToVersion',
-   * although typically only the 'version' part changes.
-   */
-  public String getName()
-  {
-	return(kieContainer.getReleaseId().toString());
-  }
-
-  /**
-   * @return the associated 'KieContainer' instance
-   */
-  public KieContainer getKieContainer()
-  {
-	return(kieContainer);
-  }
-
-  /**
-   * @return the 'ClassLoader' associated with the 'KieContainer' instance
-   */
-  public ClassLoader getClassLoader()
-  {
-	return(kieContainer.getClassLoader());
-  }
-
-  /**
-   * @return the Maven GroupId of the top-level artifact wrapped
-   *	by the container.
-   */
-  public String getGroupId()
-  {
-	return(kieContainer.getReleaseId().getGroupId());
-  }
-
-  /**
-   * @return the Maven ArtifactId of the top-level artifact wrapped
-   *	by the container.
-   */
-  public String getArtifactId()
-  {
-	return(kieContainer.getReleaseId().getArtifactId());
-  }
-
-  /**
-   * @return the version of the top-level artifact wrapped by the
-   *	container (this may change as updates occur)
-   */
-  public String getVersion()
-  {
-	return(kieContainer.getReleaseId().getVersion());
-  }
-
-  /**
-   * Fetch the named 'PolicySession'.
-   *
-   * @param name the name of the KieSession (which is also the name of
-   *	the associated PolicySession)
-   * @return a PolicySession if found, 'null' if not
-   */
-  public PolicySession getPolicySession(String name)
-  {
-	return(sessions.get(name));
-  }
-
-  /**
-   * Internal method to create a PolicySession, possibly restoring it
-   * from persistent storage.
-   *
-   * @param name of the KieSession and PolicySession
-   * @param kieBaseName name of the associated 'KieBase' instance
-   * @return a new or existing PolicySession, or 'null' if not found
-   */
-  private PolicySession activatePolicySession(String name, String kieBaseName)
-  {
-	synchronized(sessions)
-	  {
-		logger.info("activatePolicySession:name :" + name);
-		PolicySession session = sessions.get(name);
-		if (session == null)
-		  {
-			KieSession kieSession = null;
-
-			// loop through all of the features, and give each one
-			// a chance to create the 'KieSession'
-			for (PolicySessionFeatureAPI feature :
-				   PolicySessionFeatureAPI.impl.getList())
-			  {
-				try
-				  {
-					if ((kieSession = feature.activatePolicySession
-						 (this, name, kieBaseName)) != null)
-					  break;
-				  }
-				catch (Exception e)
-				  {
-					logger.error("ERROR: Feature API: "
-								 + feature.getClass().getName(), e);
-				  }
-			  }
-
-			// if none of the features created the session, create one now
-			if (kieSession == null)
-			  {
-				kieSession = kieContainer.newKieSession(name);
-			  }
-
-			if (kieSession != null)
-			  {
-				// creation of 'KieSession' was successful - build
-				// a PolicySession
-				session = new PolicySession(name, this, kieSession);
-				sessions.put(name, session);
-
-				// notify features
-				for (PolicySessionFeatureAPI feature :
-					   PolicySessionFeatureAPI.impl.getList())
-				  {
-					try
-					  {
-						feature.newPolicySession(session);
-					  }
-					catch (Exception e)
-					  {
-						logger.error("ERROR: Feature API: "
-									 + feature.getClass().getName(), e);
-					  }
-				  }
-				logger.info("activatePolicySession:new session was added in sessions with name " + name);
-			  }
-		  }
-		logger.info("activatePolicySession:session - "
-						  + (session == null ? "null" : session.getFullName())
-						  + " is returned.");
-		return(session);
-	  }
-  }
-
-  /**
-   * This creates a 'PolicySession' instance within this 'PolicyContainer',
-   * and ties it to the specified 'KieSession'. 'name' must not currently
-   * exist within the 'PolicyContainer', and the 'KieBase' object associated
-   * with 'KieSession' must belong to the 'KieContainer'. This method provides
-   * a way for 'KieSession' instances that are created programmatically to fit
-   * into this framework.
-   *
-   * @param name the name for the new 'PolicySession'
-   * @param kieSession a 'KieSession' instance, that will be included in
-   *	this infrastructure
-   * @return the new 'PolicySession'
-   * @throws IllegalArgumentException if 'kieSession' does not reside within
-   *	this container
-   * @throws IllegalStateException if a 'PolicySession' already exists
-   *	with this name
-   */
-  public PolicySession adoptKieSession(String name, KieSession kieSession)
-	throws IllegalArgumentException, IllegalStateException
-  {
-
-	if(name == null){
-		logger.warn("adoptKieSession:input name is null");
-		throw(new IllegalArgumentException
-				  ("KieSession input name is null "
-				   + getName()));
-	}else if(kieSession == null){
-		logger.warn("adoptKieSession:input kieSession is null");
-		throw(new IllegalArgumentException
-				  ("KieSession '" + name + "' is null "
-				   + getName()));
-	}else {
-		logger.info("adoptKieSession:name: " + name + " kieSession: " + kieSession);
-	}
-	// fetch KieBase, and verify it belongs to this KieContainer
-	boolean match = false;
-	KieBase kieBase = kieSession.getKieBase();
-	logger.info("adoptKieSession:kieBase: " + kieBase);
-	for (String kieBaseName : kieContainer.getKieBaseNames())
-	  {
-		logger.info("adoptKieSession:kieBaseName: " + kieBaseName);
-		if (kieBase == kieContainer.getKieBase(kieBaseName))
-		  {
-			match = true;
-			break;
-		  }
-	  }
-	logger.info("adoptKieSession:match " + match);
-	// if we don't have a match yet, the last chance is to look at the
-	// default KieBase, if it exists
-	if (!match && kieBase != kieContainer.getKieBase())
-	  {
-		throw(new IllegalArgumentException
-			  ("KieSession '" + name + "' does not reside within container "
-			   + getName()));
-	  }
-
-	synchronized (sessions)
-	  {
-		if (sessions.get(name) != null)
-		  {
-			throw(new IllegalStateException
-				  ("PolicySession '" + name + "' already exists"));
-		  }
-
-		// create the new 'PolicySession', add it to the table,
-		// and return the object to the caller
-		logger.info("adoptKieSession:create a new policySession with name " + name);
-		PolicySession policySession =
-		  new PolicySession(name, this, kieSession);
-		sessions.put(name, policySession);
-
-		// notify features
-		for (PolicySessionFeatureAPI feature :
-			   PolicySessionFeatureAPI.impl.getList())
-		  {
-			try
-			  {
-				feature.newPolicySession(policySession);
-			  }
-			catch (Exception e)
-			  {
-				logger.error("ERROR: Feature API: "
-							 + feature.getClass().getName(), e);
-			  }
-		  }
-		return(policySession);
-	  }
-  }
-
-  /**
-   * This call 'KieContainer.updateToVersion()', and returns the associated
-   * response as a String. If successful, the name of this 'PolicyContainer'
-   * changes to match the new version.
-   *
-   * @param newVersion this is the version to update to (the 'groupId'
-   *	and 'artifactId' remain the same)
-   * @return the list of messages associated with the update (not sure if
-   *	this can be 'null', or how to determine success/failure)
-   */
-  public String updateToVersion(String newVersion)
-  {
-	ReleaseId releaseId = kieContainer.getReleaseId();
-	Results results = this.updateToVersion
-	  (kieServices.newReleaseId(releaseId.getGroupId(),
-								releaseId.getArtifactId(),
-								newVersion));
-
-	List<Message> messages = (results == null ? null : results.getMessages());
-	return(messages == null ? null : messages.toString());
-  }
-
-  /**
-   * This calls 'KieContainer.updateToVersion()', and returns the associated
-   * response. If successful, the name of this 'PolicyContainer' changes to
-   * match the new version.
-   *
-   * @param releaseId the new artifact (usually new version) to be installed
-   * @return the 'Results' parameter from 'KieContainer.updateToVersion'
-   */
-  public Results updateToVersion(ReleaseId releaseId)
-  {
-    if(releaseId == null){
-	   logger.warn("updateToVersion:input releaseId is null");
-    }else {
-       logger.info("updateToVersion:releaseId " + releaseId.toString());
-    }
-
-	// notify all 'PolicySession' instances
-	Results results = kieContainer.updateToVersion(releaseId);
-	for (PolicySession session : sessions.values())
-	  {
-		session.updated();
-	  }
-
-	return(results);
-  }
-
-  /**
-   * @return all existing 'PolicyContainer' instances
-   */
-  public static Collection<PolicyContainer> getPolicyContainers()
-  {
-	synchronized(containers)
-	  {
-		return(new HashSet<PolicyContainer>(containers));
-	  }
-  }
-
-  /**
-   * @return all of the 'PolicySession' instances
-   */
-  public Collection<PolicySession> getPolicySessions()
-  {
-	// KLUDGE WARNING: this is a temporary workaround -- if there are
-	// no features, we don't have persistence, and 'activate' is never
-	// called. In this case, make sure the container is started.
-	if (PolicySessionFeatureAPI.impl.getList().size() == 0)
-	  {
-		start();
-	  }
-
-	// return current set of PolicySessions
-	synchronized(sessions)
-	  {
-		return(new HashSet<PolicySession>(sessions.values()));
-	  }
-  }
-
-  /**
-   * This method will start a 'KieScanner' (if not currently running),
-   * provided that the ReleaseId version is 'LATEST' or 'RELEASE',
-   * or refers to a SNAPSHOT version.
-   *
-   * @param releaseId the release id used to create the container
-   */
-  public synchronized void startScanner(ReleaseId releaseId)
-  {
-	String version = releaseId.getVersion();
-	if (scannerStarted == false && scanner == null && version != null
-		&& (version.equals("LATEST") || version.equals("RELEASE")
-			|| version.endsWith("-SNAPSHOT")))
-	  {
-		// create the scanner, and poll at 60 second intervals
-		try
-		  {
-			scannerStarted = true;
-
-			// start this in a separate thread -- it can block for a long time
-			new Thread("Scanner Starter " + getName())
-			{
-			  public void run()
-			  {
-				scanner = kieServices.newKieScanner(kieContainer);
-				scanner.start(60000L);
-			  }
-			}.start();
-		  }
-		catch (Exception e)
-		  {
-			// sometimes the scanner initialization fails for some reason
-			logger.error("startScanner error", e);
-		  }
-	  }
-  }
-
-  /**
-   * Insert a fact into a specific named session
-   *
-   * @param name this is the session name
-   * @param object this is the fact to be inserted into the session
-   * @return 'true' if the named session was found, 'false' if not
-   */
-  public boolean insert(String name, Object object)
-  {
-	// TODO: Should the definition of 'name' be expanded to include an
-	// alternate entry point as well? For example, 'name.entryPoint' (or
-	// something other than '.' if that is a problem).
-	synchronized (sessions)
-	  {
-		PolicySession session = sessions.get(name);
-		if (session != null)
-		  {
-			session.getKieSession().insert(object);
-			return(true);
-		  }
-	  }
-	return(false);
-  }
-
-  /**
-   * Insert a fact into all sessions associated with this container
-   *
-   * @param object this is the fact to be inserted into the sessions
-   * @return 'true' if the fact was inserted into at least one session,
-   *	'false' if not
-   */
-  public boolean insertAll(Object object)
-  {
-	boolean rval = false;
-	synchronized (sessions)
-	  {
-		for (PolicySession session : sessions.values())
-		  {
-			session.getKieSession().insert(object);
-			rval = true;
-		  }
-	  }
-	return(rval);
-  }
-
-  /*************************/
-  /* 'Startable' interface */
-  /*************************/
-
-  /**
-   * {@inheritDoc}
-   */
-  public synchronized boolean start()
-  {
-	if (!isStarted)
-	  {
-		// This will create all 'PolicySession' instances specified in the
-		// 'kmodule.xml' file that don't exist yet
-		for (String kieBaseName : kieContainer.getKieBaseNames())
-		  {
-			for (String kieSessionName :
-				   kieContainer.getKieSessionNamesInKieBase(kieBaseName))
-			  {
-				// if the 'PolicySession' does not currently exist, this method
-				// call will attempt to create it
-				PolicySession session =
-				  activatePolicySession(kieSessionName, kieBaseName);
-				if (session != null)
-				  {
-					session.startThread();
-				  }
-			  }
-		  }
-		isStarted = true;
-	  }
-	return(true);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public synchronized boolean stop()
-  {
-	if (isStarted)
-	  {
-		Collection<PolicySession> localSessions;
-
-		synchronized (sessions)
-		  {
-			// local set containing all of the sessions
-			localSessions = new HashSet<PolicySession>(sessions.values());
-
-			// clear the 'name->session' map in 'PolicyContainer'
-			sessions.clear();
-		  }
-		for (PolicySession session : localSessions)
-		  {
-			// stop session thread
-			session.stopThread();
-
-			// free KieSession resources
-			session.getKieSession().dispose();
-
-			// notify features
-			for (PolicySessionFeatureAPI feature :
-				   PolicySessionFeatureAPI.impl.getList())
-			  {
-				try
-				  {
-					feature.disposeKieSession(session);
-				  }
-				catch (Exception e)
-				  {
-					logger.error("ERROR: Feature API: "
-								 + feature.getClass().getName(), e);
-				  }
-			  }
-		  }
-		isStarted = false;
-	  }
-	return(true);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public synchronized void shutdown()
-  {
-	// Note that this method does not call 'destroy' on the 'KieSession'
-	// instances, which would remove any associated information in persistent
-	// storage. Should it do this?
-
-	stop();
-	synchronized(containers)
-	  {
-		containers.remove(this);
-	  }
-
-	// How do we free the resources associated with the KieContainer?
-	// Is garbage collection sufficient?
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean isAlive()
-  {
-	return(isStarted);
-  }
-
-  /*************************/
-
-  /**
-   * This method is similar to 'shutdown', but it also frees any persistence
-   * resources as well.
-   */
-  public synchronized void destroy()
-  {
-	// we need all KieSession instances running in order to free
-	// resources associated with persistence
-	start();
-	Collection<PolicySession> localSessions;
-
-	synchronized (sessions)
-	  {
-		// local set containing all of the sessions
-		localSessions = new HashSet<PolicySession>(sessions.values());
-
-		// clear the 'name->session' map in 'PolicyContainer'
-		sessions.clear();
-	  }
-	for (PolicySession session : localSessions)
-	  {
-		// stop session thread
-		session.stopThread();
-
-		// free KieSession resources
-		session.getKieSession().destroy();
-
-		// notify features
-		for (PolicySessionFeatureAPI feature :
-			   PolicySessionFeatureAPI.impl.getList())
-		  {
-			try
-			  {
-				feature.destroyKieSession(session);
-			  }
-			catch (Exception e)
-			  {
-				logger.error("ERROR: Feature API: "
-							 + feature.getClass().getName(), e);
-			  }
-		  }
-	  }
-	isStarted = false;
-
-	synchronized(containers)
-	  {
-		containers.remove(this);
-	  }
-
-	// How do we free the resources associated with the KieContainer?
-	// Is garbage collection sufficient?
-  }
-
-  /**
-   * This method is called when the host goes from the 'standby->active' state.
-   */
-  static public void activate()
-  {
-	// start all of the 'PolicyContainer' instances
-	for (PolicyContainer container : containers)
-	  {
-		try
-		  {
-			container.start();
-		  }
-		catch (Exception e)
-		  {
-			logger.error("PolicyContainer.start() error in activate", e);
-		  }
-	  }
-  }
-
-  /**
-   * This method is called when the host goes from the 'active->standby' state.
-   */
-  static public void deactivate()
-  {
-	// deactivate all of the 'PolicyContainer' instances
-	for (PolicyContainer container : containers)
-	  {
-		try
-		  {
-			container.stop();
-		  }
-		catch (Exception e)
-		  {
-			logger.error("PolicyContainer.start() error in deactivate", e);
-		  }
-	  }
-  }
-
-  /**
-   * This method does the following:
-   *
-   *	1) Initializes logging
-   *	2) Starts the DroolsPDP Integrity Monitor
-   *	3) Initilaizes persistence
-   *
-   * It no longer reads in properties files, o creates 'PolicyContainer'
-   * instances.
-   *
-   * @param args standard 'main' arguments, which are currently ignored
-   */
-  public static void globalInit(String args[])
-  {
-	String configDir = "config";
-	logger.info("PolicyContainer.main: configDir=" + configDir);
-
-	// invoke 'globalInit' on all of the features
-	for (PolicySessionFeatureAPI feature :
-		   PolicySessionFeatureAPI.impl.getList())
-	  {
-		try
-		  {
-			feature.globalInit(args, configDir);
-		  }
-		catch (Exception e)
-		  {
-			logger.error("ERROR: Feature API: "
-						 + feature.getClass().getName(), e);
-		  }
-	  }
-  }
-	
-  /**
-   * Fetch the adjunct object associated with a given feature
-   *
-   * @param object this is typically the singleton feature object that is
-   *	used as a key, but it might also be useful to use nested objects
-   *	within the feature as keys.
-   * @return a feature-specific object associated with the key, or 'null'
-   *	if it is not found.
-   */
-  public Object getAdjunct(Object object)
-  {
-	return(adjuncts.get(object));
-  }
-
-  /**
-   * Store the adjunct object associated with a given feature
-   *
-   * @param object this is typically the singleton feature object that is
-   *	used as a key, but it might also be useful to use nested objects
-   *	within the feature as keys.
-   * @param value a feature-specific object associated with the key, or 'null'
-   *	if the feature-specific object should be removed
-   */
-  public void setAdjunct(Object object, Object value)
-  {
-	if (value == null)
-	  {
-		adjuncts.remove(object);
-	  }
-	else
-	  {
-		adjuncts.put(object, value);
-	  }
-  }
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java b/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java
deleted file mode 100644
index 431d166d..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySession.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.core;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.kie.api.event.rule.AfterMatchFiredEvent;
-import org.kie.api.event.rule.AgendaEventListener;
-import org.kie.api.event.rule.AgendaGroupPoppedEvent;
-import org.kie.api.event.rule.AgendaGroupPushedEvent;
-import org.kie.api.event.rule.BeforeMatchFiredEvent;
-import org.kie.api.event.rule.MatchCancelledEvent;
-import org.kie.api.event.rule.MatchCreatedEvent;
-import org.kie.api.event.rule.ObjectDeletedEvent;
-import org.kie.api.event.rule.ObjectInsertedEvent;
-import org.kie.api.event.rule.ObjectUpdatedEvent;
-import org.kie.api.event.rule.RuleFlowGroupActivatedEvent;
-import org.kie.api.event.rule.RuleFlowGroupDeactivatedEvent;
-import org.kie.api.event.rule.RuleRuntimeEventListener;
-import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.core.jmx.PdpJmx;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * This class is a wrapper around 'KieSession', which adds the following:
- *
- * 1) A thread running 'KieSession.fireUntilHalt()'
- * 2) Access to UEB
- * 3) Logging of events
- */
-public class PolicySession
-  implements AgendaEventListener, RuleRuntimeEventListener
-{
-	// get an instance of logger 
-  private static Logger  logger = LoggerFactory.getLogger(PolicySession.class);		
-  // name of the 'PolicySession' and associated 'KieSession'
-  private String name;
-
-  // the associated 'PolicyContainer', which may have additional
-  // 'PolicySession' instances in addition to this one
-  private PolicyContainer container;
-
-  // maps feature objects to per-PolicyContainer data
-  private ConcurrentHashMap<Object, Object> adjuncts =
-	new ConcurrentHashMap<Object, Object>();
-
-  // associated 'KieSession' instance
-  private KieSession kieSession;
-
-  // if not 'null', this is the thread model processing the 'KieSession'
-  private ThreadModel threadModel = null;
-
-  // supports 'getCurrentSession()' method
-  static private ThreadLocal<PolicySession> policySession =
-	new ThreadLocal<PolicySession>();
-
-  /**
-   * Internal constructor - create a 'PolicySession' instance
-   *
-   * @param name the name of this 'PolicySession' (and 'kieSession')
-   * @param container the 'PolicyContainer' instance containing this session
-   * @param kieSession the associated 'KieSession' instance
-   */
-  protected PolicySession(String name,
-						  PolicyContainer container, KieSession kieSession)
-  {
-	this.name = name;
-	this.container = container;
-	this.kieSession = kieSession;
-	kieSession.addEventListener((AgendaEventListener)this);
-	kieSession.addEventListener((RuleRuntimeEventListener)this);
-  }
-
-  /**
-   * @return the 'PolicyContainer' object containing this session
-   */
-  public PolicyContainer getPolicyContainer()
-  {
-	return(container);
-  }
-
-  /**
-   * @return the associated 'KieSession' instance
-   */
-  public KieSession getKieSession()
-  {
-	return(kieSession);
-  }
-
-  /**
-   * @return the local name of this session, which should either match the
-   * name specified in 'kmodule.xml' file associated with this session, or the
-   * name passed on the 'PolicyContainer.adoptKieSession' method.
-   */
-  public String getName()
-  {
-	return(name);
-  }
-
-  /**
-   * @return the 'PolicyContainer' name, followed by ':', followed by the
-   * local name of the session. It should be useful in log messages.
-   */
-  public String getFullName()
-  {
-	return(container.getName() + ":" + name);
-  }
-
-  /**
-   * If no 'ThreadModel' is currently running, this method will create one,
-   * and invoke it's 'start()' method. Features implementing
-   * 'PolicySessionFeatureAPI.selectThreadModel(...)' get a chance to create
-   * the ThreadModel instance.
-   */
-  public synchronized void startThread()
-  {
-	if (threadModel == null)
-	  {
-		// loop through all of the features, and give each one
-		// a chance to create the 'ThreadModel'
-		for (PolicySessionFeatureAPI feature :
-			   PolicySessionFeatureAPI.impl.getList())
-		  {
-			try
-			  {
-				if ((threadModel = feature.selectThreadModel(this)) != null)
-				  break;
-			  }
-			catch (Exception e)
-			  {
-				logger.error("ERROR: Feature API: "
-							 + feature.getClass().getName(), e);
-			  }
-		  }		
-		if (threadModel == null)
-		  {
-			// no feature created a ThreadModel -- select the default
-			threadModel = new DefaultThreadModel(this);
-		  }
-		logger.info("starting ThreadModel for session " + getFullName());
-		threadModel.start();
-	  }
-  }
-
-  /**
-   * If a 'ThreadModel' is currently running, this calls the 'stop()' method,
-   * and sets the 'threadModel' reference to 'null'.
-   */
-  public synchronized void stopThread()
-  {
-	if (threadModel != null)
-	  {
-		threadModel.stop();
-		threadModel = null;
-	  }
-  }
-
-  /**
-   * Notification that 'updateToVersion' was called on the container
-   */
-  void updated()
-  {
-	if (threadModel != null)
-	  {
-		// notify the 'ThreadModel', which may change one or more Thread names
-		threadModel.updated();
-	  }
-  }
-
-  /**
-   * Set this 'PolicySession' instance as the one associated with the
-   * currently-running thread.
-   */
-  public void setPolicySession()
-  {
-	// this sets a 'ThreadLocal' variable
-	policySession.set(this);
-  }
-
-  /**
-   * @return the 'PolicySession' instance associated with the current thread
-   *	(Note that this only works if the current thread is the one running
-   *	'kieSession.fireUntilHalt()'.)
-   */
-  public static PolicySession getCurrentSession()
-  {
-	return(policySession.get());
-  }
-	
-  /**
-   * Fetch the adjunct object associated with a given feature
-   *
-   * @param object this is typically the singleton feature object that is
-   *	used as a key, but it might also be useful to use nested objects
-   *	within the feature as keys.
-   * @return a feature-specific object associated with the key, or 'null'
-   *	if it is not found.
-   */
-  public Object getAdjunct(Object object)
-  {
-	return(adjuncts.get(object));
-  }
-
-  /**
-   * Store the adjunct object associated with a given feature
-   *
-   * @param object this is typically the singleton feature object that is
-   *	used as a key, but it might also be useful to use nested objects
-   *	within the feature as keys.
-   * @param value a feature-specific object associated with the key, or 'null'
-   *	if the feature-specific object should be removed
-   */
-  public void setAdjunct(Object object, Object value)
-  {
-	if (value == null)
-	  {
-		adjuncts.remove(object);
-	  }
-	else
-	  {
-		adjuncts.put(object, value);
-	  }
-  }
-
-  /***********************************/
-  /* 'AgendaEventListener' interface */
-  /***********************************/
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void afterMatchFired(AfterMatchFiredEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("afterMatchFired: " + getFullName()
-					 + ": AgendaEventListener.afterMatchFired(" + event + ")");
-	  }
-	PdpJmx.getInstance().ruleFired();
- }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void afterRuleFlowGroupActivated(RuleFlowGroupActivatedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-	logger.debug("afterRuleFlowGroupActivated: " + getFullName()
-				 + ": AgendaEventListener.afterRuleFlowGroupActivated("
-				 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void afterRuleFlowGroupDeactivated
-	(RuleFlowGroupDeactivatedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("afterRuleFlowGroupDeactivated: " + getFullName()
-					 + ": AgendaEventListener.afterRuleFlowGroupDeactivated("
-					 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void agendaGroupPopped(AgendaGroupPoppedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("agendaGroupPopped: " + getFullName()
-					 + ": AgendaEventListener.agendaGroupPopped("
-					 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void agendaGroupPushed(AgendaGroupPushedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("agendaGroupPushed: " + getFullName()
-					 + ": AgendaEventListener.agendaGroupPushed("
-					 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void beforeMatchFired(BeforeMatchFiredEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("beforeMatchFired: " + getFullName()
-					 + ": AgendaEventListener.beforeMatchFired("
-					 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void beforeRuleFlowGroupActivated
-	(RuleFlowGroupActivatedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("beforeRuleFlowGroupActivated: " + getFullName()
-					 + ": AgendaEventListener.beforeRuleFlowGroupActivated("
-					 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void beforeRuleFlowGroupDeactivated
-	(RuleFlowGroupDeactivatedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("beforeRuleFlowGroupDeactivated: " + getFullName()
-					 + ": AgendaEventListener.beforeRuleFlowGroupDeactivated("
-					 + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void matchCancelled(MatchCancelledEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("matchCancelled: " + getFullName()
-					 + ": AgendaEventListener.matchCancelled(" + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void matchCreated(MatchCreatedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("matchCreated: " + getFullName()
-					 + ": AgendaEventListener.matchCreated(" + event + ")");
-	  }
-  }
-
-  /****************************************/
-  /* 'RuleRuntimeEventListener' interface */
-  /****************************************/
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void objectDeleted(ObjectDeletedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("objectDeleted: " + getFullName()
-					 + ": AgendaEventListener.objectDeleted(" + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void objectInserted(ObjectInsertedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("objectInserted: " + getFullName()
-					 + ": AgendaEventListener.objectInserted(" + event + ")");
-	  }
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-	public void objectUpdated(ObjectUpdatedEvent event)
-  {
-	if (logger.isDebugEnabled())
-	  {
-		logger.debug("objectUpdated: " + getFullName()
-					 + ": AgendaEventListener.objectUpdated(" + event + ")");
-	  }
-  }
-
-  /* ============================================================ */
-
-  /**
-   * This interface helps support the ability for features to choose the
-   * thread or threads that processes the 'KieSession'.
-   */
-  public interface ThreadModel
-  {
-	/**
-	 * Start the thread or threads that do the 'KieSession' processing
-	 */
-	public void start();
-
-	/**
-	 * Stop the thread or threads that do the 'KieSession' processing
-	 */
-	public void stop();
-
-	/**
-	 * This method is called to notify the running session that
-	 * 'KieContainer.updateToVersion(...)' has been called (meaning the
-	 * full name of this session has changed).
-	 */
-	default public void updated() {}
-  }
-
-  /* ============================================================ */
-
-  /**
-   * This 'ThreadModel' variant uses 'KieSession.fireUntilHalt()'.
-   */
-  public static class DefaultThreadModel implements Runnable,ThreadModel
-  {
-	// session associated with this persistent thread
-	PolicySession session;
-
-	// the session thread
-	Thread thread;
-
-	// controls whether the thread loops or terminates
-	volatile boolean repeat = true;
-
-	/**
-	 * Constructor - initialize 'session' and create thread
-	 *
-	 * @param session the 'PolicySession' instance
-	 */
-	public DefaultThreadModel(PolicySession session)
-	{
-	  this.session = session;
-	  thread = new Thread(this,getThreadName());
-	}
-
-	/**
-	 * @return the String to use as the thread name
-	 */
-	private String getThreadName()
-	{
-	  return("Session " + session.getFullName());
-	}
-
-	/***************************/
-	/* 'ThreadModel' interface */
-	/***************************/
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	  public void start()
-	{
-	  repeat = true;
-	  thread.start();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	  public void stop()
-	{
-	  repeat = false;
-
-	  // this should cause the thread to exit		
-	  session.getKieSession().halt();
-	  try
-		{
-		  // wait up to 10 seconds for the thread to stop
-		  thread.join(10000);
-
-		  // one more interrupt, just in case the 'kieSession.halt()'
-		  // didn't work for some reason
-		  thread.interrupt();
-		}
-	  catch (Exception e)
-		{
-		  logger.error("stopThread in thread.join error");
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	  public void updated()
-	{
-	  // the container artifact has been updated -- adjust the thread name
-	  thread.setName(getThreadName());
-	}
-
-	/************************/
-	/* 'Runnable' interface */
-	/************************/
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	  public void run()
-	{
-	  // set thread local variable
-	  session.setPolicySession();
-
-	  // We want to continue looping, despite any exceptions that occur
-	  // while rules are fired.
-	  KieSession kieSession = session.getKieSession();
-	  while (repeat)
-		{
-		  try
-			{
-			  kieSession.fireUntilHalt();
-
-			  // if we fall through, it means 'KieSession.halt()' was called,
-			  // but this may be a result of 'KieScanner' doing an update
-			}
-		  catch (Exception | LinkageError e)
-			{
-			  logger.error("startThread error in kieSession.fireUntilHalt", e);						
-			}
-		}
-	  logger.info("fireUntilHalt() returned");
-	}
-  }
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java b/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java
deleted file mode 100644
index 8792372b..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/PolicySessionFeatureAPI.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.core;
-
-import org.kie.api.runtime.KieSession;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
-
-/**
- * This interface provides a way to invoke optional features at various
- * points in the code. At appropriate points in the
- * application, the code iterates through this list, invoking these optional
- * methods. Most of the methods here are notification only -- these tend to
- * return a 'void' value. In other cases, such as 'activatePolicySession',
- * may 
- */
-public interface PolicySessionFeatureAPI extends OrderedService
-{
-  /**
-   * 'FeatureAPI.impl.getList()' returns an ordered list of objects
-   * implementing the 'FeatureAPI' interface.
-   */
-  static public OrderedServiceImpl<PolicySessionFeatureAPI> impl =
-	new OrderedServiceImpl<PolicySessionFeatureAPI>(PolicySessionFeatureAPI.class);
-
-  /**
-   * This method is called during initialization at a point right after
-   * 'PolicyContainer' initialization has completed.
-   *
-   * @param args standard 'main' arguments, which are currently ignored
-   * @param configDir the relative directory containing configuration files
-   */
-  default public void globalInit(String args[], String configDir) {}
-
-  /**
-   * This method is used to create a 'KieSession' as part of a
-   * 'PolicyContainer'. The caller of this method will iterate over the
-   * implementers of this interface until one returns a non-null value.
-   *
-   * @param policyContainer the 'PolicyContainer' instance containing this
-   *	session
-   * @param name the name of the KieSession (which is also the name of
-   *	the associated PolicySession)
-   * @param kieBaseName the name of the 'KieBase' instance containing
-   *	this session
-   * @return a new KieSession, if one was created, or 'null' if not
-   *	(this depends on the capabilities and state of the object implementing
-   *	this interface)
-   */
-  default public KieSession activatePolicySession
-	(PolicyContainer policyContainer, String name, String kieBaseName)
-  {
-	return(null);
-  }
-
-  /**
-   * This method is called after a new 'PolicySession' has been initialized,
-   * and linked to the 'PolicyContainer'.
-   *
-   * @param policySession the new 'PolicySession' instance
-   */
-  default public void newPolicySession(PolicySession policySession) {}
-
-  /**
-   * This method is called to select the 'ThreadModel' instance associated
-   * with a 'PolicySession' instance.
-   */
-  default public PolicySession.ThreadModel selectThreadModel
-	(PolicySession session)
-  {
-	return(null);
-  }
-
-  /**
-   * This method is called after 'KieSession.dispose()' is called
-   *
-   * @param policySession the 'PolicySession' object that wrapped the
-   *	'KieSession'
-   */
-  default public void disposeKieSession(PolicySession policySession) {}
-
-  /**
-   * This method is called after 'KieSession.destroy()' is called
-   *
-   * @param policySession the 'PolicySession' object that wrapped the
-   *	'KieSession'
-   */
-  default public void destroyKieSession(PolicySession policySession) {}
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java b/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java
deleted file mode 100644
index 7fa0dd0a..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmx.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.core.jmx;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-public class PdpJmx implements PdpJmxMBean  {
-
-	private static PdpJmx instance = new PdpJmx();
-	private final AtomicLong updates = new AtomicLong();
-	private final AtomicLong actions = new AtomicLong();
-
-	public static PdpJmx getInstance() {
-		return instance;
-	}
-	
-	public long getUpdates(){
-		return updates.longValue();
-	}
-	public long getRulesFired(){
-		return actions.longValue();
-	}
-	public void updateOccured(){
-		updates.incrementAndGet();
-	}
-	public void ruleFired(){
-		actions.incrementAndGet();
-	}
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java b/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java
deleted file mode 100644
index 87354bf4..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.core.jmx;
-
-import java.lang.management.ManagementFactory;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PdpJmxListener {
-
-	public static final Logger logger = LoggerFactory.getLogger(PdpJmxListener.class);
-	
-	public static void stop() {
-		final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-		try {
-			server.unregisterMBean(new ObjectName("PolicyEngine:type=PdpJmx"));
-		} catch (MBeanRegistrationException | InstanceNotFoundException
-				| MalformedObjectNameException e) {
-			logger.error("PdpJmxListener.stop(): " + 
-				         "Could not unregister PolicyEngine:type=PdpJmx MBean " +
-					     "with the MBean server", e);
-		}
-		
-	}
-
-	
-	public static void start() {
-		final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-		try {
-			server.registerMBean(PdpJmx.getInstance(), new ObjectName("PolicyEngine:type=PdpJmx"));
-		} catch (InstanceAlreadyExistsException | MBeanRegistrationException
-				| NotCompliantMBeanException | MalformedObjectNameException e) {
-			logger.error("PdpJmxListener.start(): " + 
-			             "Could not unregister PolicyEngine:type=PdpJmx MBean " +
-				         "with the MBean server", e);
-		}
-		
-	}
-
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java b/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java
deleted file mode 100644
index a947e82b..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/core/jmx/PdpJmxMBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.core.jmx;
-
-public interface PdpJmxMBean {
-
-	public long getRulesFired();
-	public long getUpdates();
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java b/policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java
deleted file mode 100644
index fd8681c3..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Lockable.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.properties;
-
-/**
- * Marks a entity as able to lock and unlock.
- */
-public interface Lockable {
-	
-	/**
-	 * locks this entity
-	 * @return true is the lock operation was successful, false otherwise
-	 */
-	public boolean lock();
-	
-	/**
-	 * unlocks this entity
-	 * @return true is the unlock operation was successful, false otherwise
-	 */
-	public boolean unlock();
-	
-	/**
-	 * is this entity locked?
-	 * @return true if the entity is in a locked state, false otherwise
-	 */
-	public boolean isLocked();
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java b/policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java
deleted file mode 100644
index 06082fcf..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/properties/PolicyProperties.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.properties;
-
-public interface PolicyProperties {
-	
-	/* Controller Properties */
-	
-	public static final String PROPERTY_CONTROLLER_NAME = "controller.name";
-	
-	/* Generic property suffixes */
-	
-	public static final String PROPERTY_TOPIC_SERVERS_SUFFIX = ".servers";
-	public static final String PROPERTY_TOPIC_API_KEY_SUFFIX = ".apiKey";
-	public static final String PROPERTY_TOPIC_API_SECRET_SUFFIX = ".apiSecret";	
-	public static final String PROPERTY_TOPIC_AAF_MECHID_SUFFIX = ".aafMechId";
-	public static final String PROPERTY_TOPIC_AAF_PASSWORD_SUFFIX = ".aafPassword";	
-	public static final String PROPERTY_TOPIC_EVENTS_SUFFIX =".events";
-	public static final String PROPERTY_TOPIC_EVENTS_FILTER_SUFFIX =".filter";
-	public static final String PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_GSON_SUFFIX =".events.custom.gson";
-	public static final String PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_JACKSON_SUFFIX =".events.custom.jackson";
-	
-	public static final String PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX = ".consumerGroup";
-	public static final String PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX = ".consumerInstance";
-	public static final String PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX = ".fetchTimeout";
-	public static final String PROPERTY_TOPIC_SOURCE_FETCH_LIMIT_SUFFIX = ".fetchLimit";
-	public static final String PROPERTY_MANAGED_SUFFIX =".managed";
-	
-	public static final String PROPERTY_TOPIC_SINK_PARTITION_KEY_SUFFIX =".partitionKey";
-	
-	public static final String PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX = ".selfSignedCertificates";
-		
-	/* UEB Properties */
-	
-	public static final String PROPERTY_UEB_SOURCE_TOPICS = "ueb.source.topics";	
-	public static final String PROPERTY_UEB_SINK_TOPICS = "ueb.sink.topics";	
-	
-	/* DMAAP Properties */
-	
-	public static final String PROPERTY_DMAAP_SOURCE_TOPICS = "dmaap.source.topics";
-	public static final String PROPERTY_DMAAP_SINK_TOPICS = "dmaap.sink.topics";
-	
-	public static final String PROPERTY_DMAAP_DME2_PARTNER_SUFFIX = ".dme2.partner";
-	public static final String PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX = ".dme2.routeOffer";
-	public static final String PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX = ".dme2.environment";
-	public static final String PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX = ".dme2.aft.environment";
-	public static final String PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX = ".dme2.latitude";
-	public static final String PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX = ".dme2.longitude";
-	
-	public static final String PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX = ".dme2.epReadTimeoutMs";
-	public static final String PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX = ".dme2.epConnTimeout";
-	public static final String PROPERTY_DMAAP_DME2_ROUNDTRIP_TIMEOUT_MS_SUFFIX = ".dme2.roundtripTimeoutMs";
-	public static final String PROPERTY_DMAAP_DME2_VERSION_SUFFIX = ".dme2.version";
-	public static final String PROPERTY_DMAAP_DME2_SERVICE_NAME_SUFFIX = ".dme2.serviceName";
-	public static final String PROPERTY_DMAAP_DME2_SUB_CONTEXT_PATH_SUFFIX = ".dme2.subContextPath";
-	public static final String PROPERTY_DMAAP_DME2_SESSION_STICKINESS_REQUIRED_SUFFIX = ".dme2.sessionStickinessRequired";
-	
-	public static final String PROPERTY_NOOP_SINK_TOPICS = "noop.sink.topics";
-	
-	/* HTTP Server Properties */
-	
-	public static final String PROPERTY_HTTP_SERVER_SERVICES = "http.server.services";
-	
-	public static final String PROPERTY_HTTP_HOST_SUFFIX = ".host";
-	public static final String PROPERTY_HTTP_PORT_SUFFIX = ".port";
-	public static final String PROPERTY_HTTP_CONTEXT_URIPATH_SUFFIX = ".contextUriPath";
-	
-	public static final String PROPERTY_HTTP_AUTH_USERNAME_SUFFIX = ".userName";
-	public static final String PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX = ".password";
-	public static final String PROPERTY_HTTP_AUTH_URIPATH_SUFFIX = ".authUriPath";
-	
-	public static final String PROPERTY_HTTP_REST_CLASSES_SUFFIX = ".restClasses";
-	public static final String PROPERTY_HTTP_REST_PACKAGES_SUFFIX = ".restPackages";
-	public static final String PROPERTY_HTTP_REST_URIPATH_SUFFIX = ".restUriPath";
-	
-	public static final String PROPERTY_HTTP_HTTPS_SUFFIX = ".https";
-	public static final String PROPERTY_HTTP_SWAGGER_SUFFIX = ".swagger";
-	
-	/* HTTP Client Properties */
-	
-	public static final String PROPERTY_HTTP_CLIENT_SERVICES = "http.client.services";
-	
-	public static final String PROPERTY_HTTP_URL_SUFFIX = PROPERTY_HTTP_CONTEXT_URIPATH_SUFFIX;
-	
-	/* Drools Properties */
-	
-	public static final String RULES_GROUPID = "rules.groupId";
-	public static final String RULES_ARTIFACTID = "rules.artifactId";
-	public static final String RULES_VERSION = "rules.version";
-	
-	/* Management Server Properties */	
-	
-	public static final String ENV_MANAGEMENT_SERVER_PORT = "ENGINE_MANAGEMENT_PORT";
-	public static final String ENV_MANAGEMENT_SERVER_HOST = "ENGINE_MANAGEMENT_HOST";
-	public static final String ENV_MANAGEMENT_AUTH_USER = "ENGINE_MANAGEMENT_USER";
-	public static final String ENV_MANAGEMENT_AUTH_PASSWD = "ENGINE_MANAGEMENT_PASSWORD";
-	
-}
diff --git a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java b/policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java
deleted file mode 100644
index bb6334a2..00000000
--- a/policy-core/src/main/java/org/openecomp/policy/drools/properties/Startable.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.properties;
-
-/**
- * Declares the Startable property of any class class implementing
- * this interface.   This implies that the implementing class supports
- * start-like operations.
- */
-public interface Startable {
-	
-	/**
-	 * Start operation.  This operation starts the entity.
-	 * 
-	 * @return boolean.  true if the start operation was successful, 
-	 * otherwise false.
-	 * @throws IllegalStateException. if the element is in a state that
-	 * conflicts with the start operation.
-	 */
-	public boolean start() throws IllegalStateException;
-	
-	/**
-	 * Stop operation.  The entity can be restarted again by invoking
-	 * the start operation.
-	 * 
-	 * @return boolean.  true if the stop operation was successful, 
-	 * otherwise false.
-	 * @throws IllegalStateException. if the element is in a state that
-	 * conflicts with the stop operation.
-	 */
-	public boolean stop()throws IllegalStateException;
-	
-	/**
-	 * shutdown operation.   The terminate operation yields the entity
-	 * unusuable.  It cannot be (re)started.
-	 * 
-	 * @throws IllegalStateException. if the element is in a state that
-	 * conflicts with the stop operation.
-	 */
-	public void shutdown()throws IllegalStateException;
-	
-	/**
-	 * is it alive?
-	 * @return boolean.  true if alive, otherwise false
-	 */
-	public boolean isAlive();
-}
diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index 18d338ce..b34b6d33 100644
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
   
 	<parent>
-		<groupId>org.openecomp.policy.drools-pdp</groupId>
+		<groupId>org.onap.policy.drools-pdp</groupId>
 		<artifactId>drools-pdp</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
@@ -166,7 +166,7 @@
 		</dependency> 
 
 		<dependency>
-			<groupId>org.openecomp.policy.drools-pdp</groupId>
+			<groupId>org.onap.policy.drools-pdp</groupId>
 			<artifactId>policy-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java
new file mode 100644
index 00000000..30174f1f
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/Topic.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm;
+
+import java.util.List;
+
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+
+/**
+ * Essential Topic Data
+ */
+public interface Topic extends TopicRegisterable, Startable, Lockable {
+	
+	/**
+	 * network logger
+	 */
+	public static final String NETWORK_LOGGER = "network";
+	
+	/**
+	 * Underlying Communication infrastructure Types
+	 */
+	public enum CommInfrastructure {
+		/**
+		 * UEB Communication Infrastructure
+		 */
+		UEB,
+		/**
+		 * DMAAP Communication Infrastructure
+		 */		
+		DMAAP,
+		/**
+		 * NOOP for internal use only
+		 */
+		NOOP,
+		/**
+		 * REST Communication Infrastructure
+		 */				
+		REST
+	}
+	
+	/**
+	 * gets the topic name
+	 * 
+	 * @return topic name
+	 */
+	public String getTopic();
+	
+	/**
+	 * gets the communication infrastructure type
+	 * @return
+	 */
+	public CommInfrastructure getTopicCommInfrastructure();
+	
+	/**
+	 * return list of servers
+	 * @return bus servers
+	 */
+	public List<String> getServers();	
+
+	/**
+	 * get the more recent events in this topic entity
+	 * 
+	 * @return list of most recent events
+	 */
+	public String[] getRecentEvents();
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java
new file mode 100644
index 00000000..c1eb1e08
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicEndpoint.java
@@ -0,0 +1,729 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.NoopTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Abstraction to managed the system's Networked Topic Endpoints,
+ * sources of all events input into the System. 
+ */
+public interface TopicEndpoint extends Startable, Lockable {
+	
+	/**
+	 * Add Topic Sources to the communication infrastructure initialized per
+	 * properties
+	 * 
+	 * @param properties properties for Topic Source construction
+	 * @return a generic Topic Source
+	 * @throws IllegalArgumentException when invalid arguments are provided
+	 */
+	public List<? extends TopicSource> addTopicSources(Properties properties) 
+		   throws IllegalArgumentException;
+
+	/**
+	 * Add Topic Sinks to the communication infrastructure initialized per
+	 * properties
+	 * 
+	 * @param properties properties for Topic Sink construction
+	 * @return a generic Topic Sink
+	 * @throws IllegalArgumentException when invalid arguments are provided
+	 */
+	public List<? extends TopicSink> addTopicSinks(Properties properties) 
+			   throws IllegalArgumentException;
+	
+	/**
+	 * gets all Topic Sources
+	 * @return the Topic Source List
+	 */
+	List<? extends TopicSource> getTopicSources();
+	
+	/**
+	 * get the Topic Sources for the given topic name
+	 * 
+	 * @param topicName the topic name
+	 * 
+	 * @return the Topic Source List
+	 * @throws IllegalStateException if the entity is in an invalid state
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<? extends TopicSource> getTopicSources(List<String> topicNames) 
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * gets the Topic Source for the given topic name and 
+	 * underlying communication infrastructure type
+	 * 
+	 * @param commType communication infrastructure type
+	 * @param topicName the topic name
+	 * 
+	 * @return the Topic Source
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicReaders for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 * @throws UnsupportedOperationException if the operation is not supported.
+	 */
+	public TopicSource getTopicSource(Topic.CommInfrastructure commType, 
+			                          String topicName) 
+			throws IllegalStateException, IllegalArgumentException, 
+			       UnsupportedOperationException;
+	
+	/**
+	 * get the UEB Topic Source for the given topic name
+	 * 
+	 * @param topicName the topic name
+	 * 
+	 * @return the UEB Topic Source
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicReaders for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSource getUebTopicSource(String topicName)
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * get the DMAAP Topic Source for the given topic name
+	 * 
+	 * @param topicName the topic name
+	 * 
+	 * @return the DMAAP Topic Source
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicReaders for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSource getDmaapTopicSource(String topicName)
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * get the Topic Sinks for the given topic name
+	 * 
+	 * @param topicNames the topic names
+	 * @return the Topic Sink List
+	 * @throws IllegalStateException
+	 * @throws IllegalArgumentException
+	 */
+	public List<? extends TopicSink> getTopicSinks(List<String> topicNames) 
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * get the Topic Sinks for the given topic name and 
+	 * underlying communication infrastructure type
+	 * 
+	 * @param topicName the topic name
+	 * @param commType communication infrastructure type
+	 * 
+	 * @return the Topic Sink List
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicWriters for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public TopicSink getTopicSink(Topic.CommInfrastructure commType, 
+			                      String topicName) 
+			throws IllegalStateException, IllegalArgumentException,
+			       UnsupportedOperationException;
+	
+	/**
+	 * get the Topic Sinks for the given topic name and 
+	 * all the underlying communication infrastructure type
+	 * 
+	 * @param topicName the topic name
+	 * @param commType communication infrastructure type
+	 * 
+	 * @return the Topic Sink List
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicWriters for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<? extends TopicSink> getTopicSinks(String topicName) 
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * get the UEB Topic Source for the given topic name
+	 * 
+	 * @param topicName the topic name
+	 * 
+	 * @return the Topic Source
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicReaders for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSink getUebTopicSink(String topicName)
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * get the no-op Topic Sink for the given topic name
+	 * 
+	 * @param topicName the topic name
+	 * 
+	 * @return the Topic Source
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicReaders for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public NoopTopicSink getNoopTopicSink(String topicName)
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * get the DMAAP Topic Source for the given topic name
+	 * 
+	 * @param topicName the topic name
+	 * 
+	 * @return the Topic Source
+	 * @throws IllegalStateException if the entity is in an invalid state, for
+	 * example multiple TopicReaders for a topic name and communication infrastructure
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSink getDmaapTopicSink(String topicName)
+			throws IllegalStateException, IllegalArgumentException;
+	
+	/**
+	 * gets only the UEB Topic Sources
+	 * @return the UEB Topic Source List
+	 */
+	public List<UebTopicSource> getUebTopicSources();
+	
+	/**
+	 * gets only the DMAAP Topic Sources
+	 * @return the DMAAP Topic Source List
+	 */
+	public List<DmaapTopicSource> getDmaapTopicSources();
+	
+	/**
+	 * gets all Topic Sinks
+	 * @return the Topic Sink List
+	 */
+	public List<? extends TopicSink> getTopicSinks();
+	
+	/**
+	 * gets only the UEB Topic Sinks
+	 * @return the UEB Topic Sink List
+	 */
+	public List<UebTopicSink> getUebTopicSinks();
+	
+	/**
+	 * gets only the DMAAP Topic Sinks
+	 * @return the DMAAP Topic Sink List
+	 */
+	public List<DmaapTopicSink> getDmaapTopicSinks();
+	
+	/**
+	 * gets only the NOOP Topic Sinks
+	 * @return the NOOP Topic Sinks List
+	 */
+	public List<NoopTopicSink> getNoopTopicSinks();
+	
+	/**
+	 * singleton for global access
+	 */
+	public static final TopicEndpoint manager = new ProxyTopicEndpointManager();
+}
+
+/*
+ * ----------------- implementation -------------------
+ */
+
+/**
+ * This implementation of the Topic Endpoint Manager, proxies operations to appropriate
+ * implementations according to the communication infrastructure that are supported
+ */
+class ProxyTopicEndpointManager implements TopicEndpoint {
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(ProxyTopicEndpointManager.class);
+	/**
+	 * Is this element locked?
+	 */
+	protected volatile boolean locked = false;
+	
+	/**
+	 * Is this element alive?
+	 */
+	protected volatile boolean alive = false;
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSource> addTopicSources(Properties properties) throws IllegalArgumentException {
+		
+		// 1. Create UEB Sources
+		// 2. Create DMAAP Sources
+		
+		List<TopicSource> sources = new ArrayList<TopicSource>();	
+		
+		sources.addAll(UebTopicSource.factory.build(properties));
+		sources.addAll(DmaapTopicSource.factory.build(properties));
+		
+		if (this.isLocked()) {
+			for (TopicSource source : sources) {
+				source.lock();
+			}
+		}
+		
+		return sources;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSink> addTopicSinks(Properties properties) throws IllegalArgumentException {
+		// 1. Create UEB Sinks
+		// 2. Create DMAAP Sinks
+		
+		List<TopicSink> sinks = new ArrayList<TopicSink>();	
+		
+		sinks.addAll(UebTopicSink.factory.build(properties));
+		sinks.addAll(DmaapTopicSink.factory.build(properties));
+		sinks.addAll(NoopTopicSink.factory.build(properties));
+		
+		if (this.isLocked()) {
+			for (TopicSink sink : sinks) {
+				sink.lock();
+			}
+		}
+		
+		return sinks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSource> getTopicSources() {
+	
+		List<TopicSource> sources = new ArrayList<TopicSource>();
+		
+		sources.addAll(UebTopicSource.factory.inventory());
+		sources.addAll(DmaapTopicSource.factory.inventory());
+		
+		return sources;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSink> getTopicSinks() {
+		
+		List<TopicSink> sinks = new ArrayList<TopicSink>();	
+		
+		sinks.addAll(UebTopicSink.factory.inventory());
+		sinks.addAll(DmaapTopicSink.factory.inventory());
+		sinks.addAll(NoopTopicSink.factory.inventory());
+		
+		return sinks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<UebTopicSource> getUebTopicSources() {
+		return UebTopicSource.factory.inventory();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<DmaapTopicSource> getDmaapTopicSources() {
+		return DmaapTopicSource.factory.inventory();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<UebTopicSink> getUebTopicSinks() {
+		return UebTopicSink.factory.inventory();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<DmaapTopicSink> getDmaapTopicSinks() {
+		return DmaapTopicSink.factory.inventory();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<NoopTopicSink> getNoopTopicSinks() {
+		return NoopTopicSink.factory.inventory();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {
+		
+		synchronized (this) {
+			if (this.locked) {
+				throw new IllegalStateException(this + " is locked");
+			}
+			
+			if (this.alive) {
+				return true;
+			}
+			
+			this.alive = true;
+		}
+		
+		List<Startable> endpoints = getEndpoints();
+		
+		boolean success = true;
+		for (Startable endpoint: endpoints) {
+			try {
+				success = endpoint.start() && success;
+			} catch (Exception e) {
+				success = false;
+				logger.error("Problem starting endpoint: {}", endpoint, e);
+			}
+		}
+		
+		return success;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() throws IllegalStateException {
+		
+		/* 
+		 * stop regardless if it is locked, in other
+		 * words, stop operation has precedence over
+		 * locks.
+		 */
+		synchronized (this) {			
+			this.alive = false;
+		}
+		
+		List<Startable> endpoints = getEndpoints();
+		
+		boolean success = true;
+		for (Startable endpoint: endpoints) {
+			try {
+				success = endpoint.stop() && success;
+			} catch (Exception e) {
+				success = false;
+				logger.error("Problem stopping endpoint: {}", endpoint, e);
+			}
+		}
+		
+		return success;
+	}
+	
+	/**
+	 * 
+	 * @return list of managed endpoints
+	 */
+	@JsonIgnore
+	protected List<Startable> getEndpoints() {
+		List<Startable> endpoints = new ArrayList<Startable>();
+
+		endpoints.addAll(this.getTopicSources());
+		endpoints.addAll(this.getTopicSinks());
+		
+		return endpoints;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		UebTopicSource.factory.destroy();
+		UebTopicSink.factory.destroy();
+		
+		DmaapTopicSource.factory.destroy();
+		DmaapTopicSink.factory.destroy();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isAlive() {
+		return this.alive;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean lock() {
+		
+		synchronized (this) {
+			if (locked)
+				return true;
+			
+			this.locked = true;
+		}
+		
+		for (TopicSource source: this.getTopicSources()) {
+			source.lock();
+		}
+		
+		for (TopicSink sink: this.getTopicSinks()) {
+			sink.lock();
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean unlock() {
+		synchronized (this) {
+			if (!locked)
+				return true;
+			
+			this.locked = false;
+		}
+		
+		for (TopicSource source: this.getTopicSources()) {
+			source.unlock();
+		}
+		
+		for (TopicSink sink: this.getTopicSinks()) {
+			sink.unlock();
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLocked() {
+		return this.locked;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSource> getTopicSources(List<String> topicNames)
+			throws IllegalStateException, IllegalArgumentException {
+		
+		if (topicNames == null) {
+			throw new IllegalArgumentException("must provide a list of topics");
+		}
+		
+		List<TopicSource> sources = new ArrayList<TopicSource>();
+		for (String topic: topicNames) {
+			try {
+				TopicSource uebSource = this.getUebTopicSource(topic);
+				if (uebSource != null)
+					sources.add(uebSource);
+			} catch (Exception e) {
+				logger.info("No UEB source for topic: {}", topic);
+			}
+			
+			try {
+				TopicSource dmaapSource = this.getDmaapTopicSource(topic);
+				if (dmaapSource != null)
+					sources.add(dmaapSource);
+			} catch (Exception e) {
+				logger.info("No DMAAP source for topic: {}", topic);
+			}
+		}
+		return sources;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSink> getTopicSinks(List<String> topicNames)
+			throws IllegalStateException, IllegalArgumentException {
+		
+		if (topicNames == null) {
+			throw new IllegalArgumentException("must provide a list of topics");
+		}
+		
+		List<TopicSink> sinks = new ArrayList<TopicSink>();
+		for (String topic: topicNames) {
+			try {
+				TopicSink uebSink = this.getUebTopicSink(topic);
+				if (uebSink != null)
+					sinks.add(uebSink);
+			} catch (Exception e) {
+				logger.info("No UEB sink for topic: {}", topic);
+			}
+			
+			try {
+				TopicSink dmaapSink = this.getDmaapTopicSink(topic);
+				if (dmaapSink != null)
+					sinks.add(dmaapSink);
+			} catch (Exception e) {
+				logger.info("No DMAAP sink for topic: {}", topic);
+			}
+		}
+		return sinks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public TopicSource getTopicSource(Topic.CommInfrastructure commType, String topicName)
+			throws IllegalStateException, IllegalArgumentException, UnsupportedOperationException {
+		
+		if (commType == null) {
+			throw new IllegalArgumentException
+				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
+		}
+		
+		if (topicName == null) {
+			throw new IllegalArgumentException
+				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
+		}
+		
+		switch (commType) {
+		case UEB:
+			return this.getUebTopicSource(topicName);
+		case DMAAP:
+			return this.getDmaapTopicSource(topicName);
+		case REST:
+		default:
+			throw new UnsupportedOperationException("Unsupported " + commType.name());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public TopicSink getTopicSink(Topic.CommInfrastructure commType, String topicName)
+			throws IllegalStateException, IllegalArgumentException, UnsupportedOperationException {
+		if (commType == null) {
+			throw new IllegalArgumentException
+				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
+		}
+		
+		if (topicName == null) {
+			throw new IllegalArgumentException
+				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
+		}
+		
+		switch (commType) {
+		case UEB:
+			return this.getUebTopicSink(topicName);
+		case DMAAP:
+			return this.getDmaapTopicSink(topicName);
+		case REST:
+		default:
+			throw new UnsupportedOperationException("Unsupported " + commType.name());
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSink> getTopicSinks(String topicName) 
+			throws IllegalStateException, IllegalArgumentException {
+
+		if (topicName == null) {
+			throw new IllegalArgumentException
+				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
+		}
+		
+		List<TopicSink> sinks = new ArrayList<TopicSink>();
+		
+		try {
+			sinks.add(this.getUebTopicSink(topicName));
+		} catch (Exception e) {
+			;
+		}
+		
+		try {
+			sinks.add(this.getDmaapTopicSink(topicName));
+		} catch (Exception e) {
+			;
+		}
+		
+		return sinks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSource getUebTopicSource(String topicName) throws IllegalStateException, IllegalArgumentException {
+		return UebTopicSource.factory.get(topicName);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSink getUebTopicSink(String topicName) throws IllegalStateException, IllegalArgumentException {
+		return UebTopicSink.factory.get(topicName);
+	}
+
+	@Override
+	public DmaapTopicSource getDmaapTopicSource(String topicName)
+			throws IllegalStateException, IllegalArgumentException {
+		return DmaapTopicSource.factory.get(topicName);
+	}
+
+	@Override
+	public DmaapTopicSink getDmaapTopicSink(String topicName) throws IllegalStateException, IllegalArgumentException {
+		return DmaapTopicSink.factory.get(topicName);
+	}
+
+	@Override
+	public NoopTopicSink getNoopTopicSink(String topicName) throws IllegalStateException, IllegalArgumentException {
+		return NoopTopicSink.factory.get(topicName);
+	}
+	
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java
new file mode 100644
index 00000000..a7dedd27
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicListener.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm;
+
+/**
+ * Listener for event messages entering the Policy Engine
+ */
+public interface TopicListener {
+	
+	/**
+	 * Notification of a new Event over a given Topic
+	 * 
+	 * @param commType communication infrastructure type
+	 * @param topic topic name
+	 * @param event event message as a string
+	 */
+	public void onTopicEvent(Topic.CommInfrastructure commType, String topic, String event);
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java
new file mode 100644
index 00000000..540025e5
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicRegisterable.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm;
+
+/**
+ * Marks a Topic entity as registerable
+ */
+public interface TopicRegisterable {
+	
+	/**
+	 * Register for notification of events with this Topic Entity
+	 * 
+	 * @param topicListener the listener of events
+	 */
+	public void register(TopicListener topicListener);
+	
+	/**
+	 * Unregisters for notification of events with this Topic Entity
+	 * 
+	 * @param topicListener the listener of events
+	 */
+	public void unregister(TopicListener topicListener);
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java
new file mode 100644
index 00000000..b7937ec3
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSink.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm;
+
+/**
+ * Marks a given Topic Endpoint as able to send messages over a topic
+ */
+public interface TopicSink extends Topic {
+	
+	/**
+	 * Sends a string message over this Topic Endpoint
+	 * 
+	 * @param message message to send
+	 * 
+	 * @return true if the send operation succeeded, false otherwise
+	 * @throws IllegalArgumentException an invalid message has been provided
+	 * @throws IllegalStateException the entity is in an state that prevents
+	 *         it from sending messages, for example, locked or stopped.
+	 */
+	public boolean send(String message) throws IllegalArgumentException, IllegalStateException;
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java
new file mode 100644
index 00000000..17cde607
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/TopicSource.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm;
+
+/**
+ * Marker for a Topic Entity, indicating that the entity is able to read
+ * over a topic
+ */
+public interface TopicSource extends Topic {
+	
+	/**
+	 * pushes an event into the source programatically
+	 * 
+	 * @param event the event in json format
+	 * @return true if it can be processed correctly, false otherwise
+	 */
+	public boolean offer(String event);
+
+}
\ No newline at end of file
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java
new file mode 100644
index 00000000..9ddf4fff
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/ApiKeyEnabled.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+/**
+ * API
+ */
+public interface ApiKeyEnabled {
+	/**
+	 * @return api key
+	 */
+	public String getApiKey();
+	
+	/**
+	 * @return api secret
+	 */
+	public String getApiSecret();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java
new file mode 100644
index 00000000..99a600b0
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSink.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+import org.onap.policy.drools.event.comm.TopicSink;
+
+/**
+ * Topic Sink over Bus Infrastructure (DMAAP/UEB)
+ */
+public interface BusTopicSink extends ApiKeyEnabled, TopicSink {
+	/**
+	 * Log Failures after X number of retries
+	 */
+	public static final int DEFAULT_LOG_SEND_FAILURES_AFTER = 1;
+	
+	/**
+	 * Sets the UEB partition key for published messages
+	 * 
+	 * @param partitionKey the partition key
+	 */
+	public void setPartitionKey(String partitionKey);
+	
+	/**
+	 * return the partition key in used by the system to publish messages
+	 * 
+	 * @return the partition key
+	 */
+	public String getPartitionKey();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
new file mode 100644
index 00000000..4ef8e2d6
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/BusTopicSource.java
@@ -0,0 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+import org.onap.policy.drools.event.comm.TopicSource;
+
+/**
+ * Generic Topic Source for UEB/DMAAP Communication Infrastructure
+ *
+ */
+public interface BusTopicSource extends ApiKeyEnabled, TopicSource {
+	
+	/**
+	 * Default Consumer Instance Value
+	 */
+	public static String DEFAULT_CONSUMER_INSTANCE = "0";
+	
+	/**
+	 * Default Timeout fetching in milliseconds
+	 */
+	public static int DEFAULT_TIMEOUT_MS_FETCH = 15000;
+	
+	/**
+	 * Default maximum number of messages fetch at the time
+	 */
+	public static int DEFAULT_LIMIT_FETCH = 100;
+	
+	/**
+	 * Definition of No Timeout fetching
+	 */
+	public static int NO_TIMEOUT_MS_FETCH = -1;
+	
+	/**
+	 * Definition of No limit fetching
+	 */
+	public static int NO_LIMIT_FETCH = -1;
+	
+	/**
+	 * gets the consumer group
+	 * 
+	 * @return consumer group
+	 */
+	public String getConsumerGroup();
+	
+	/**
+	 * gets the consumer instance
+	 * 
+	 * @return consumer instance
+	 */
+	public String getConsumerInstance();
+	
+	/**
+	 * gets the fetch timeout
+	 * 
+	 * @return fetch timeout
+	 */
+	public int getFetchTimeout();
+	
+	/**
+	 * gets the fetch limit
+	 * 
+	 * @return fetch limit
+	 */
+	public int getFetchLimit();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java
new file mode 100644
index 00000000..982fcafa
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSink.java
@@ -0,0 +1,30 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+public interface DmaapTopicSink extends BusTopicSink {
+
+	/**
+	 * Factory of UebTopicWriter for instantiation and management purposes
+	 */
+	
+	public static final DmaapTopicSinkFactory factory = new IndexedDmaapTopicSinkFactory();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
new file mode 100644
index 00000000..759e97f7
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
@@ -0,0 +1,499 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.event.comm.bus.internal.InlineDmaapTopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
+
+/**
+ * DMAAP Topic Sink Factory
+ */
+public interface DmaapTopicSinkFactory {
+	public final String DME2_READ_TIMEOUT_PROPERTY = "AFT_DME2_EP_READ_TIMEOUT_MS";
+	public final String DME2_EP_CONN_TIMEOUT_PROPERTY = "AFT_DME2_EP_CONN_TIMEOUT";
+	public final String DME2_ROUNDTRIP_TIMEOUT_PROPERTY = "AFT_DME2_ROUNDTRIP_TIMEOUT_MS";
+	public final String DME2_VERSION_PROPERTY = "Version";
+	public final String DME2_ROUTE_OFFER_PROPERTY = "routeOffer";
+	public final String DME2_SERVICE_NAME_PROPERTY = "ServiceName";
+	public final String DME2_SUBCONTEXT_PATH_PROPERTY = "SubContextPath";
+	public final String DME2_SESSION_STICKINESS_REQUIRED_PROPERTY = "sessionstickinessrequired";
+
+	/**
+	 * Instantiates a new DMAAP Topic Sink
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param userName AAF user name
+	 * @param password AAF password
+	 * @param partitionKey Consumer Group
+	 * @param environment DME2 environment
+	 * @param aftEnvironment DME2 AFT environment
+	 * @param partner DME2 Partner
+	 * @param latitude DME2 latitude
+	 * @param longitude DME2 longitude
+	 * @param additionalProps additional properties to pass to DME2
+	 * @param managed is this sink endpoint managed?
+	 * 
+	 * @return an DMAAP Topic Sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSink build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret,
+								String userName,
+								String password,
+								String partitionKey,
+								String environment,
+								String aftEnvironment,
+								String partner,
+								String latitude,
+								String longitude,
+								Map<String,String> additionalProps,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts) ;
+	
+	/**
+	 * Instantiates a new DMAAP Topic Sink
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param userName AAF user name
+	 * @param password AAF password
+	 * @param partitionKey Consumer Group
+	 * @param managed is this sink endpoint managed?
+	 * 
+	 * @return an DMAAP Topic Sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSink build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret,
+								String userName,
+								String password,
+								String partitionKey,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Creates an DMAAP Topic Sink based on properties files
+	 * 
+	 * @param properties Properties containing initialization values
+	 * 
+	 * @return an DMAAP Topic Sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<DmaapTopicSink> build(Properties properties)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new DMAAP Topic Sink
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * 
+	 * @return an DMAAP Topic Sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSink build(List<String> servers, String topic)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Destroys an DMAAP Topic Sink based on a topic
+	 * 
+	 * @param topic topic name
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public void destroy(String topic);
+
+	/**
+	 * gets an DMAAP Topic Sink based on topic name
+	 * @param topic the topic name
+	 * 
+	 * @return an DMAAP Topic Sink with topic name
+	 * @throws IllegalArgumentException if an invalid topic is provided
+	 * @throws IllegalStateException if the DMAAP Topic Reader is 
+	 * an incorrect state
+	 */
+	public DmaapTopicSink get(String topic)
+			   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Provides a snapshot of the DMAAP Topic Sinks
+	 * @return a list of the DMAAP Topic Sinks
+	 */
+	public List<DmaapTopicSink> inventory();
+
+	/**
+	 * Destroys all DMAAP Topic Sinks
+	 */
+	public void destroy();
+}
+
+/* ------------- implementation ----------------- */
+
+/**
+ * Factory of DMAAP Reader Topics indexed by topic name
+ */
+class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(IndexedDmaapTopicSinkFactory.class);	
+	
+	/**
+	 * DMAAP Topic Name Index
+	 */
+	protected HashMap<String, DmaapTopicSink> dmaapTopicWriters =
+			new HashMap<String, DmaapTopicSink>();
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSink build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret,
+								String userName,
+								String password,
+								String partitionKey,
+								String environment,
+								String aftEnvironment,
+								String partner,
+								String latitude,
+								String longitude,
+								Map<String,String> additionalProps,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts) 
+			throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized (this) {
+			if (dmaapTopicWriters.containsKey(topic)) {
+				return dmaapTopicWriters.get(topic);
+			}
+			
+			DmaapTopicSink dmaapTopicSink = 
+					new InlineDmaapTopicSink(servers, topic, 
+										     apiKey, apiSecret,
+										     userName, password,
+										     partitionKey,
+										     environment, aftEnvironment, 
+										     partner, latitude, longitude, additionalProps, useHttps, allowSelfSignedCerts);
+			
+			if (managed)
+				dmaapTopicWriters.put(topic, dmaapTopicSink);
+			return dmaapTopicSink;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSink build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret,
+								String userName,
+								String password,
+								String partitionKey,
+								boolean managed,
+								boolean useHttps, boolean allowSelfSignedCerts) 
+			throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized (this) {
+			if (dmaapTopicWriters.containsKey(topic)) {
+				return dmaapTopicWriters.get(topic);
+			}
+			
+			DmaapTopicSink dmaapTopicSink = 
+					new InlineDmaapTopicSink(servers, topic, 
+										     apiKey, apiSecret,
+										     userName, password,
+										     partitionKey, useHttps, allowSelfSignedCerts);
+			
+			if (managed)
+				dmaapTopicWriters.put(topic, dmaapTopicSink);
+			return dmaapTopicSink;
+		}
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSink build(List<String> servers, String topic) throws IllegalArgumentException {
+		return this.build(servers, topic, null, null, null, null, null, true, false, false);
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DmaapTopicSink> build(Properties properties) throws IllegalArgumentException {
+		
+		String writeTopics = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS);
+		if (writeTopics == null || writeTopics.isEmpty()) {
+			logger.info("{}: no topic for DMaaP Sink", this);
+			return new ArrayList<DmaapTopicSink>();
+		}
+		
+		List<String> writeTopicList = new ArrayList<String>(Arrays.asList(writeTopics.split("\\s*,\\s*")));
+		List<DmaapTopicSink> newDmaapTopicSinks = new ArrayList<DmaapTopicSink>();
+		synchronized(this) {
+			for (String topic: writeTopicList) {
+				if (this.dmaapTopicWriters.containsKey(topic)) {
+					newDmaapTopicSinks.add(this.dmaapTopicWriters.get(topic));
+					continue;
+				}
+				String servers = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + 
+				                                        topic + 
+				                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
+				
+				List<String> serverList;
+				if (servers != null && !servers.isEmpty()) serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
+				else serverList = new ArrayList<>();
+				
+				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
+						                               "." + topic + 
+						                               PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);		 
+				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
+                                                          "." + topic + 
+                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);
+				
+				String aafMechId = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
+                                                          "." + topic + 
+                                                          PolicyProperties.PROPERTY_TOPIC_AAF_MECHID_SUFFIX);
+				String aafPassword = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
+         				                                    "." + topic + 
+         				                                    PolicyProperties.PROPERTY_TOPIC_AAF_PASSWORD_SUFFIX);
+				
+				String partitionKey = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
+                                                             "." + topic + 
+                                                             PolicyProperties.PROPERTY_TOPIC_SINK_PARTITION_KEY_SUFFIX);
+				
+				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + topic +
+						                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
+				
+				/* DME2 Properties */
+				
+				String dme2Environment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX);
+
+				String dme2AftEnvironment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX);
+
+				String dme2Partner = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX);
+				
+				String dme2RouteOffer = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX);
+
+				String dme2Latitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX);
+
+				String dme2Longitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX);
+
+				String dme2EpReadTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX);
+
+				String dme2EpConnTimeout = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX);
+
+				String dme2RoundtripTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS
+						+ "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUNDTRIP_TIMEOUT_MS_SUFFIX);
+
+				String dme2Version = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_VERSION_SUFFIX);
+
+				String dme2SubContextPath = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_SUB_CONTEXT_PATH_SUFFIX);
+
+				String dme2SessionStickinessRequired = properties
+						.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
+								+ PolicyProperties.PROPERTY_DMAAP_DME2_SESSION_STICKINESS_REQUIRED_SUFFIX);
+				
+				Map<String,String> dme2AdditionalProps = new HashMap<>();
+				
+				if (dme2EpReadTimeoutMs != null && !dme2EpReadTimeoutMs.isEmpty())
+					dme2AdditionalProps.put(DME2_READ_TIMEOUT_PROPERTY, dme2EpReadTimeoutMs);
+				if (dme2EpConnTimeout != null && !dme2EpConnTimeout.isEmpty())
+					dme2AdditionalProps.put(DME2_EP_CONN_TIMEOUT_PROPERTY, dme2EpConnTimeout);
+				if (dme2RoundtripTimeoutMs != null && !dme2RoundtripTimeoutMs.isEmpty())
+					dme2AdditionalProps.put(DME2_ROUNDTRIP_TIMEOUT_PROPERTY, dme2RoundtripTimeoutMs);
+				if (dme2Version != null && !dme2Version.isEmpty())
+					dme2AdditionalProps.put(DME2_VERSION_PROPERTY, dme2Version);
+				if (dme2RouteOffer != null && !dme2RouteOffer.isEmpty())
+					dme2AdditionalProps.put(DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
+				if (dme2SubContextPath != null && !dme2SubContextPath.isEmpty())
+					dme2AdditionalProps.put(DME2_SUBCONTEXT_PATH_PROPERTY, dme2SubContextPath);
+				if (dme2SessionStickinessRequired != null && !dme2SessionStickinessRequired.isEmpty())
+					dme2AdditionalProps.put(DME2_SESSION_STICKINESS_REQUIRED_PROPERTY, dme2SessionStickinessRequired);
+
+				if (servers == null || servers.isEmpty()) {
+					logger.error("{}: no DMaaP servers or DME2 ServiceName provided", this);
+					continue;
+				}
+				
+				boolean managed = true;
+				if (managedString != null && !managedString.isEmpty()) {
+					managed = Boolean.parseBoolean(managedString);
+				}
+				
+				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
+
+				//default is to use HTTP if no https property exists
+				boolean useHttps = false;
+				if (useHttpsString != null && !useHttpsString.isEmpty()){
+					useHttps = Boolean.parseBoolean(useHttpsString);
+				}
+				
+				
+				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
+
+					//default is to disallow self-signed certs 
+				boolean allowSelfSignedCerts = false;
+				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
+					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
+				}				
+				
+				DmaapTopicSink dmaapTopicSink = this.build(serverList, topic, 
+						   						           apiKey, apiSecret,
+						   						           aafMechId, aafPassword,
+						   						           partitionKey,
+						   						           dme2Environment, dme2AftEnvironment,
+						   						           dme2Partner, dme2Latitude, dme2Longitude,
+						   						           dme2AdditionalProps, managed, useHttps, allowSelfSignedCerts);
+				
+				newDmaapTopicSinks.add(dmaapTopicSink);
+			}
+			return newDmaapTopicSinks;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(String topic) 
+		   throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		DmaapTopicSink dmaapTopicWriter;
+		synchronized(this) {
+			if (!dmaapTopicWriters.containsKey(topic)) {
+				return;
+			}
+			
+			dmaapTopicWriter = dmaapTopicWriters.remove(topic);
+		}
+		
+		dmaapTopicWriter.shutdown();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy() {
+		List<DmaapTopicSink> writers = this.inventory();
+		for (DmaapTopicSink writer: writers) {
+			writer.shutdown();
+		}
+		
+		synchronized(this) {
+			this.dmaapTopicWriters.clear();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSink get(String topic) 
+			throws IllegalArgumentException, IllegalStateException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (dmaapTopicWriters.containsKey(topic)) {
+				return dmaapTopicWriters.get(topic);
+			} else {
+				throw new IllegalStateException("DmaapTopicSink for " + topic + " not found");
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized List<DmaapTopicSink> inventory() {
+		 List<DmaapTopicSink> writers = 
+				 new ArrayList<DmaapTopicSink>(this.dmaapTopicWriters.values());
+		 return writers;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("IndexedDmaapTopicSinkFactory []");
+		return builder.toString();
+	}
+	
+}
\ No newline at end of file
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java
new file mode 100644
index 00000000..8d9329fa
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSource.java
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+public interface DmaapTopicSource extends BusTopicSource {
+
+	/**
+	 * factory for managing and tracking DMAAP sources
+	 */
+	public static DmaapTopicSourceFactory factory = new IndexedDmaapTopicSourceFactory();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
new file mode 100644
index 00000000..d8aceca5
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
@@ -0,0 +1,598 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.onap.policy.drools.event.comm.bus.internal.SingleThreadedDmaapTopicSource;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.properties.PolicyProperties;
+
+/**
+ * DMAAP Topic Source Factory
+ */
+public interface DmaapTopicSourceFactory {
+	public final String DME2_READ_TIMEOUT_PROPERTY = "AFT_DME2_EP_READ_TIMEOUT_MS";
+	public final String DME2_EP_CONN_TIMEOUT_PROPERTY = "AFT_DME2_EP_CONN_TIMEOUT";
+	public final String DME2_ROUNDTRIP_TIMEOUT_PROPERTY = "AFT_DME2_ROUNDTRIP_TIMEOUT_MS";
+	public final String DME2_VERSION_PROPERTY = "Version";
+	public final String DME2_ROUTE_OFFER_PROPERTY = "routeOffer";
+	public final String DME2_SERVICE_NAME_PROPERTY = "ServiceName";
+	public final String DME2_SUBCONTEXT_PATH_PROPERTY = "SubContextPath";
+	public final String DME2_SESSION_STICKINESS_REQUIRED_PROPERTY = "sessionstickinessrequired";
+	
+	/**
+	 * Creates an DMAAP Topic Source based on properties files
+	 * 
+	 * @param properties Properties containing initialization values
+	 * 
+	 * @return an DMAAP Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<DmaapTopicSource> build(Properties properties)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new DMAAP Topic Source
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param userName user name
+	 * @param password password
+	 * @param consumerGroup Consumer Group
+	 * @param consumerInstance Consumer Instance
+	 * @param fetchTimeout Read Fetch Timeout
+	 * @param fetchLimit Fetch Limit
+	 * @param managed is this endpoind managed?
+	 * @param useHttps does the connection use HTTPS?
+	 * @param allowSelfSignedCerts does connection allow self-signed certificates?
+	 * 
+	 * @return an DMAAP Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret, 
+								String userName, 
+								String password,
+								String consumerGroup, 
+								String consumerInstance,
+								int fetchTimeout,
+								int fetchLimit,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new DMAAP Topic Source
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param userName user name
+	 * @param password password
+	 * @param consumerGroup Consumer Group
+	 * @param consumerInstance Consumer Instance
+	 * @param fetchTimeout Read Fetch Timeout
+	 * @param fetchLimit Fetch Limit
+	 * @param environment DME2 environment
+	 * @param aftEnvironment DME2 AFT environment
+	 * @param partner DME2 Partner
+	 * @param latitude DME2 latitude
+	 * @param longitude DME2 longitude
+	 * @param additionalProps additional properties to pass to DME2
+	 * @param managed is this endpoind managed?
+	 * @param useHttps does the connection use HTTPS?
+	 * @param allowSelfSignedCerts does connection allow self-signed certificates?
+	 * 
+	 * @return an DMAAP Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret, 
+								String userName, 
+								String password,
+								String consumerGroup, 
+								String consumerInstance,
+								int fetchTimeout,
+								int fetchLimit,
+								String environment,
+								String aftEnvironment,
+								String partner,
+								String latitude,
+								String longitude,
+								Map<String,String> additionalProps,
+								boolean managed,
+								boolean useHttps, 
+								boolean allowSelfSignedCerts)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new DMAAP Topic Source
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * 
+	 * @return an DMAAP Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret)
+			throws IllegalArgumentException;
+
+	/**
+	 * Instantiates a new DMAAP Topic Source
+	 * 
+	 * @param uebTopicReaderType Implementation type
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * 
+	 * @return an DMAAP Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public DmaapTopicSource build(List<String> servers,
+								String topic)
+			throws IllegalArgumentException;	
+	
+	/**
+	 * Destroys an DMAAP Topic Source based on a topic
+	 * 
+	 * @param topic topic name
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public void destroy(String topic);
+	
+	/**
+	 * Destroys all DMAAP Topic Sources
+	 */
+	public void destroy();
+	
+	/**
+	 * gets an DMAAP Topic Source based on topic name
+	 * @param topic the topic name
+	 * @return an DMAAP Topic Source with topic name
+	 * @throws IllegalArgumentException if an invalid topic is provided
+	 * @throws IllegalStateException if the DMAAP Topic Source is 
+	 * an incorrect state
+	 */
+	public DmaapTopicSource get(String topic)
+		   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Provides a snapshot of the DMAAP Topic Sources
+	 * @return a list of the DMAAP Topic Sources
+	 */
+	public List<DmaapTopicSource> inventory();
+}
+
+
+/* ------------- implementation ----------------- */
+
+/**
+ * Factory of DMAAP Source Topics indexed by topic name
+ */
+
+class IndexedDmaapTopicSourceFactory implements DmaapTopicSourceFactory {
+	/**
+	 * Logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(IndexedDmaapTopicSourceFactory.class);	
+	
+	/**
+	 * DMaaP Topic Name Index
+	 */
+	protected HashMap<String, DmaapTopicSource> dmaapTopicSources =
+			new HashMap<String, DmaapTopicSource>();
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret, 
+								String userName, 
+								String password,
+								String consumerGroup, 
+								String consumerInstance,
+								int fetchTimeout,
+								int fetchLimit,
+								String environment,
+								String aftEnvironment,
+								String partner,
+								String latitude,
+								String longitude,
+								Map<String,String> additionalProps,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts) 
+			throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (dmaapTopicSources.containsKey(topic)) {
+				return dmaapTopicSources.get(topic);
+			}
+			
+			DmaapTopicSource dmaapTopicSource = 
+					new SingleThreadedDmaapTopicSource(servers, topic, 
+													 apiKey, apiSecret, userName, password,
+													 consumerGroup, consumerInstance, 
+													 fetchTimeout, fetchLimit,
+													 environment, aftEnvironment, partner,
+													 latitude, longitude, additionalProps, useHttps, allowSelfSignedCerts);
+			
+			if (managed)
+				dmaapTopicSources.put(topic, dmaapTopicSource);
+			
+			return dmaapTopicSource;
+		}
+	}
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret, 
+								String userName, 
+								String password,
+								String consumerGroup, 
+								String consumerInstance,
+								int fetchTimeout,
+								int fetchLimit,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts) 
+			throws IllegalArgumentException {
+		
+		if (servers == null || servers.isEmpty()) {
+			throw new IllegalArgumentException("DMaaP Server(s) must be provided");
+		}
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (dmaapTopicSources.containsKey(topic)) {
+				return dmaapTopicSources.get(topic);
+			}
+			
+			DmaapTopicSource dmaapTopicSource = 
+					new SingleThreadedDmaapTopicSource(servers, topic, 
+													 apiKey, apiSecret, userName, password,
+													 consumerGroup, consumerInstance, 
+													 fetchTimeout, fetchLimit, useHttps,allowSelfSignedCerts);
+			
+			if (managed)
+				dmaapTopicSources.put(topic, dmaapTopicSource);
+			
+			return dmaapTopicSource;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DmaapTopicSource> build(Properties properties) 
+			throws IllegalArgumentException {
+		
+		String readTopics = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS);
+		if (readTopics == null || readTopics.isEmpty()) {
+			logger.info("{}: no topic for DMaaP Source", this);
+			return new ArrayList<DmaapTopicSource>();
+		}
+		List<String> readTopicList = new ArrayList<String>(Arrays.asList(readTopics.split("\\s*,\\s*")));		
+		
+		List<DmaapTopicSource> dmaapTopicSource_s = new ArrayList<DmaapTopicSource>();
+		synchronized(this) {
+			for (String topic: readTopicList) {
+				if (this.dmaapTopicSources.containsKey(topic)) {
+					dmaapTopicSource_s.add(this.dmaapTopicSources.get(topic));
+					continue;
+				}
+				
+				String servers = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + 
+                                                        topic + 
+                                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
+				
+				List<String> serverList;
+				if (servers != null && !servers.isEmpty()) serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
+				else serverList = new ArrayList<>();
+				
+				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+                        							   "." + topic + 
+                                                       PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);
+				
+				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+						                                  "." + topic + 
+                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);
+				
+				String aafMechId = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+								                          "." + topic + 
+								                          PolicyProperties.PROPERTY_TOPIC_AAF_MECHID_SUFFIX);
+
+				String aafPassword = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+				                           				  "." + topic + 
+				                           				  PolicyProperties.PROPERTY_TOPIC_AAF_PASSWORD_SUFFIX);
+				
+				String consumerGroup = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+						                                      "." + topic + 
+                                                              PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX);
+				
+				String consumerInstance = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+						                                         "." + topic + 
+                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX);
+				
+				String fetchTimeoutString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+						                                           "." + topic + 
+                                                                   PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
+				
+				/* DME2 Properties */
+				
+				String dme2Environment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX);
+
+				String dme2AftEnvironment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX);
+
+				String dme2Partner = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX);
+				
+				String dme2RouteOffer = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX);
+
+				String dme2Latitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX);
+
+				String dme2Longitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX);
+
+				String dme2EpReadTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX);
+
+				String dme2EpConnTimeout = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX);
+
+				String dme2RoundtripTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS
+						+ "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUNDTRIP_TIMEOUT_MS_SUFFIX);
+
+				String dme2Version = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
+						+ PolicyProperties.PROPERTY_DMAAP_DME2_VERSION_SUFFIX);
+
+				String dme2SubContextPath = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
+						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_SUB_CONTEXT_PATH_SUFFIX);
+
+				String dme2SessionStickinessRequired = properties
+						.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
+								+ PolicyProperties.PROPERTY_DMAAP_DME2_SESSION_STICKINESS_REQUIRED_SUFFIX);
+				
+				Map<String,String> dme2AdditionalProps = new HashMap<>();
+				
+				if (dme2EpReadTimeoutMs != null && !dme2EpReadTimeoutMs.isEmpty())
+					dme2AdditionalProps.put(DME2_READ_TIMEOUT_PROPERTY, dme2EpReadTimeoutMs);
+				if (dme2EpConnTimeout != null && !dme2EpConnTimeout.isEmpty())
+					dme2AdditionalProps.put(DME2_EP_CONN_TIMEOUT_PROPERTY, dme2EpConnTimeout);
+				if (dme2RoundtripTimeoutMs != null && !dme2RoundtripTimeoutMs.isEmpty())
+					dme2AdditionalProps.put(DME2_ROUNDTRIP_TIMEOUT_PROPERTY, dme2RoundtripTimeoutMs);
+				if (dme2Version != null && !dme2Version.isEmpty())
+					dme2AdditionalProps.put(DME2_VERSION_PROPERTY, dme2Version);
+				if (dme2RouteOffer != null && !dme2RouteOffer.isEmpty())
+					dme2AdditionalProps.put(DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
+				if (dme2SubContextPath != null && !dme2SubContextPath.isEmpty())
+					dme2AdditionalProps.put(DME2_SUBCONTEXT_PATH_PROPERTY, dme2SubContextPath);
+				if (dme2SessionStickinessRequired != null && !dme2SessionStickinessRequired.isEmpty())
+					dme2AdditionalProps.put(DME2_SESSION_STICKINESS_REQUIRED_PROPERTY, dme2SessionStickinessRequired);
+				
+				
+				if (servers == null || servers.isEmpty()) {
+
+					logger.error("{}: no DMaaP servers or DME2 ServiceName provided", this);
+					continue;
+				}
+				
+				int fetchTimeout = DmaapTopicSource.DEFAULT_TIMEOUT_MS_FETCH;
+				if (fetchTimeoutString != null && !fetchTimeoutString.isEmpty()) {
+					try {
+						fetchTimeout = Integer.parseInt(fetchTimeoutString);
+					} catch (NumberFormatException nfe) {
+						logger.warn("{}: fetch timeout {} is in invalid format for topic {} ", 
+								    this, fetchTimeoutString, topic);
+					}
+				}
+					
+				String fetchLimitString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+                                                                 "." + topic + 
+                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
+				int fetchLimit = DmaapTopicSource.DEFAULT_LIMIT_FETCH;
+				if (fetchLimitString != null && !fetchLimitString.isEmpty()) {
+					try {
+						fetchLimit = Integer.parseInt(fetchLimitString);
+					} catch (NumberFormatException nfe) {
+						logger.warn("{}: fetch limit {} is in invalid format for topic {} ", 
+							        this, fetchLimitString, topic);
+					}
+				}
+				
+				String managedString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
+                                                               "." + topic + 
+                                                              PolicyProperties.PROPERTY_MANAGED_SUFFIX);
+				boolean managed = true;
+				if (managedString != null && !managedString.isEmpty()) {
+					managed = Boolean.parseBoolean(managedString);
+				}
+				
+				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
+
+					//default is to use HTTP if no https property exists
+				boolean useHttps = false;
+				if (useHttpsString != null && !useHttpsString.isEmpty()){
+					useHttps = Boolean.parseBoolean(useHttpsString);
+				}
+				
+				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
+
+					//default is to disallow self-signed certs 
+				boolean allowSelfSignedCerts = false;
+				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
+					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
+				}				
+				
+				
+				DmaapTopicSource uebTopicSource = this.build(serverList, topic, 
+						   						           apiKey, apiSecret, aafMechId, aafPassword,
+						   						           consumerGroup, consumerInstance, 
+						   						           fetchTimeout, fetchLimit, 
+						   						           dme2Environment, dme2AftEnvironment, dme2Partner,
+						   						           dme2Latitude, dme2Longitude, dme2AdditionalProps,
+						   						           managed, useHttps, allowSelfSignedCerts);
+				
+				dmaapTopicSource_s.add(uebTopicSource);
+			}
+		}
+		return dmaapTopicSource_s;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 * @throws IllegalArgumentException 
+	 */
+	@Override
+	public DmaapTopicSource build(List<String> servers, 
+								String topic,
+								String apiKey, 
+								String apiSecret) throws IllegalArgumentException {
+		return this.build(servers, topic, 
+				  		  apiKey, apiSecret, null, null,
+				  		  null, null,
+				  		  DmaapTopicSource.DEFAULT_TIMEOUT_MS_FETCH,
+				  		  DmaapTopicSource.DEFAULT_LIMIT_FETCH,
+				  		  true,
+				  		  false,
+				  		  false);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @throws IllegalArgumentException 
+	 */
+	@Override
+	public DmaapTopicSource build(List<String> servers, String topic) throws IllegalArgumentException {
+		return this.build(servers, topic, null, null);
+	}	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(String topic) 
+		   throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		DmaapTopicSource uebTopicSource;
+		
+		synchronized(this) {
+			if (!dmaapTopicSources.containsKey(topic)) {
+				return;
+			}
+			
+			uebTopicSource = dmaapTopicSources.remove(topic);
+		}
+		
+		uebTopicSource.shutdown();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DmaapTopicSource get(String topic) 
+	       throws IllegalArgumentException, IllegalStateException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (dmaapTopicSources.containsKey(topic)) {
+				return dmaapTopicSources.get(topic);
+			} else {
+				throw new IllegalArgumentException("DmaapTopiceSource for " + topic + " not found");
+			}
+		}
+	}
+
+	@Override
+	public synchronized List<DmaapTopicSource> inventory() {
+		 List<DmaapTopicSource> readers = 
+				 new ArrayList<DmaapTopicSource>(this.dmaapTopicSources.values());
+		 return readers;
+	}
+
+	@Override
+	public void destroy() {
+		List<DmaapTopicSource> readers = this.inventory();
+		for (DmaapTopicSource reader: readers) {
+			reader.shutdown();
+		}
+		
+		synchronized(this) {
+			this.dmaapTopicSources.clear();
+		}
+	}
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("IndexedDmaapTopicSourceFactory []");
+		return builder.toString();
+	}
+	
+}
+
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java
new file mode 100644
index 00000000..4880525f
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSink.java
@@ -0,0 +1,126 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.event.comm.bus;
+
+import java.util.List;
+
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.bus.internal.TopicBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * NOOP topic sink 
+ */
+public class NoopTopicSink extends TopicBase implements TopicSink {
+	
+	/**
+	 * factory
+	 */
+	public static final NoopTopicSinkFactory factory = new IndexedNoopTopicSinkFactory();
+
+	/**
+	 * logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(NoopTopicSink.class);
+	
+	/**
+	 * net logger
+	 */
+	private static final Logger netLogger = LoggerFactory.getLogger(NETWORK_LOGGER);
+	
+	/**
+	 * constructor
+	 * @param servers  servers
+	 * @param topic topic
+	 * @throws IllegalArgumentException if an invalid argument has been passed in
+	 */
+	public NoopTopicSink(List<String> servers, String topic) throws IllegalArgumentException {
+		super(servers, topic);
+	}
+
+	@Override
+	public boolean send(String message) throws IllegalArgumentException, IllegalStateException {
+		
+		if (message == null || message.isEmpty())
+			throw new IllegalArgumentException("Message to send is empty");
+
+		if (!this.alive)
+			throw new IllegalStateException(this + " is stopped");
+		
+		try {
+			synchronized (this) {
+				this.recentEvents.add(message);
+			}
+			
+			netLogger.info("[OUT|{}|{}]{}{}", this.getTopicCommInfrastructure(), 
+			               this.topic, System.lineSeparator(), message);
+			
+			broadcast(message);
+		} catch (Exception e) {
+			logger.warn("{}: cannot send because of {}", this, e.getMessage(), e);
+			return false;
+		}
+		
+		return true;
+	}
+
+	@Override
+	public CommInfrastructure getTopicCommInfrastructure() {
+		return CommInfrastructure.NOOP;
+	}
+
+	@Override
+	public boolean start() throws IllegalStateException {
+		logger.info("{}: starting", this);
+		
+		synchronized(this) {
+			
+			if (this.alive)
+				return true;
+			
+			if (locked)
+				throw new IllegalStateException(this + " is locked.");
+			
+			this.alive = true;
+		}
+				
+		return true;
+	}
+
+	@Override
+	public boolean stop() throws IllegalStateException {
+		synchronized(this) {
+			this.alive = false;
+		}
+		return true;
+	}
+
+	@Override
+	public void shutdown() throws IllegalStateException {
+		this.stop();
+	}
+
+	@Override
+	public String toString() {
+		return "NoopTopicSink [toString()=" + super.toString() + "]";
+	}
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
new file mode 100644
index 00000000..7a428dcd
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
@@ -0,0 +1,226 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.event.comm.bus;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Noop Topic Sink Factory
+ */
+public interface NoopTopicSinkFactory {
+	
+	/**
+	 * Creates noop topic sinks based on properties files
+	 * 
+	 * @param properties Properties containing initialization values
+	 * 
+	 * @return a noop topic sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<NoopTopicSink> build(Properties properties) 
+			throws IllegalArgumentException;
+
+	/**
+	 * builds a noop sink
+	 *  
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param managed is this sink endpoint managed?
+	 * @return a noop topic sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public NoopTopicSink build(List<String> servers, String topic, boolean managed) 
+			throws IllegalArgumentException;
+	
+	/**
+	 * Destroys a sink based on the topic
+	 * 
+	 * @param topic topic name
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public void destroy(String topic);
+
+	/**
+	 * gets a sink based on topic name
+	 * @param topic the topic name
+	 * 
+	 * @return a sink with topic name
+	 * @throws IllegalArgumentException if an invalid topic is provided
+	 * @throws IllegalStateException if the sink is in an incorrect state
+	 */
+	public NoopTopicSink get(String topic)
+			   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Provides a snapshot of the UEB Topic Writers
+	 * @return a list of the UEB Topic Writers
+	 */
+	public List<NoopTopicSink> inventory();
+
+	/**
+	 * Destroys all sinks
+	 */
+	public void destroy();
+}
+
+/* ------------- implementation ----------------- */
+
+/**
+ * Factory of noop sinks
+ */
+class IndexedNoopTopicSinkFactory implements NoopTopicSinkFactory {
+	/**
+	 * Logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSinkFactory.class);	
+	
+	/**
+	 * noop topic sinks map
+	 */
+	protected HashMap<String, NoopTopicSink> noopTopicSinks = new HashMap<String, NoopTopicSink>();
+
+	@Override
+	public List<NoopTopicSink> build(Properties properties) throws IllegalArgumentException {
+		
+		String sinkTopics = properties.getProperty(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS);
+		if (sinkTopics == null || sinkTopics.isEmpty()) {
+			logger.info("{}: no topic for noop sink", this);
+			return new ArrayList<NoopTopicSink>();
+		}
+		
+		List<String> sinkTopicList = new ArrayList<String>(Arrays.asList(sinkTopics.split("\\s*,\\s*")));
+		List<NoopTopicSink> newSinks = new ArrayList<NoopTopicSink>();
+		synchronized(this) {
+			for (String topic: sinkTopicList) {
+				if (this.noopTopicSinks.containsKey(topic)) {
+					newSinks.add(this.noopTopicSinks.get(topic));
+					continue;
+				}
+				
+				String servers = properties.getProperty(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS + "." + 
+				                                        topic + 
+				                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
+				
+				if (servers == null || servers.isEmpty()) 
+					servers = "noop";
+				
+				List<String> serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
+				
+				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + topic +
+						                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
+				boolean managed = true;
+				if (managedString != null && !managedString.isEmpty()) {
+					managed = Boolean.parseBoolean(managedString);
+				}			
+				
+				NoopTopicSink noopSink = this.build(serverList, topic, managed);
+				newSinks.add(noopSink);
+			}
+			return newSinks;
+		}
+	}
+
+	@Override
+	public NoopTopicSink build(List<String> servers, String topic, boolean managed) throws IllegalArgumentException {
+		if (servers == null) {
+			servers = new ArrayList<>();
+		}
+		
+		if (servers.isEmpty()) {
+			servers.add("noop");
+		}
+
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized (this) {
+			if (noopTopicSinks.containsKey(topic)) {
+				return noopTopicSinks.get(topic);
+			}
+			
+			NoopTopicSink sink = 
+					new NoopTopicSink(servers, topic);
+			
+			if (managed)
+				noopTopicSinks.put(topic, sink);
+			
+			return sink;
+		}
+	}
+
+	@Override
+	public void destroy(String topic) {		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		NoopTopicSink noopSink;
+		synchronized(this) {
+			if (!noopTopicSinks.containsKey(topic)) {
+				return;
+			}
+			
+			noopSink = noopTopicSinks.remove(topic);
+		}
+		
+		noopSink.shutdown();
+	}
+	
+	@Override
+	public void destroy() {
+		List<NoopTopicSink> sinks = this.inventory();
+		for (NoopTopicSink sink: sinks) {
+			sink.shutdown();
+		}
+		
+		synchronized(this) {
+			this.noopTopicSinks.clear();
+		}
+	}
+
+	@Override
+	public NoopTopicSink get(String topic) throws IllegalArgumentException, IllegalStateException {
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (noopTopicSinks.containsKey(topic)) {
+				return noopTopicSinks.get(topic);
+			} else {
+				throw new IllegalStateException("DmaapTopicSink for " + topic + " not found");
+			}
+		}
+	}
+
+	@Override
+	public List<NoopTopicSink> inventory() {
+		 return new ArrayList<>(this.noopTopicSinks.values());
+	}
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java
new file mode 100644
index 00000000..57dd1f1a
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSink.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+/**
+ * Topic Writer over UEB Infrastructure
+ */
+public interface UebTopicSink extends BusTopicSink {
+	
+	/**
+	 * Factory of UEB Topic Sinks for instantiation and management purposes
+	 */
+	public static final UebTopicSinkFactory factory = new IndexedUebTopicSinkFactory();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java
new file mode 100644
index 00000000..50718097
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSinkFactory.java
@@ -0,0 +1,334 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.event.comm.bus.internal.InlineUebTopicSink;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.properties.PolicyProperties;
+
+/**
+ * UEB Topic Sink Factory
+ */
+public interface UebTopicSinkFactory {
+	
+	/**
+	 * Instantiates a new UEB Topic Writer
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param partitionKey Consumer Group
+	 * @param managed is this sink endpoint managed?
+	 * 
+	 * @return an UEB Topic Sink
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSink build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret,
+								String partitionKey,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Creates an UEB Topic Writer based on properties files
+	 * 
+	 * @param properties Properties containing initialization values
+	 * 
+	 * @return an UEB Topic Writer
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<UebTopicSink> build(Properties properties)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new UEB Topic Writer
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * 
+	 * @return an UEB Topic Writer
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSink build(List<String> servers, String topic)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Destroys an UEB Topic Writer based on a topic
+	 * 
+	 * @param topic topic name
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public void destroy(String topic);
+
+	/**
+	 * gets an UEB Topic Writer based on topic name
+	 * @param topic the topic name
+	 * 
+	 * @return an UEB Topic Writer with topic name
+	 * @throws IllegalArgumentException if an invalid topic is provided
+	 * @throws IllegalStateException if the UEB Topic Reader is 
+	 * an incorrect state
+	 */
+	public UebTopicSink get(String topic)
+			   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Provides a snapshot of the UEB Topic Writers
+	 * @return a list of the UEB Topic Writers
+	 */
+	public List<UebTopicSink> inventory();
+
+	/**
+	 * Destroys all UEB Topic Writers
+	 */
+	public void destroy();
+}
+
+/* ------------- implementation ----------------- */
+
+/**
+ * Factory of UEB Reader Topics indexed by topic name
+ */
+class IndexedUebTopicSinkFactory implements UebTopicSinkFactory {
+	/**
+	 * Logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSinkFactory.class);	
+	
+	/**
+	 * UEB Topic Name Index
+	 */
+	protected HashMap<String, UebTopicSink> uebTopicSinks =
+			new HashMap<String, UebTopicSink>();
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSink build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret,
+								String partitionKey,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts) 
+			throws IllegalArgumentException {
+		
+		if (servers == null || servers.isEmpty()) {
+			throw new IllegalArgumentException("UEB Server(s) must be provided");
+		}
+
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized (this) {
+			if (uebTopicSinks.containsKey(topic)) {
+				return uebTopicSinks.get(topic);
+			}
+			
+			UebTopicSink uebTopicWriter = 
+					new InlineUebTopicSink(servers, topic, 
+										   apiKey, apiSecret,partitionKey, useHttps, allowSelfSignedCerts);
+			
+			if (managed)
+				uebTopicSinks.put(topic, uebTopicWriter);
+			
+			return uebTopicWriter;
+		}
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSink build(List<String> servers, String topic) throws IllegalArgumentException {	
+		return this.build(servers, topic, null, null, null, true, false, false);
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<UebTopicSink> build(Properties properties) throws IllegalArgumentException {
+		
+		String writeTopics = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS);
+		if (writeTopics == null || writeTopics.isEmpty()) {
+			logger.info("{}: no topic for UEB Sink", this);
+			return new ArrayList<UebTopicSink>();
+		}
+		
+		List<String> writeTopicList = new ArrayList<String>(Arrays.asList(writeTopics.split("\\s*,\\s*")));
+		List<UebTopicSink> newUebTopicSinks = new ArrayList<UebTopicSink>();
+		synchronized(this) {
+			for (String topic: writeTopicList) {
+				if (this.uebTopicSinks.containsKey(topic)) {
+					newUebTopicSinks.add(this.uebTopicSinks.get(topic));
+					continue;
+				}
+				
+				String servers = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + 
+				                                        topic + 
+				                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
+				if (servers == null || servers.isEmpty()) {
+					logger.error("{}: no UEB servers configured for sink {}", this, topic);
+					continue;
+				}
+				
+				List<String> serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
+				
+				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + 
+						                               "." + topic + 
+						                               PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);		 
+				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + 
+                                                          "." + topic + 
+                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);	
+				String partitionKey = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + 
+                                                             "." + topic + 
+                                                             PolicyProperties.PROPERTY_TOPIC_SINK_PARTITION_KEY_SUFFIX);
+				
+				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + topic +
+						                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
+				boolean managed = true;
+				if (managedString != null && !managedString.isEmpty()) {
+					managed = Boolean.parseBoolean(managedString);
+				}
+				
+				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
+				
+				//default is to use HTTP if no https property exists
+				boolean useHttps = false;
+				if (useHttpsString != null && !useHttpsString.isEmpty()){
+					useHttps = Boolean.parseBoolean(useHttpsString);
+				}
+				
+				
+				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
+
+					//default is to disallow self-signed certs 
+				boolean allowSelfSignedCerts = false;
+				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
+					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
+				}			
+				
+				UebTopicSink uebTopicWriter = this.build(serverList, topic, 
+						   						         apiKey, apiSecret, 
+						   						         partitionKey, managed, useHttps, allowSelfSignedCerts);
+				newUebTopicSinks.add(uebTopicWriter);
+			}
+			return newUebTopicSinks;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(String topic) 
+		   throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		UebTopicSink uebTopicWriter;
+		synchronized(this) {
+			if (!uebTopicSinks.containsKey(topic)) {
+				return;
+			}
+			
+			uebTopicWriter = uebTopicSinks.remove(topic);
+		}
+		
+		uebTopicWriter.shutdown();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy() {
+		List<UebTopicSink> writers = this.inventory();
+		for (UebTopicSink writer: writers) {
+			writer.shutdown();
+		}
+		
+		synchronized(this) {
+			this.uebTopicSinks.clear();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSink get(String topic) 
+			throws IllegalArgumentException, IllegalStateException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (uebTopicSinks.containsKey(topic)) {
+				return uebTopicSinks.get(topic);
+			} else {
+				throw new IllegalStateException("UebTopicSink for " + topic + " not found");
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized List<UebTopicSink> inventory() {
+		 List<UebTopicSink> writers = 
+				 new ArrayList<UebTopicSink>(this.uebTopicSinks.values());
+		 return writers;
+	}
+
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("IndexedUebTopicSinkFactory []");
+		return builder.toString();
+	}
+	
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java
new file mode 100644
index 00000000..7d35a993
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSource.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+/**
+ * Topic Source for UEB Communication Infrastructure
+ *
+ */
+public interface UebTopicSource extends BusTopicSource {
+	
+	/**
+	 * factory for managing and tracking UEB readers
+	 */
+	public static UebTopicSourceFactory factory = 
+					new IndexedUebTopicSourceFactory();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
new file mode 100644
index 00000000..d84ef355
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/UebTopicSourceFactory.java
@@ -0,0 +1,404 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.event.comm.bus.internal.SingleThreadedUebTopicSource;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.properties.PolicyProperties;
+
+/**
+ * UEB Topic Source Factory
+ */
+public interface UebTopicSourceFactory {
+	
+	/**
+	 * Creates an UEB Topic Source based on properties files
+	 * 
+	 * @param properties Properties containing initialization values
+	 * 
+	 * @return an UEB Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public List<UebTopicSource> build(Properties properties)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new UEB Topic Source
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param consumerGroup Consumer Group
+	 * @param consumerInstance Consumer Instance
+	 * @param fetchTimeout Read Fetch Timeout
+	 * @param fetchLimit Fetch Limit
+	 * @param managed is this source endpoint managed?
+	 * 
+	 * @return an UEB Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret, 
+								String consumerGroup, 
+								String consumerInstance,
+								int fetchTimeout,
+								int fetchLimit,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts)
+			throws IllegalArgumentException;
+	
+	/**
+	 * Instantiates a new UEB Topic Source
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * 
+	 * @return an UEB Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret)
+			throws IllegalArgumentException;
+
+	/**
+	 * Instantiates a new UEB Topic Source
+	 * 
+	 * @param uebTopicSourceType Implementation type
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * 
+	 * @return an UEB Topic Source
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public UebTopicSource build(List<String> servers, 
+								String topic)
+			throws IllegalArgumentException;	
+	
+	/**
+	 * Destroys an UEB Topic Source based on a topic
+	 * 
+	 * @param topic topic name
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public void destroy(String topic);
+	
+	/**
+	 * Destroys all UEB Topic Sources
+	 */
+	public void destroy();
+	
+	/**
+	 * gets an UEB Topic Source based on topic name
+	 * @param topic the topic name
+	 * @return an UEB Topic Source with topic name
+	 * @throws IllegalArgumentException if an invalid topic is provided
+	 * @throws IllegalStateException if the UEB Topic Source is 
+	 * an incorrect state
+	 */
+	public UebTopicSource get(String topic)
+		   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Provides a snapshot of the UEB Topic Sources
+	 * @return a list of the UEB Topic Sources
+	 */
+	public List<UebTopicSource> inventory();
+}
+
+/* ------------- implementation ----------------- */
+
+/**
+ * Factory of UEB Source Topics indexed by topic name
+ */
+class IndexedUebTopicSourceFactory implements UebTopicSourceFactory {
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSourceFactory.class);	
+	
+	/**
+	 * UEB Topic Name Index
+	 */
+	protected HashMap<String, UebTopicSource> uebTopicSources =
+			new HashMap<String, UebTopicSource>();
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSource build(List<String> servers, 
+								String topic, 
+								String apiKey, 
+								String apiSecret, 
+								String consumerGroup, 
+								String consumerInstance,
+								int fetchTimeout,
+								int fetchLimit,
+								boolean managed,
+								boolean useHttps,
+								boolean allowSelfSignedCerts) 
+	throws IllegalArgumentException {
+		if (servers == null || servers.isEmpty()) {
+			throw new IllegalArgumentException("UEB Server(s) must be provided");
+		}
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (uebTopicSources.containsKey(topic)) {
+				return uebTopicSources.get(topic);
+			}
+			
+			UebTopicSource uebTopicSource = 
+					new SingleThreadedUebTopicSource(servers, topic, 
+													 apiKey, apiSecret,
+													 consumerGroup, consumerInstance, 
+													 fetchTimeout, fetchLimit, useHttps, allowSelfSignedCerts);
+			
+			if (managed)
+				uebTopicSources.put(topic, uebTopicSource);
+			
+			return uebTopicSource;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<UebTopicSource> build(Properties properties) 
+			throws IllegalArgumentException {
+		
+		String readTopics = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS);
+		if (readTopics == null || readTopics.isEmpty()) {
+			logger.info("{}: no topic for UEB Source", this);
+			return new ArrayList<UebTopicSource>();
+		}
+		List<String> readTopicList = new ArrayList<String>(Arrays.asList(readTopics.split("\\s*,\\s*")));		
+		
+		List<UebTopicSource> newUebTopicSources = new ArrayList<UebTopicSource>();
+		synchronized(this) {
+			for (String topic: readTopicList) {
+				if (this.uebTopicSources.containsKey(topic)) {
+					newUebTopicSources.add(this.uebTopicSources.get(topic));
+					continue;
+				}
+				
+				String servers = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + 
+                                                        topic + 
+                                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
+				
+				if (servers == null || servers.isEmpty()) {
+					logger.error("{}: no UEB servers configured for sink {}", this, topic);
+					continue;
+				}
+				
+				List<String> serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
+				
+				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
+                        							   "." + topic + 
+                                                       PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);
+				
+				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
+						                                  "." + topic + 
+                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);
+				
+				String consumerGroup = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
+						                                      "." + topic + 
+                                                              PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX);
+				
+				String consumerInstance = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
+						                                         "." + topic + 
+                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX);
+				
+				String fetchTimeoutString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
+						                                           "." + topic + 
+                                                                   PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
+				int fetchTimeout = UebTopicSource.DEFAULT_TIMEOUT_MS_FETCH;
+				if (fetchTimeoutString != null && !fetchTimeoutString.isEmpty()) {
+					try {
+						fetchTimeout = Integer.parseInt(fetchTimeoutString);
+					} catch (NumberFormatException nfe) {
+						logger.warn("{}: fetch timeout {} is in invalid format for topic {} ", 
+							        this, fetchTimeoutString, topic);
+					}
+				}
+					
+				String fetchLimitString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
+                                                                 "." + topic + 
+                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
+				int fetchLimit = UebTopicSource.DEFAULT_LIMIT_FETCH;
+				if (fetchLimitString != null && !fetchLimitString.isEmpty()) {
+					try {
+						fetchLimit = Integer.parseInt(fetchLimitString);
+					} catch (NumberFormatException nfe) {
+						logger.warn("{}: fetch limit {} is in invalid format for topic {} ", 
+						            this, fetchLimitString, topic);
+					}
+				}
+				
+				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." +
+						                                      topic + PolicyProperties.PROPERTY_MANAGED_SUFFIX);
+				boolean managed = true;
+				if (managedString != null && !managedString.isEmpty()) {
+					managed = Boolean.parseBoolean(managedString);
+				}
+			
+				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
+
+					//default is to use HTTP if no https property exists
+				boolean useHttps = false;
+				if (useHttpsString != null && !useHttpsString.isEmpty()){
+					useHttps = Boolean.parseBoolean(useHttpsString);
+				}
+
+				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
+						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
+
+					//default is to disallow self-signed certs 
+				boolean allowSelfSignedCerts = false;
+				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
+					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
+				}
+				
+				UebTopicSource uebTopicSource = this.build(serverList, topic, 
+						   						           apiKey, apiSecret,
+						   						           consumerGroup, consumerInstance, 
+						   						           fetchTimeout, fetchLimit, managed, useHttps, allowSelfSignedCerts);
+				newUebTopicSources.add(uebTopicSource);
+			}
+		}
+		return newUebTopicSources;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSource build(List<String> servers, 
+								String topic,
+								String apiKey, 
+								String apiSecret) {
+		
+		return this.build(servers, topic, 
+				  		  apiKey, apiSecret,
+				  		  null, null,
+				  		  UebTopicSource.DEFAULT_TIMEOUT_MS_FETCH,
+				  		  UebTopicSource.DEFAULT_LIMIT_FETCH, true, false, true);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSource build(List<String> servers, String topic) {
+		return this.build(servers, topic, null, null);
+	}	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(String topic) 
+		   throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		UebTopicSource uebTopicSource;
+		
+		synchronized(this) {
+			if (!uebTopicSources.containsKey(topic)) {
+				return;
+			}
+			
+			uebTopicSource = uebTopicSources.remove(topic);
+		}
+		
+		uebTopicSource.shutdown();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public UebTopicSource get(String topic) 
+	       throws IllegalArgumentException, IllegalStateException {
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A topic must be provided");
+		}
+		
+		synchronized(this) {
+			if (uebTopicSources.containsKey(topic)) {
+				return uebTopicSources.get(topic);
+			} else {
+				throw new IllegalStateException("UebTopiceSource for " + topic + " not found");
+			}
+		}
+	}
+
+	@Override
+	public synchronized List<UebTopicSource> inventory() {
+		 List<UebTopicSource> readers = 
+				 new ArrayList<UebTopicSource>(this.uebTopicSources.values());
+		 return readers;
+	}
+
+	@Override
+	public void destroy() {
+		List<UebTopicSource> readers = this.inventory();
+		for (UebTopicSource reader: readers) {
+			reader.shutdown();
+		}
+		
+		synchronized(this) {
+			this.uebTopicSources.clear();
+		}
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("IndexedUebTopicSourceFactory []");
+		return builder.toString();
+	}
+	
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java
new file mode 100644
index 00000000..0555940e
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusConsumer.java
@@ -0,0 +1,456 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.net.MalformedURLException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.att.nsa.cambria.client.CambriaClientBuilders;
+import com.att.nsa.cambria.client.CambriaConsumer;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.impl.MRConsumerImpl;
+import com.att.nsa.mr.client.response.MRConsumerResponse;
+import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
+
+/**
+ * Wrapper around libraries to consume from message bus
+ *
+ */
+public interface BusConsumer {
+	
+	/**
+	 * fetch messages
+	 * 
+	 * @return list of messages
+	 * @throws Exception when error encountered by underlying libraries
+	 */
+	public Iterable<String> fetch() throws Exception;
+	
+	/**
+	 * close underlying library consumer
+	 */
+	public void close();
+
+	/**
+	 * Cambria based consumer
+	 */
+	public static class CambriaConsumerWrapper implements BusConsumer {
+		
+		/**
+		 * Cambria client
+		 */
+		protected CambriaConsumer consumer;
+		
+		/**
+		 * Cambria Consumer Wrapper
+		 * 
+		 * @param servers messaging bus hosts
+		 * @param topic topic
+		 * @param apiKey API Key
+		 * @param apiSecret API Secret
+		 * @param consumerGroup Consumer Group
+		 * @param consumerInstance Consumer Instance
+		 * @param fetchTimeout Fetch Timeout
+		 * @param fetchLimit Fetch Limit
+		 * @throws GeneralSecurityException 
+		 * @throws MalformedURLException 
+		 */
+		public CambriaConsumerWrapper(List<String> servers, String topic, 
+								  String apiKey, String apiSecret,
+								  String consumerGroup, String consumerInstance,
+								  int fetchTimeout, int fetchLimit, boolean useHttps, boolean useSelfSignedCerts) 
+		       throws IllegalArgumentException {
+			
+			ConsumerBuilder builder = 
+					new CambriaClientBuilders.ConsumerBuilder();
+			
+			
+			if (useHttps){
+				
+				if(useSelfSignedCerts){
+					builder.knownAs(consumerGroup, consumerInstance)
+					.usingHosts(servers)
+					.onTopic(topic)
+					.waitAtServer(fetchTimeout)
+					.receivingAtMost(fetchLimit)
+					.usingHttps()
+					.allowSelfSignedCertificates();
+				}
+				else{
+					builder.knownAs(consumerGroup, consumerInstance)
+					.usingHosts(servers)
+					.onTopic(topic)
+					.waitAtServer(fetchTimeout)
+					.receivingAtMost(fetchLimit)
+					.usingHttps();
+				}
+			}
+			else{
+				builder.knownAs(consumerGroup, consumerInstance)
+			       .usingHosts(servers)
+			       .onTopic(topic)
+			       .waitAtServer(fetchTimeout)
+			       .receivingAtMost(fetchLimit);
+			}
+			
+			if (apiKey != null && !apiKey.isEmpty() &&
+				apiSecret != null && !apiSecret.isEmpty()) {
+				builder.authenticatedBy(apiKey, apiSecret);
+			}
+					
+			try {
+				this.consumer = builder.build();
+			} catch (MalformedURLException | GeneralSecurityException e) {
+				throw new IllegalArgumentException(e);
+			}
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public Iterable<String> fetch() throws Exception {
+			return this.consumer.fetch();
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public void close() {
+			this.consumer.close();
+		}
+		
+		@Override
+		public String toString() {
+			return "CambriaConsumerWrapper []";
+		}
+	}
+	
+	/**
+	 * MR based consumer
+	 */
+	public abstract class DmaapConsumerWrapper implements BusConsumer {	
+		
+		private static Logger logger = LoggerFactory.getLogger(DmaapConsumerWrapper.class);
+		
+		protected int fetchTimeout;
+		protected Object closeCondition = new Object();
+			
+		/**
+		 * MR Consumer
+		 */
+		protected MRConsumerImpl consumer;
+		
+		/**
+		 * MR Consumer Wrapper
+		 * 
+		 * @param servers messaging bus hosts
+		 * @param topic topic
+		 * @param apiKey API Key
+		 * @param apiSecret API Secret
+		 * @param username AAF Login
+		 * @param password AAF Password
+		 * @param consumerGroup Consumer Group
+		 * @param consumerInstance Consumer Instance
+		 * @param fetchTimeout Fetch Timeout
+		 * @param fetchLimit Fetch Limit
+		 * @throws MalformedURLException 
+		 */
+		public DmaapConsumerWrapper(List<String> servers, String topic, 
+								String apiKey, String apiSecret,
+								String username, String password,
+								String consumerGroup, String consumerInstance,
+								int fetchTimeout, int fetchLimit, boolean useHttps)									
+		throws MalformedURLException {
+			
+			this.fetchTimeout = fetchTimeout;
+			
+			if (topic == null || topic.isEmpty()) {
+				throw new IllegalArgumentException("No topic for DMaaP");
+			}
+					
+			this.consumer = new MRConsumerImpl(servers, topic, 
+											   consumerGroup, consumerInstance, 
+											   fetchTimeout, fetchLimit, 
+									           null, apiKey, apiSecret);
+			
+			this.consumer.setUsername(username);
+			this.consumer.setPassword(password);
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public Iterable<String> fetch() throws Exception {
+			MRConsumerResponse response = this.consumer.fetchWithReturnConsumerResponse();
+			if (response == null) {
+				logger.warn("{}: DMaaP NULL response received", this);
+				
+				synchronized (closeCondition) {
+					closeCondition.wait(fetchTimeout);
+				}
+				return new ArrayList<String>();
+			} else {
+				logger.debug("DMaaP consumer received {} : {}" + 
+		                      response.getResponseCode(), 
+					          response.getResponseMessage());
+				
+				if (response.getResponseCode() == null || 
+					!response.getResponseCode().equals("200")) {
+					
+					logger.error("DMaaP consumer received: {} : {}", 
+							     response.getResponseCode(), 
+							     response.getResponseMessage());
+					
+					synchronized (closeCondition) {
+						closeCondition.wait(fetchTimeout);
+					}
+					/* fall through */
+				}
+			}
+			
+			if (response.getActualMessages() == null)
+				return new ArrayList<String>();
+			else
+				return response.getActualMessages();
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public void close() {
+			synchronized (closeCondition) {
+				closeCondition.notifyAll();
+			}
+			
+			this.consumer.close();
+		}
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.
+			append("DmaapConsumerWrapper [").
+			append("consumer.getAuthDate()=").append(consumer.getAuthDate()).
+			append(", consumer.getAuthKey()=").append(consumer.getAuthKey()).
+			append(", consumer.getHost()=").append(consumer.getHost()).
+			append(", consumer.getProtocolFlag()=").append(consumer.getProtocolFlag()).
+			append(", consumer.getUsername()=").append(consumer.getUsername()).
+			append("]");
+			return builder.toString();
+		}
+	}
+
+	/**
+	 * MR based consumer
+	 */
+	public static class DmaapAafConsumerWrapper extends DmaapConsumerWrapper {
+		
+		private static Logger logger = LoggerFactory.getLogger(DmaapAafConsumerWrapper.class);
+		
+		private Properties props;
+		
+		/**
+		 * MR Consumer Wrapper
+		 * 
+		 * @param servers messaging bus hosts
+		 * @param topic topic
+		 * @param apiKey API Key
+		 * @param apiSecret API Secret
+		 * @param aafLogin AAF Login
+		 * @param aafPassword AAF Password
+		 * @param consumerGroup Consumer Group
+		 * @param consumerInstance Consumer Instance
+		 * @param fetchTimeout Fetch Timeout
+		 * @param fetchLimit Fetch Limit
+		 * @throws MalformedURLException 
+		 */
+		public DmaapAafConsumerWrapper(List<String> servers, String topic, 
+									String apiKey, String apiSecret,
+									String aafLogin, String aafPassword,
+									String consumerGroup, String consumerInstance,
+									int fetchTimeout, int fetchLimit, boolean useHttps) throws MalformedURLException {
+			
+			super(servers, topic, apiKey, apiSecret,
+								aafLogin, aafPassword,
+								consumerGroup, consumerInstance,
+								fetchTimeout, fetchLimit, useHttps);
+			
+			// super constructor sets servers = {""} if empty to avoid errors when using DME2
+			if ((servers.size() == 1 && servers.get(0).equals("")) ||
+				(servers == null) || (servers.size() == 0)) {
+				throw new IllegalArgumentException("Must provide at least one host for HTTP AAF");
+			}
+
+			this.consumer.setProtocolFlag(ProtocolTypeConstants.AAF_AUTH.getValue());
+
+			props = new Properties();
+			
+			if(useHttps){
+				props.setProperty("Protocol", "https");
+				this.consumer.setHost(servers.get(0) + ":3905");
+				
+			}
+			else{
+				props.setProperty("Protocol", "http");
+				this.consumer.setHost(servers.get(0) + ":3904");
+			}
+
+			this.consumer.setProps(props);
+			logger.info("{}: CREATION", this);
+		}
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			MRConsumerImpl consumer = (MRConsumerImpl) this.consumer;
+			
+			builder.
+			append("DmaapConsumerWrapper [").
+			append("consumer.getAuthDate()=").append(consumer.getAuthDate()).
+			append(", consumer.getAuthKey()=").append(consumer.getAuthKey()).
+			append(", consumer.getHost()=").append(consumer.getHost()).
+			append(", consumer.getProtocolFlag()=").append(consumer.getProtocolFlag()).
+			append(", consumer.getUsername()=").append(consumer.getUsername()).
+			append("]");
+			return builder.toString();
+		}
+	}
+	
+	public static class DmaapDmeConsumerWrapper extends DmaapConsumerWrapper {
+		
+		private static Logger logger = LoggerFactory.getLogger(DmaapDmeConsumerWrapper.class);
+		
+		private Properties props;
+		
+		public DmaapDmeConsumerWrapper(List<String> servers, String topic, 
+								String apiKey, String apiSecret,
+								String dme2Login, String dme2Password,
+								String consumerGroup, String consumerInstance,
+								int fetchTimeout, int fetchLimit,
+								String environment, String aftEnvironment, String dme2Partner,
+								String latitude, String longitude, Map<String,String> additionalProps, boolean useHttps) throws MalformedURLException {
+			
+			
+			
+			super(servers, topic, apiKey, apiSecret,
+								dme2Login, dme2Password,
+								consumerGroup, consumerInstance,
+								fetchTimeout, fetchLimit, useHttps);
+			
+			
+			String dme2RouteOffer = additionalProps.get(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY);
+			
+			if (environment == null || environment.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
+			} if (aftEnvironment == null || aftEnvironment.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
+			} if (latitude == null || latitude.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX + " property for DME2 in DMaaP");
+			} if (longitude == null || longitude.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX + " property for DME2 in DMaaP");
+			} 
+			
+			if ((dme2Partner == null || dme2Partner.isEmpty()) && (dme2RouteOffer == null || dme2RouteOffer.isEmpty())) {
+				throw new IllegalArgumentException("Must provide at least " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX + " or " + 
+						PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX + " for DME2");
+			}
+			
+			String serviceName = servers.get(0);
+			
+			this.consumer.setProtocolFlag(ProtocolTypeConstants.DME2.getValue());
+			
+			this.consumer.setUsername(dme2Login);
+			this.consumer.setPassword(dme2Password);
+			
+			props = new Properties();
+			
+			props.setProperty(DmaapTopicSinkFactory.DME2_SERVICE_NAME_PROPERTY, serviceName);
+			
+			props.setProperty("username", dme2Login);
+			props.setProperty("password", dme2Password);
+			
+			/* These are required, no defaults */
+			props.setProperty("topic", topic);
+			
+			props.setProperty("Environment", environment);
+			props.setProperty("AFT_ENVIRONMENT", aftEnvironment);
+			
+			if (dme2Partner != null)
+				props.setProperty("Partner", dme2Partner);
+			if (dme2RouteOffer != null)
+				props.setProperty(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
+			
+			props.setProperty("Latitude", latitude);
+			props.setProperty("Longitude", longitude);
+			
+			/* These are optional, will default to these values if not set in additionalProps */
+			props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
+			props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
+			props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", "15000");
+			props.setProperty("Version", "1.0");
+			props.setProperty("SubContextPath", "/");
+			props.setProperty("sessionstickinessrequired", "no");
+			
+			/* These should not change */
+			props.setProperty("TransportType", "DME2");
+			props.setProperty("MethodType", "GET");
+			
+			if(useHttps){
+				props.setProperty("Protocol", "https");
+				
+			}
+			else{
+				props.setProperty("Protocol", "http");
+			}
+			
+			props.setProperty("contenttype", "application/json");
+			
+			if (additionalProps != null) {
+				for(String key : additionalProps.keySet())
+					props.put(key, additionalProps.get(key));
+			}
+			
+			MRClientFactory.prop = props;
+			this.consumer.setProps(props);
+			
+			logger.info("{}: CREATION", this);
+		}
+	}
+}
+
+
+
+
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
new file mode 100644
index 00000000..46d6b60f
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
@@ -0,0 +1,390 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.net.MalformedURLException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.att.nsa.cambria.client.CambriaBatchingPublisher;
+import com.att.nsa.cambria.client.CambriaClientBuilders;
+import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
+import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
+import com.att.nsa.mr.client.response.MRPublisherResponse;
+import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public interface BusPublisher {
+	
+	/**
+	 * sends a message
+	 * 
+	 * @param partition id
+	 * @param message the message
+	 * @return true if success, false otherwise
+	 * @throws IllegalArgumentException if no message provided
+	 */
+	public boolean send(String partitionId, String message) throws IllegalArgumentException;
+	
+	/**
+	 * closes the publisher
+	 */
+	public void close();
+	
+	/**
+	 * Cambria based library publisher
+	 */
+	public static class CambriaPublisherWrapper implements BusPublisher {
+		
+		private static Logger logger = LoggerFactory.getLogger(CambriaPublisherWrapper.class);
+
+		/**
+		 * The actual Cambria publisher
+		 */
+		@JsonIgnore
+		protected volatile CambriaBatchingPublisher publisher;
+		
+		public CambriaPublisherWrapper(List<String> servers, String topic,
+						               String apiKey,
+						               String apiSecret, boolean useHttps) throws IllegalArgumentException {
+			PublisherBuilder builder = new CambriaClientBuilders.PublisherBuilder();
+		
+
+			if (useHttps){
+				
+				builder.usingHosts(servers)
+			       .onTopic(topic)
+			       .usingHttps();
+			}
+			else{
+				builder.usingHosts(servers)
+			       .onTopic(topic);
+			}
+		
+			
+			if (apiKey != null && !apiKey.isEmpty() &&
+				apiSecret != null && !apiSecret.isEmpty()) {
+				builder.authenticatedBy(apiKey, apiSecret);
+			}
+			
+			try {
+				this.publisher = builder.build();
+			} catch (MalformedURLException | GeneralSecurityException e) {
+				throw new IllegalArgumentException(e);
+			}
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public boolean send(String partitionId, String message) 
+				throws IllegalArgumentException {
+			if (message == null)
+				throw new IllegalArgumentException("No message provided");
+			
+			try {
+				this.publisher.send(partitionId, message);
+			} catch (Exception e) {
+				logger.warn("{}: SEND of {} cannot be performed because of {}",
+						    this, message, e.getMessage(), e);
+				return false;
+			}
+			return true;			
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void close() {
+			logger.info("{}: CLOSE", this);
+			
+			try {
+				this.publisher.close();
+			} catch (Exception e) {
+				logger.warn("{}: CLOSE FAILED because of {}", 
+						    this, e.getMessage(),e);
+			}
+		}
+		
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("CambriaPublisherWrapper [").
+			append("publisher.getPendingMessageCount()=").
+			append(publisher.getPendingMessageCount()).
+			append("]");
+			return builder.toString();
+		}
+		
+	}
+	
+	/**
+	 * DmaapClient library wrapper
+	 */
+	public abstract class DmaapPublisherWrapper implements BusPublisher {
+		
+		private static Logger logger = LoggerFactory.getLogger(DmaapPublisherWrapper.class);
+		
+		/**
+		 * MR based Publisher
+		 */		
+		protected MRSimplerBatchPublisher publisher;
+		protected Properties props;
+		
+		/**
+		 * MR Publisher Wrapper
+		 *
+		 * @param servers messaging bus hosts
+		 * @param topic topic
+		 * @param username AAF or DME2 Login
+		 * @param password AAF or DME2 Password
+		 */
+		public DmaapPublisherWrapper(ProtocolTypeConstants protocol,
+									 List<String> servers, String topic,
+				                     String username,
+				                     String password, boolean useHttps) throws IllegalArgumentException {
+
+			
+			if (topic == null || topic.isEmpty())
+				throw new IllegalArgumentException("No topic for DMaaP");
+
+			
+			if (protocol == ProtocolTypeConstants.AAF_AUTH) {
+				if (servers == null || servers.isEmpty())
+					throw new IllegalArgumentException("No DMaaP servers or DME2 partner provided");
+				
+				ArrayList<String> dmaapServers = new ArrayList<String>();
+				if(useHttps){
+					for (String server: servers) {
+						dmaapServers.add(server + ":3905");
+					}
+				
+				}
+				else{
+					for (String server: servers) {
+						dmaapServers.add(server + ":3904");
+					}				
+				}
+				
+										
+				this.publisher = 
+					new MRSimplerBatchPublisher.Builder().
+												againstUrls(dmaapServers).
+												onTopic(topic).
+												build();
+				
+				this.publisher.setProtocolFlag(ProtocolTypeConstants.AAF_AUTH.getValue());
+			} else if (protocol == ProtocolTypeConstants.DME2) {
+				ArrayList<String> dmaapServers = new ArrayList<String>();
+				dmaapServers.add("0.0.0.0:3904");
+						
+				this.publisher = 
+					new MRSimplerBatchPublisher.Builder().
+												againstUrls(dmaapServers).
+												onTopic(topic).
+												build();
+				
+				this.publisher.setProtocolFlag(ProtocolTypeConstants.DME2.getValue());
+			}
+			
+			this.publisher.logTo(LoggerFactory.getLogger(MRSimplerBatchPublisher.class.getName()));
+			
+			this.publisher.setUsername(username);
+			this.publisher.setPassword(password);  
+			
+			props = new Properties();
+						
+			if (useHttps) {				
+				props.setProperty("Protocol", "https");
+			} else {			
+				props.setProperty("Protocol", "http");
+			}
+
+			props.setProperty("contenttype", "application/json");
+			props.setProperty("username", username);
+			props.setProperty("password", password);
+			
+			props.setProperty("topic", topic);
+			
+			this.publisher.setProps(props);
+			
+			if (protocol == ProtocolTypeConstants.AAF_AUTH)
+				this.publisher.setHost(servers.get(0));
+			
+			logger.info("{}: CREATION: using protocol {}", this, protocol.getValue());
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public void close() {
+			logger.info("{}: CLOSE", this);
+			
+			try {
+				this.publisher.close(1, TimeUnit.SECONDS);
+			} catch (Exception e) {
+				logger.warn("{}: CLOSE FAILED because of {}",
+						    this, e.getMessage(), e);
+			}
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public boolean send(String partitionId, String message) 
+				throws IllegalArgumentException {
+			if (message == null)
+				throw new IllegalArgumentException("No message provided");
+			
+			this.publisher.setPubResponse(new MRPublisherResponse());
+			this.publisher.send(partitionId, message);
+			MRPublisherResponse response = this.publisher.sendBatchWithResponse();
+			if (response != null) {
+				logger.debug("DMaaP publisher received {} : {}",
+						     response.getResponseCode(), 
+						     response.getResponseMessage());
+			}
+
+			return true;
+		}
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("DmaapPublisherWrapper [").
+			append("publisher.getAuthDate()=").append(publisher.getAuthDate()).
+			append(", publisher.getAuthKey()=").append(publisher.getAuthKey()).
+			append(", publisher.getHost()=").append(publisher.getHost()).
+			append(", publisher.getProtocolFlag()=").append(publisher.getProtocolFlag()).
+			append(", publisher.getUsername()=").append(publisher.getUsername()).
+			append(", publisher.getPendingMessageCount()=").append(publisher.getPendingMessageCount()).
+			append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * DmaapClient library wrapper
+	 */
+	public static class DmaapAafPublisherWrapper extends DmaapPublisherWrapper {
+		/**
+		 * MR based Publisher
+		 */		
+		protected MRSimplerBatchPublisher publisher;
+		
+		public DmaapAafPublisherWrapper(List<String> servers, String topic,
+				                     String aafLogin,
+				                     String aafPassword, boolean useHttps) {
+			
+			super(ProtocolTypeConstants.AAF_AUTH, servers, topic, aafLogin, aafPassword, useHttps);
+		}
+	}
+	
+	public static class DmaapDmePublisherWrapper extends DmaapPublisherWrapper {
+		public DmaapDmePublisherWrapper(List<String> servers, String topic,
+										String username, String password,
+										String environment, String aftEnvironment, String dme2Partner,
+										String latitude, String longitude, Map<String,String> additionalProps, boolean useHttps) {
+			
+			super(ProtocolTypeConstants.DME2, servers, topic, username, password, useHttps);
+			
+			
+			
+			
+			
+			
+			String dme2RouteOffer = additionalProps.get(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY);
+			
+			 if (environment == null || environment.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
+			} if (aftEnvironment == null || aftEnvironment.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
+			} if (latitude == null || latitude.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX + " property for DME2 in DMaaP");
+			} if (longitude == null || longitude.isEmpty()) {
+				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX + " property for DME2 in DMaaP");
+			}
+			
+			if ((dme2Partner == null || dme2Partner.isEmpty()) && (dme2RouteOffer == null || dme2RouteOffer.isEmpty())) {
+				throw new IllegalArgumentException("Must provide at least " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
+						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX + " or " + 
+						PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX + " for DME2");
+			}
+			
+			String serviceName = servers.get(0);
+			
+			/* These are required, no defaults */
+			props.setProperty("Environment", environment);
+			props.setProperty("AFT_ENVIRONMENT", aftEnvironment);
+			
+			props.setProperty(DmaapTopicSinkFactory.DME2_SERVICE_NAME_PROPERTY, serviceName);
+
+			if (dme2Partner != null)
+				props.setProperty("Partner", dme2Partner);
+			if (dme2RouteOffer != null)
+				props.setProperty(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
+			
+			props.setProperty("Latitude", latitude);
+			props.setProperty("Longitude", longitude);
+			
+			// ServiceName also a default, found in additionalProps
+			
+			/* These are optional, will default to these values if not set in optionalProps */
+			props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
+			props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
+			props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", "15000");
+			props.setProperty("Version", "1.0");
+			props.setProperty("SubContextPath", "/");
+			props.setProperty("sessionstickinessrequired", "no");
+			
+			/* These should not change */
+			props.setProperty("TransportType", "DME2");
+			props.setProperty("MethodType", "POST");
+			
+			for (String key : additionalProps.keySet()) {
+				String value = additionalProps.get(key);
+				
+				if (value != null)
+					props.setProperty(key, value);
+			}
+			
+			this.publisher.setProps(props);
+		}
+	}
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java
new file mode 100644
index 00000000..f145f3b8
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusTopicBase.java
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.List;
+
+import org.onap.policy.drools.event.comm.bus.ApiKeyEnabled;
+
+/**
+ * Bus Topic Base
+ */
+public abstract class BusTopicBase extends TopicBase implements ApiKeyEnabled {
+	
+	/**
+	 * API Key
+	 */
+	protected String apiKey;
+	
+	/**
+	 * API Secret
+	 */
+	protected String apiSecret;
+	
+	/**
+	 * Use https
+	 */
+	protected boolean useHttps;
+	
+	/**
+	 * allow self signed certificates
+	 */
+	protected boolean allowSelfSignedCerts;
+	
+	/**
+	 * Instantiates a new Bus Topic Base
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 * @param apiKey API Key
+	 * @param apiSecret API Secret
+	 * @param useHttps does connection use HTTPS?
+	 * @param allowSelfSignedCerts are self-signed certificates allow
+	 *  
+	 * @return a Bus Topic Base
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public BusTopicBase(List<String> servers, 
+						  String topic, 
+						  String apiKey, 
+						  String apiSecret,
+						  boolean useHttps,
+						  boolean allowSelfSignedCerts) 
+	throws IllegalArgumentException {
+		
+		super(servers, topic);
+		
+		this.apiKey = apiKey;
+		this.apiSecret = apiSecret;
+		this.useHttps = useHttps;
+		this.allowSelfSignedCerts = allowSelfSignedCerts;
+	}
+	
+	@Override
+	public String getApiKey() {
+		return apiKey;
+	}
+
+	@Override
+	public String getApiSecret() {
+		return apiSecret;
+	}
+	
+	/**
+	 * @return if using https
+	 */
+	public boolean isUseHttps(){
+		return useHttps;
+	}
+
+	/**
+	 * @return if self signed certificates are allowed
+	 */
+	public boolean isAllowSelfSignedCerts(){
+		return allowSelfSignedCerts;
+	}
+
+
+	@Override
+	public String toString() {
+		return "BusTopicBase [apiKey=" + apiKey + ", apiSecret=" + apiSecret + ", useHttps=" + useHttps
+				+ ", allowSelfSignedCerts=" + allowSelfSignedCerts + ", toString()=" + super.toString() + "]";
+	}
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
new file mode 100644
index 00000000..f86c27c7
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
@@ -0,0 +1,196 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.onap.policy.drools.event.comm.bus.BusTopicSink;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ * Transport Agnostic Bus Topic Sink to carry out the core functionality
+ * to interact with a sink regardless if it is UEB or DMaaP.
+ *
+ */
+public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopicSink {
+	
+	/**
+	 * loggers
+	 */
+	private static Logger logger = LoggerFactory.getLogger(InlineBusTopicSink.class);
+	private static final Logger netLogger = LoggerFactory.getLogger(NETWORK_LOGGER);
+	
+	/**
+	 * The partition key to publish to
+	 */
+	protected String partitionId;
+	
+	/**
+	 * message bus publisher
+	 */
+	protected BusPublisher publisher;
+
+	/**
+	 * constructor for abstract sink
+	 * 
+	 * @param servers servers
+	 * @param topic topic
+	 * @param apiKey api secret
+	 * @param apiSecret api secret
+	 * @param partitionId partition id
+	 * @param useHttps does connection use HTTPS?
+	 * @param allowSelfSignedCerts are self-signed certificates allow
+	 * @throws IllegalArgumentException in invalid parameters are passed in
+	 */
+	public InlineBusTopicSink(List<String> servers, String topic, 
+			                  String apiKey, String apiSecret, String partitionId, boolean useHttps, boolean allowSelfSignedCerts)
+			throws IllegalArgumentException {
+		
+		super(servers, topic, apiKey, apiSecret, useHttps, allowSelfSignedCerts);		
+		
+		if (partitionId == null || partitionId.isEmpty()) {
+			this.partitionId = UUID.randomUUID ().toString();
+		}
+	}
+	
+	/**
+	 * Initialize the Bus publisher
+	 */
+	public abstract void init();
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {		
+		logger.info("{}: starting", this);
+		
+		synchronized(this) {
+			
+			if (this.alive)
+				return true;
+			
+			if (locked)
+				throw new IllegalStateException(this + " is locked.");
+			
+			this.alive = true;
+		}
+				
+		this.init();
+		return true;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() {
+		
+		BusPublisher publisherCopy;
+		synchronized(this) {
+			this.alive = false;
+			publisherCopy = this.publisher;
+			this.publisher = null;
+		}
+		
+		if (publisherCopy != null) {
+			try {
+				publisherCopy.close();
+			} catch (Exception e) {
+				logger.warn("{}: cannot stop publisher because of {}", 
+						    this, e.getMessage(), e);
+			}
+		} else {
+			logger.warn("{}: there is no publisher", this);
+			return false;
+		}
+		
+		return true;
+	}	
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean send(String message) throws IllegalArgumentException, IllegalStateException {
+		
+		if (message == null || message.isEmpty()) {
+			throw new IllegalArgumentException("Message to send is empty");
+		}
+
+		if (!this.alive) {
+			throw new IllegalStateException(this + " is stopped");
+		}
+		
+		try {
+			synchronized (this) {
+				this.recentEvents.add(message);
+			}
+			
+			netLogger.info("[OUT|{}|{}]{}{}", this.getTopicCommInfrastructure(), 
+			               this.topic, System.lineSeparator(), message);
+			
+			publisher.send(this.partitionId, message);			
+			broadcast(message);
+		} catch (Exception e) {
+			logger.warn("{}: cannot send because of {}", this, e.getMessage(), e);
+			return false;
+		}
+		
+		return true;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setPartitionKey(String partitionKey) {
+		this.partitionId = partitionKey;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getPartitionKey() {
+		return this.partitionId;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		this.stop();
+	}
+	
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("InlineBusTopicSink [partitionId=").append(partitionId).append(", alive=").append(alive)
+				.append(", publisher=").append(publisher).append("]");
+		return builder.toString();
+	}
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
new file mode 100644
index 00000000..912607fd
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
@@ -0,0 +1,151 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+
+/**
+ * This implementation publishes events for the associated DMAAP topic,
+ * inline with the calling thread.
+ */
+public class InlineDmaapTopicSink extends InlineBusTopicSink implements DmaapTopicSink {
+	
+	protected static Logger logger = 
+			LoggerFactory.getLogger(InlineDmaapTopicSink.class);
+	
+	protected final String userName;
+	protected final String password;
+	
+	protected String environment = null;
+	protected String aftEnvironment = null;
+	protected String partner = null;
+	protected String latitude = null;
+	protected String longitude = null;
+	
+	protected Map<String,String> additionalProps = null;
+	
+	/**
+	 * 
+	 * @param servers DMaaP servers
+	 * @param topic DMaaP Topic to be monitored
+	 * @param apiKey DMaaP API Key (optional)
+	 * @param apiSecret DMaaP API Secret (optional)
+	 * @param consumerGroup DMaaP Reader Consumer Group
+	 * @param consumerInstance DMaaP Reader Instance
+	 * @param fetchTimeout DMaaP fetch timeout
+	 * @param fetchLimit DMaaP fetch limit
+	 * @param environment DME2 Environment
+	 * @param aftEnvironment DME2 AFT Environment
+	 * @param partner DME2 Partner
+	 * @param latitude DME2 Latitude
+	 * @param longitude DME2 Longitude
+	 * @param additionalProps Additional properties to pass to DME2
+	 * @param useHttps does connection use HTTPS?
+	 * @param allowSelfSignedCerts are self-signed certificates allow
+	 * 
+	 * @throws IllegalArgumentException An invalid parameter passed in
+	 */
+	public InlineDmaapTopicSink(List<String> servers, String topic, 
+											String apiKey, String apiSecret,
+											String userName, String password,
+											String partitionKey,
+											String environment, String aftEnvironment, String partner,
+											String latitude, String longitude, Map<String,String> additionalProps,
+											boolean useHttps, boolean allowSelfSignedCerts)
+			throws IllegalArgumentException {
+			
+		super(servers, topic, apiKey, apiSecret, partitionKey, useHttps, allowSelfSignedCerts);
+		
+		this.userName = userName;
+		this.password = password;
+		
+		this.environment = environment;
+		this.aftEnvironment = aftEnvironment;
+		this.partner = partner;
+		
+		this.latitude = latitude;
+		this.longitude = longitude;
+		
+		this.additionalProps = additionalProps;
+	}
+	
+	public InlineDmaapTopicSink(List<String> servers, String topic, 
+			                    String apiKey, String apiSecret,
+	                            String userName, String password,
+			                    String partitionKey, boolean useHttps,  boolean allowSelfSignedCerts) 
+		throws IllegalArgumentException {
+		
+		super(servers, topic, apiKey, apiSecret, partitionKey, useHttps, allowSelfSignedCerts);
+		
+		this.userName = userName;
+		this.password = password;
+	}
+	
+
+	@Override
+	public void init() {
+		if ((this.environment == null	|| this.environment.isEmpty()) &&
+		   (this.aftEnvironment == null || this.aftEnvironment.isEmpty()) &&
+		   (this.latitude == null		|| this.latitude.isEmpty()) &&
+		   (this.longitude == null		|| this.longitude.isEmpty()) &&
+		   (this.partner == null		|| this.partner.isEmpty())) {
+			this.publisher = 
+				new BusPublisher.DmaapAafPublisherWrapper(this.servers, 
+						                               this.topic, 
+						                               this.userName, 
+						                               this.password, this.useHttps);
+		} else {
+			this.publisher = 
+				new BusPublisher.DmaapDmePublisherWrapper(this.servers, this.topic, 
+						                               this.userName, this.password,
+						                               this.environment, this.aftEnvironment,
+						                               this.partner, this.latitude, this.longitude,
+						                               this.additionalProps, this.useHttps);
+		}
+		
+		logger.info("{}: DMAAP SINK created", this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CommInfrastructure getTopicCommInfrastructure() {
+		return Topic.CommInfrastructure.DMAAP;
+	}
+
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("InlineDmaapTopicSink [userName=").append(userName).append(", password=").append(password)
+				.append(", getTopicCommInfrastructure()=").append(getTopicCommInfrastructure()).append(", toString()=")
+				.append(super.toString()).append("]");
+		return builder.toString();
+	}
+
+}
\ No newline at end of file
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
new file mode 100644
index 00000000..0c01c8b5
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.List;
+
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ * This implementation publishes events for the associated UEB topic,
+ * inline with the calling thread.
+ */
+public class InlineUebTopicSink extends InlineBusTopicSink implements UebTopicSink {
+	
+	/**
+	 * logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(InlineUebTopicSink.class);
+	
+	/**
+	 * Argument-based UEB Topic Writer instantiation
+	 * 
+	 * @param servers list of UEB servers available for publishing
+	 * @param topic the topic to publish to
+	 * @param apiKey the api key (optional)
+	 * @param apiSecret the api secret (optional)
+	 * @param partitionId the partition key (optional, autogenerated if not provided)
+	 * @param useHttps does connection use HTTPS?
+	 * @param allowSelfSignedCerts are self-signed certificates allow
+	 * 
+	 * @throws IllegalArgumentException if invalid arguments are detected
+	 */
+	public InlineUebTopicSink(List<String> servers, 
+								String topic, 
+            					String apiKey, 
+            					String apiSecret,
+            					String partitionId,
+            					boolean useHttps,
+            					boolean allowSelfSignedCerts) 
+    throws IllegalArgumentException {		
+		super(servers, topic, apiKey, apiSecret, partitionId, useHttps, allowSelfSignedCerts);
+	}
+	
+	/**
+	 * Instantiation of internal resources
+	 */
+	@Override
+	public void init() {	
+		
+		this.publisher = 
+				new BusPublisher.CambriaPublisherWrapper(this.servers, 
+						                                 this.topic, 
+						                                 this.apiKey, 
+						                                 this.apiSecret,
+						                                 this.useHttps);
+		logger.info("{}: UEB SINK created", this);
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("InlineUebTopicSink [getTopicCommInfrastructure()=").append(getTopicCommInfrastructure())
+				.append(", toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CommInfrastructure getTopicCommInfrastructure() {
+		return Topic.CommInfrastructure.UEB;
+	}
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
new file mode 100644
index 00000000..c3960491
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
@@ -0,0 +1,349 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.bus.BusTopicSource;
+
+/**
+ * This topic source implementation specializes in reading messages
+ * over a bus topic source and notifying its listeners
+ */
+public abstract class SingleThreadedBusTopicSource 
+       extends BusTopicBase
+       implements Runnable, BusTopicSource {
+	   
+	/**
+	 * Not to be converted to PolicyLogger.
+	 * This will contain all instract /out traffic and only that in a single file in a concise format.
+	 */
+	private static Logger logger = LoggerFactory.getLogger(InlineBusTopicSink.class);
+	private static final Logger netLogger = LoggerFactory.getLogger(NETWORK_LOGGER);
+	
+	/**
+	 * Bus consumer group
+	 */
+	protected final String consumerGroup;
+	
+	/**
+	 * Bus consumer instance
+	 */
+	protected final String consumerInstance;
+	
+	/**
+	 * Bus fetch timeout
+	 */
+	protected final int fetchTimeout;
+	
+	/**
+	 * Bus fetch limit
+	 */
+	protected final int fetchLimit;
+	
+	/**
+	 * Message Bus Consumer
+	 */
+	protected BusConsumer consumer;
+	
+	/**
+	 * Am I running?
+	 * reflects invocation of start()/stop() 
+	 * !locked & start() => alive
+	 * stop() => !alive
+	 */
+	protected volatile boolean alive = false;
+	
+	/**
+	 * Independent thread reading message over my topic
+	 */
+	protected Thread busPollerThread;
+	
+	/**
+	 * All my subscribers for new message notifications
+	 */
+	protected final ArrayList<TopicListener> topicListeners = new ArrayList<TopicListener>();
+	
+
+	/**
+	 * 
+	 * @param servers Bus servers
+	 * @param topic Bus Topic to be monitored
+	 * @param apiKey Bus API Key (optional)
+	 * @param apiSecret Bus API Secret (optional)
+	 * @param consumerGroup Bus Reader Consumer Group
+	 * @param consumerInstance Bus Reader Instance
+	 * @param fetchTimeout Bus fetch timeout
+	 * @param fetchLimit Bus fetch limit
+	 * @param useHttps does the bus use https
+	 * @param allowSelfSignedCerts are self-signed certificates allowed
+	 * @throws IllegalArgumentException An invalid parameter passed in
+	 */
+	public SingleThreadedBusTopicSource(List<String> servers, 
+										String topic, 
+			                  			String apiKey, 
+			                  			String apiSecret, 
+			                  			String consumerGroup, 
+			                  			String consumerInstance,
+			                  			int fetchTimeout,
+			                  			int fetchLimit,
+			                  			boolean useHttps,
+			                  			boolean allowSelfSignedCerts) 
+	throws IllegalArgumentException {
+		
+		super(servers, topic, apiKey, apiSecret, useHttps, allowSelfSignedCerts);
+		
+		if (consumerGroup == null || consumerGroup.isEmpty()) {
+			this.consumerGroup = UUID.randomUUID ().toString();
+		} else {
+			this.consumerGroup = consumerGroup;
+		}
+		
+		if (consumerInstance == null || consumerInstance.isEmpty()) {
+			this.consumerInstance = DEFAULT_CONSUMER_INSTANCE;
+		} else {
+			this.consumerInstance = consumerInstance;
+		}
+		
+		if (fetchTimeout <= 0) {
+			this.fetchTimeout = NO_TIMEOUT_MS_FETCH;
+		} else {
+			this.fetchTimeout = fetchTimeout;
+		}
+		
+		if (fetchLimit <= 0) {
+			this.fetchLimit = NO_LIMIT_FETCH;
+		} else {
+			this.fetchLimit = fetchLimit;
+		}
+		
+	}
+	
+	/**
+	 * Initialize the Bus client
+	 */
+	public abstract void init() throws Exception;
+	
+	@Override
+	public void register(TopicListener topicListener) 
+		throws IllegalArgumentException {		
+		
+		super.register(topicListener);
+		
+		try {
+			if (!alive && !locked)
+				this.start();
+			else
+				logger.info("{}: register: start not attempted", this);
+		} catch (Exception e) {
+			logger.warn("{}: cannot start after registration of because of: {}",
+		                this, topicListener, e.getMessage(), e);
+		}
+	}
+
+	@Override
+	public void unregister(TopicListener topicListener) {
+		boolean stop = false;
+		synchronized (this) {
+			super.unregister(topicListener);
+			stop = (this.topicListeners.isEmpty());
+		}
+		
+		if (stop) {		
+			this.stop();
+		}
+	}
+	
+	@Override
+	public boolean start() throws IllegalStateException {		
+		logger.info("{}: starting", this);
+		
+		synchronized(this) {
+			
+			if (alive)
+				return true;
+			
+			if (locked)
+				throw new IllegalStateException(this + " is locked.");
+			
+			if (this.busPollerThread == null || 
+				!this.busPollerThread.isAlive() || 
+				this.consumer == null) {
+				
+				try {
+					this.init();
+					this.alive = true;
+					this.busPollerThread = new Thread(this);
+					this.busPollerThread.setName(this.getTopicCommInfrastructure() + "-source-" + this.getTopic());
+					busPollerThread.start();
+				} catch (Exception e) {
+					logger.warn("{}: cannot start because of {}", this, e.getMessage(), e);
+					throw new IllegalStateException(e);
+				}
+			}
+		}
+		
+		return this.alive;
+	}
+
+	@Override
+	public boolean stop() {
+		logger.info("{}: stopping", this);
+		
+		synchronized(this) {
+			BusConsumer consumerCopy = this.consumer;
+			
+			this.alive = false;
+			this.consumer = null;
+			
+			if (consumerCopy != null) {
+				try {
+					consumerCopy.close();
+				} catch (Exception e) {
+					logger.warn("{}: stop failed because of {}", this, e.getMessage(), e);
+				}
+			}
+		}
+							
+		Thread.yield();
+				
+		return true;
+	}
+	
+	/**
+	 * Run thread method for the Bus Reader
+	 */
+	@Override
+	public void run() {
+		while (this.alive) {
+			try {
+				for (String event: this.consumer.fetch()) {					
+					synchronized (this) {
+						this.recentEvents.add(event);
+					}
+					
+					netLogger.info("[IN|{}|{}]{}{}",
+						           this.getTopicCommInfrastructure(), this.topic, 
+						           System.lineSeparator(), event);
+					
+					broadcast(event);
+					
+					if (!this.alive)
+						break;
+				}
+			} catch (Exception e) {
+				logger.error("{}: cannot fetch because of ", this, e.getMessage(), e);
+			}
+		}
+		
+		logger.info("{}: exiting thread", this);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean offer(String event) {
+		if (!this.alive) {
+			throw new IllegalStateException(this + " is not alive.");
+		}
+		
+		synchronized (this) {
+			this.recentEvents.add(event);
+		}
+		
+		netLogger.info("[IN|{}|{}]{}{}",this.getTopicCommInfrastructure(),this.topic, 
+				       System.lineSeparator(), event);
+		
+		
+		return broadcast(event);
+	}
+	
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("SingleThreadedBusTopicSource [consumerGroup=").append(consumerGroup)
+				.append(", consumerInstance=").append(consumerInstance).append(", fetchTimeout=").append(fetchTimeout)
+				.append(", fetchLimit=").append(fetchLimit)
+				.append(", consumer=").append(this.consumer).append(", alive=")
+				.append(alive).append(", locked=").append(locked).append(", uebThread=").append(busPollerThread)
+				.append(", topicListeners=").append(topicListeners.size()).append(", toString()=").append(super.toString())
+				.append("]");
+		return builder.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isAlive() {
+		return alive;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getConsumerGroup() {
+		return consumerGroup;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getConsumerInstance() {
+		return consumerInstance;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		this.stop();
+		this.topicListeners.clear();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int getFetchTimeout() {
+		return fetchTimeout;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int getFetchLimit() {
+		return fetchLimit;
+	}
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
new file mode 100644
index 00000000..dc70e529
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
@@ -0,0 +1,202 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.List;
+import java.util.Map;
+
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This topic reader implementation specializes in reading messages
+ * over DMAAP topic and notifying its listeners
+ */
+public class SingleThreadedDmaapTopicSource extends SingleThreadedBusTopicSource
+                                            implements DmaapTopicSource, Runnable {	
+
+	private static Logger logger = LoggerFactory.getLogger(SingleThreadedDmaapTopicSource.class);
+	
+	protected boolean allowSelfSignedCerts;
+	protected final String userName;
+	protected final String password;
+	
+	protected String environment = null;
+	protected String aftEnvironment = null;
+	protected String partner = null;
+	protected String latitude = null;
+	protected String longitude = null;
+	
+	protected Map<String,String> additionalProps = null;
+
+	
+	/**
+	 * 
+	 * @param servers DMaaP servers
+	 * @param topic DMaaP Topic to be monitored
+	 * @param apiKey DMaaP API Key (optional)
+	 * @param apiSecret DMaaP API Secret (optional)
+	 * @param consumerGroup DMaaP Reader Consumer Group
+	 * @param consumerInstance DMaaP Reader Instance
+	 * @param fetchTimeout DMaaP fetch timeout
+	 * @param fetchLimit DMaaP fetch limit
+	 * @param environment DME2 Environment
+	 * @param aftEnvironment DME2 AFT Environment
+	 * @param partner DME2 Partner
+	 * @param latitude DME2 Latitude
+	 * @param longitude DME2 Longitude
+	 * @param additionalProps Additional properties to pass to DME2
+	 * @param useHttps does connection use HTTPS?
+	 * @param allowSelfSignedCerts are self-signed certificates allow
+	 * 
+	 * @throws IllegalArgumentException An invalid parameter passed in
+	 */
+	public SingleThreadedDmaapTopicSource(List<String> servers, String topic, 
+											String apiKey, String apiSecret,
+											String userName, String password,
+											String consumerGroup, String consumerInstance,
+											int fetchTimeout, int fetchLimit,
+											String environment, String aftEnvironment, String partner,
+											String latitude, String longitude, Map<String,String> additionalProps,
+											boolean useHttps, boolean allowSelfSignedCerts)
+			throws IllegalArgumentException {
+			
+		super(servers, topic, apiKey, apiSecret, 
+			  consumerGroup, consumerInstance, 
+			  fetchTimeout, fetchLimit, useHttps,allowSelfSignedCerts);
+		
+		this.userName = userName;
+		this.password = password;
+		
+		this.environment = environment;
+		this.aftEnvironment = aftEnvironment;
+		this.partner = partner;
+		
+		this.latitude = latitude;
+		this.longitude = longitude;
+		
+		this.additionalProps = additionalProps;
+		try {
+			this.init();
+		} catch (Exception e) {
+			logger.error("ERROR during init of topic {}", this.topic);
+			throw new IllegalArgumentException(e);
+		}
+	}
+
+	/**
+	 * 
+	 * @param servers DMaaP servers
+	 * @param topic DMaaP Topic to be monitored
+	 * @param apiKey DMaaP API Key (optional)
+	 * @param apiSecret DMaaP API Secret (optional)
+	 * @param consumerGroup DMaaP Reader Consumer Group
+	 * @param consumerInstance DMaaP Reader Instance
+	 * @param fetchTimeout DMaaP fetch timeout
+	 * @param fetchLimit DMaaP fetch limit
+	 * @param useHttps does connection use HTTPS?
+	 * @param allowSelfSignedCerts are self-signed certificates allow
+	 * @throws IllegalArgumentException An invalid parameter passed in
+	 */
+	public SingleThreadedDmaapTopicSource(List<String> servers, String topic, 
+			                              String apiKey, String apiSecret,
+			                              String userName, String password,
+			                              String consumerGroup, String consumerInstance, 
+			                              int fetchTimeout, int fetchLimit, boolean useHttps, boolean allowSelfSignedCerts)
+			throws IllegalArgumentException {
+		
+		
+		super(servers, topic, apiKey, apiSecret, 
+			  consumerGroup, consumerInstance, 
+			  fetchTimeout, fetchLimit, useHttps, allowSelfSignedCerts);
+		
+		this.userName = userName;
+		this.password = password;		
+		
+		try {
+			this.init();
+		} catch (Exception e) {
+			logger.warn("dmaap-source: cannot create topic {} because of {}", topic, e.getMessage(), e);
+			throw new IllegalArgumentException(e);
+		}
+	}
+	
+
+	/**
+	 * Initialize the Cambria or MR Client
+	 */
+	@Override
+	public void init() throws Exception {
+		if (this.userName == null || this.userName.isEmpty() || 
+				this.password == null || this.password.isEmpty()) {
+				this.consumer =
+						new BusConsumer.CambriaConsumerWrapper(this.servers, this.topic, 
+								                           this.apiKey, this.apiSecret,
+								                           this.consumerGroup, this.consumerInstance,
+								                           this.fetchTimeout, this.fetchLimit,
+								                           this.useHttps, this.allowSelfSignedCerts);
+		} else if ((this.environment == null    || this.environment.isEmpty()) &&
+				   (this.aftEnvironment == null || this.aftEnvironment.isEmpty()) &&
+				   (this.latitude == null	   || this.latitude.isEmpty()) &&
+				   (this.longitude == null	   || this.longitude.isEmpty()) &&
+				   (this.partner == null 	   || this.partner.isEmpty())) {
+			this.consumer =
+					new BusConsumer.DmaapAafConsumerWrapper(this.servers, this.topic, 
+							                            this.apiKey, this.apiSecret,
+							                            this.userName, this.password,
+							                            this.consumerGroup, this.consumerInstance,
+							                            this.fetchTimeout, this.fetchLimit, this.useHttps);
+		} else {
+			this.consumer =
+					new BusConsumer.DmaapDmeConsumerWrapper(this.servers, this.topic, 
+							                            this.apiKey, this.apiSecret,
+							                            this.userName, this.password,
+							                            this.consumerGroup, this.consumerInstance,
+							                            this.fetchTimeout, this.fetchLimit,
+							                            this.environment, this.aftEnvironment, this.partner,
+							                            this.latitude, this.longitude, this.additionalProps, this.useHttps);
+		}
+			
+		logger.info("{}: INITTED", this);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CommInfrastructure getTopicCommInfrastructure() {
+		return Topic.CommInfrastructure.DMAAP;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("SingleThreadedDmaapTopicSource [userName=").append(userName).append(", password=")
+				.append((password == null || password.isEmpty()) ? "-" : password.length())
+				.append(", getTopicCommInfrastructure()=").append(getTopicCommInfrastructure())
+				.append(", toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
new file mode 100644
index 00000000..e394e3df
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.List;
+
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
+
+/**
+ * This topic source implementation specializes in reading messages
+ * over an UEB Bus topic source and notifying its listeners
+ */
+public class SingleThreadedUebTopicSource extends SingleThreadedBusTopicSource 
+                                          implements UebTopicSource {
+
+	/**
+	 * 
+	 * @param servers UEB servers
+	 * @param topic UEB Topic to be monitored
+	 * @param apiKey UEB API Key (optional)
+	 * @param apiSecret UEB API Secret (optional)
+	 * @param consumerGroup UEB Reader Consumer Group
+	 * @param consumerInstance UEB Reader Instance
+	 * @param fetchTimeout UEB fetch timeout
+	 * @param fetchLimit UEB fetch limit
+	 * @param useHttps does topicSource use HTTPS?
+	 * @param allowSelfSignedCerts does topicSource allow self-signed certs?
+	 * 
+	 * @throws IllegalArgumentException An invalid parameter passed in
+	 */
+	
+		
+	public SingleThreadedUebTopicSource(List<String> servers, String topic, 
+			                            String apiKey, String apiSecret,
+			                            String consumerGroup, String consumerInstance, 
+			                            int fetchTimeout, int fetchLimit, boolean useHttps, boolean allowSelfSignedCerts)
+			throws IllegalArgumentException {
+		
+		super(servers, topic, apiKey, apiSecret, 
+			  consumerGroup, consumerInstance, 
+			  fetchTimeout, fetchLimit, useHttps, allowSelfSignedCerts);
+		
+		this.allowSelfSignedCerts = allowSelfSignedCerts;
+		
+		this.init();
+	}
+	
+	/**
+	 * Initialize the Cambria client
+	 */
+	@Override
+	public void init() {
+		this.consumer =
+			new BusConsumer.CambriaConsumerWrapper(this.servers, this.topic, 
+					                           this.apiKey, this.apiSecret,
+					                           this.consumerGroup, this.consumerInstance,
+					                           this.fetchTimeout, this.fetchLimit, this.useHttps, this.allowSelfSignedCerts);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CommInfrastructure getTopicCommInfrastructure() {
+		return Topic.CommInfrastructure.UEB;
+	}
+	
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("SingleThreadedUebTopicSource [getTopicCommInfrastructure()=")
+				.append(getTopicCommInfrastructure()).append(", toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java
new file mode 100644
index 00000000..0c8bf6a6
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/TopicBase.java
@@ -0,0 +1,229 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.event.comm.bus.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class TopicBase implements Topic {
+	
+	/**
+	 * logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(TopicBase.class);
+	
+	/**
+	 * list of servers
+	 */
+	protected List<String> servers;
+
+	/**
+	 * Topic
+	 */
+	protected String topic;
+	
+	/**
+	 * event cache
+	 */
+	protected CircularFifoQueue<String> recentEvents = new CircularFifoQueue<String>(10);
+		
+	/**
+	 * Am I running?
+	 * reflects invocation of start()/stop() 
+	 * !locked & start() => alive
+	 * stop() => !alive
+	 */
+	protected volatile boolean alive = false;
+	
+	/**
+	 * Am I locked?
+	 * reflects invocation of lock()/unlock() operations
+	 * locked => !alive (but not in the other direction necessarily)
+	 * locked => !offer, !run, !start, !stop (but this last one is obvious
+	 *                                        since locked => !alive)
+	 */
+	protected volatile boolean locked = false;
+	
+	/**
+	 * All my subscribers for new message notifications
+	 */
+	protected final ArrayList<TopicListener> topicListeners = new ArrayList<TopicListener>();
+	
+	/**
+	 * Instantiates a new Topic Base
+	 * 
+	 * @param servers list of servers
+	 * @param topic topic name
+	 *  
+	 * @return a Topic Base
+	 * @throws IllegalArgumentException if invalid parameters are present
+	 */
+	public TopicBase(List<String> servers, String topic) throws IllegalArgumentException {
+		
+		if (servers == null || servers.isEmpty()) {
+			throw new IllegalArgumentException("Server(s) must be provided");
+		}
+		
+		if (topic == null || topic.isEmpty()) {
+			throw new IllegalArgumentException("A Topic must be provided");
+		}
+		
+		this.servers = servers;
+		this.topic = topic;
+	}
+	
+	@Override
+	public void register(TopicListener topicListener) 
+		throws IllegalArgumentException {		
+		
+		logger.info("{}: registering {}", this, topicListener);
+		
+		synchronized(this) {
+			if (topicListener == null)
+				throw new IllegalArgumentException("TopicListener must be provided");
+			
+			for (TopicListener listener: this.topicListeners) {
+				if (listener == topicListener) return;
+			}
+			
+			this.topicListeners.add(topicListener);
+		}
+	}
+
+	@Override
+	public void unregister(TopicListener topicListener) {
+		
+		logger.info("{}: unregistering {}", this, topicListener);
+		
+		synchronized (this) {
+			if (topicListener == null)
+				throw new IllegalArgumentException("TopicListener must be provided");
+			
+			this.topicListeners.remove(topicListener);
+		}
+	}
+	
+	/**
+	 * broadcast event to all listeners
+	 * 
+	 * @param message the event
+	 * @return true if all notifications are performed with no error, false otherwise
+	 */
+	protected boolean broadcast(String message) {
+		List<TopicListener> snapshotListeners = this.snapshotTopicListeners();
+		
+		boolean success = true;
+		for (TopicListener topicListener: snapshotListeners) {
+			try {
+				topicListener.onTopicEvent(this.getTopicCommInfrastructure(), this.topic, message);
+			} catch (Exception e) {
+				logger.warn("{}: notification error @ {} because of {}", 
+						    this, topicListener, e.getMessage(), e);
+				success = false;
+			}
+		}
+		return success;
+	}
+	
+	/**
+	 * take a snapshot of current topic listeners
+	 * 
+	 * @return the topic listeners
+	 */
+	protected synchronized List<TopicListener> snapshotTopicListeners() {
+		@SuppressWarnings("unchecked")
+		List<TopicListener> listeners = (List<TopicListener>) topicListeners.clone();
+		return listeners;
+	}
+	
+	@Override
+	public boolean lock() {	
+
+		logger.info("{}: locking", this);
+		
+		synchronized (this) {
+			if (this.locked)
+				return true;
+			
+			this.locked = true;
+		}
+		
+		return this.stop();
+	}
+
+	@Override
+	public boolean unlock() {		
+		logger.info("{}: unlocking", this);
+		
+		synchronized(this) {
+			if (!this.locked)
+				return true;
+			
+			this.locked = false;
+		}
+		
+		try {
+			return this.start();
+		} catch (Exception e) {
+			logger.warn("{}: cannot after unlocking because of {}", this, e.getMessage(), e);
+			return false;
+		}
+	}
+	
+	@Override
+	public boolean isLocked() {
+		return this.locked;
+	}	
+	
+	@Override
+	public String getTopic() {
+		return topic;
+	}
+	
+	@Override
+	public boolean isAlive() {
+		return this.alive;
+	}
+	
+	@Override
+	public List<String> getServers() {
+		return servers;
+	}
+
+	@Override
+	public synchronized String[] getRecentEvents() {
+		String[] events = new String[recentEvents.size()];
+		return recentEvents.toArray(events);
+	}
+	
+	
+	@Override
+	public String toString() {
+		return "TopicBase [servers=" + servers + ", topic=" + topic + ", #recentEvents=" + recentEvents.size() + ", locked="
+				+ locked + ", #topicListeners=" + topicListeners.size() + "]";
+	}
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java
new file mode 100644
index 00000000..e5becdf4
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClient.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.client;
+
+import javax.ws.rs.core.Response;
+
+import org.onap.policy.drools.properties.Startable;
+
+public interface HttpClient extends Startable {
+	
+	public Response get(String path);
+	
+	public Response get();
+	
+	public static <T> T getBody(Response response, Class<T> entityType) {
+		return response.readEntity(entityType);
+	}
+
+	public String getName();
+	public boolean isHttps();
+	public boolean isSelfSignedCerts();
+	public String getHostname();
+	public int getPort();
+	public String getBasePath();
+	public String getUserName();
+	public String getPassword();
+	public String getBaseUrl();
+	
+	
+	public static final HttpClientFactory factory = new IndexedHttpClientFactory();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java
new file mode 100644
index 00000000..c434c64f
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/HttpClientFactory.java
@@ -0,0 +1,192 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.http.client.internal.JerseyClient;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface HttpClientFactory {
+	
+	public HttpClient build(String name, boolean https, 
+                            boolean selfSignedCerts,
+                            String hostname, int port, 
+                            String baseUrl, String userName,
+                            String password, boolean managed) 
+    throws Exception;
+	
+	public ArrayList<HttpClient> build(Properties properties) throws Exception;
+	
+	public HttpClient get(String name);
+	
+	public List<HttpClient> inventory();
+	
+	public void destroy(String name);
+	
+	public void destroy();
+}
+
+class IndexedHttpClientFactory implements HttpClientFactory {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(IndexedHttpClientFactory.class);
+	
+	protected HashMap<String, HttpClient> clients = new HashMap<String, HttpClient>();
+
+	@Override
+	public synchronized HttpClient build(String name, boolean https, boolean selfSignedCerts, 
+			                             String hostname, int port,
+			                             String baseUrl, String userName, String password,
+			                             boolean managed) 
+	throws Exception {
+		if (clients.containsKey(name))
+			return clients.get(name);
+		
+		JerseyClient client = 
+				new JerseyClient(name, https, selfSignedCerts, hostname, port, baseUrl, userName, password);
+		
+		if (managed)
+			clients.put(name, client);
+		
+		return client;
+	}
+
+	@Override
+	public synchronized ArrayList<HttpClient> build(Properties properties) throws Exception {
+		ArrayList<HttpClient> clientList = new ArrayList<HttpClient>();
+		
+		String clientNames = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES);
+		if (clientNames == null || clientNames.isEmpty()) {
+			return clientList;
+		}
+		
+		List<String> clientNameList = 
+				new ArrayList<String>(Arrays.asList(clientNames.split("\\s*,\\s*")));
+		
+		for (String clientName : clientNameList) {
+			String httpsString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + 
+                                                        clientName + 
+                                                        PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
+			boolean https = false;
+			if (httpsString != null && !httpsString.isEmpty()) {
+				https = Boolean.parseBoolean(httpsString);
+			}
+			
+			String hostName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
+					                                 clientName + 
+                                                     PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX);
+					
+			String servicePortString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + 
+		                                                      clientName + 
+		                                                      PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX);
+			int port;
+			try {
+				if (servicePortString == null || servicePortString.isEmpty()) {
+					continue;
+				}
+				port = Integer.parseInt(servicePortString);
+			} catch (NumberFormatException nfe) {
+				logger.error("http-client-factory: cannot parse port {}", servicePortString, nfe);
+				continue;
+			}
+			
+			String baseUrl = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
+					                                clientName + 
+                                                    PolicyProperties.PROPERTY_HTTP_URL_SUFFIX);
+			
+			String userName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
+					                                 clientName + 
+                                                     PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX);
+
+			String password = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
+		                                             clientName + 
+                                                     PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX);
+			
+			String managedString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
+					                                      clientName + 
+					                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
+			boolean managed = true;
+			if (managedString != null && !managedString.isEmpty()) {
+				managed = Boolean.parseBoolean(managedString);
+			}
+			
+			try {
+				HttpClient client =
+						this.build(clientName, https, https, hostName, port, baseUrl, 
+								   userName, password, managed);
+				clientList.add(client);
+			} catch (Exception e) {
+				logger.error("http-client-factory: cannot build client {}", clientName, e);
+			}
+		}
+		
+		return clientList;
+	}
+
+	@Override
+	public synchronized HttpClient get(String name) {
+		if (clients.containsKey(name)) {
+			return clients.get(name);
+		} 
+		
+		throw new IllegalArgumentException("Http Client " + name + " not found");
+	}
+
+	@Override
+	public synchronized List<HttpClient> inventory() {
+		return new ArrayList<HttpClient>(this.clients.values());
+	}
+
+	@Override
+	public synchronized void destroy(String name) {
+		if (!clients.containsKey(name)) {
+			return;
+		}
+		
+		HttpClient client = clients.remove(name);
+		try {
+			client.shutdown();
+		} catch (IllegalStateException e) {
+			logger.error("http-client-factory: cannot shutdown client {}", client, e);
+		}
+	}
+
+	@Override
+	public void destroy() {
+		List<HttpClient> clientsInventory = this.inventory();
+		for (HttpClient client: clientsInventory) {
+			client.shutdown();
+		}
+		
+		synchronized(this) {
+			this.clients.clear();
+		}
+	}
+	
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java
new file mode 100644
index 00000000..fe36740b
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/client/internal/JerseyClient.java
@@ -0,0 +1,250 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.http.client.internal;
+
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class JerseyClient implements HttpClient {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(JerseyClient.class); 
+	
+	protected final String name;
+	protected final boolean https;
+	protected final boolean selfSignedCerts;
+	protected final String hostname;
+	protected final int port;
+	protected final String basePath;
+	protected final String userName;
+	protected final String password;
+	
+	protected final Client client;
+	protected final String baseUrl;
+	
+	protected boolean alive = true;
+	
+	
+	public JerseyClient(String name, boolean https, 
+			            boolean selfSignedCerts,
+			            String hostname, int port, 
+			            String basePath, String userName,
+			            String password) 
+	throws Exception {
+		
+		super();
+		
+		if (name == null || name.isEmpty())
+			throw new IllegalArgumentException("Name must be provided");
+		
+		if (hostname == null || hostname.isEmpty())
+			throw new IllegalArgumentException("Hostname must be provided");
+		
+		if (port <= 0 && port >= 65535)
+			throw new IllegalArgumentException("Invalid Port provided: " + port);
+		
+		this.name = name;
+		this.https = https;
+		this.hostname = hostname;
+		this.port = port;
+		this.basePath = basePath;
+		this.userName = userName;
+		this.password = password;
+		this.selfSignedCerts = selfSignedCerts;
+		
+		StringBuffer tmpBaseUrl = new StringBuffer();
+		if (this.https) {
+			tmpBaseUrl.append("https://");
+			ClientBuilder clientBuilder;
+			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+			if (this.selfSignedCerts) {
+				sslContext.init(null, new TrustManager[]{new X509TrustManager() {
+					@Override
+			        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
+					@Override
+			        public void checkServerTrusted(X509Certificate[]  chain, String authType) throws CertificateException {}
+					@Override
+			        public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
+	
+			    }}, new SecureRandom());
+				 clientBuilder = ClientBuilder.newBuilder().sslContext(sslContext).hostnameVerifier(new HostnameVerifier() {
+					@Override
+					public boolean verify(String hostname, SSLSession session) {return true;}
+				 });
+			} else {
+				sslContext.init(null, null, null);
+				clientBuilder = ClientBuilder.newBuilder().sslContext(sslContext);
+			}
+			this.client = clientBuilder.build();
+		} else {	
+			tmpBaseUrl.append("http://");
+			this.client = ClientBuilder.newClient();
+		}
+		
+		if (this.userName != null && !this.userName.isEmpty() &&
+			this.password != null && !this.password.isEmpty()) {
+			HttpAuthenticationFeature authFeature = HttpAuthenticationFeature.basic(userName, password);
+			this.client.register(authFeature);
+		}
+		
+		this.baseUrl = tmpBaseUrl.append(this.hostname).append(":").
+				                  append(this.port).append("/").
+		                          append((this.basePath == null) ? "" : this.basePath).
+		                          toString();
+	}
+	
+	@Override
+	public Response get(String path) {		
+		if (path != null && !path.isEmpty())
+			return this.client.target(this.baseUrl).path(path).request().get();
+		else
+			return this.client.target(this.baseUrl).request().get();
+	}
+	
+	@Override
+	public Response get() {
+		return this.client.target(this.baseUrl).request().get();
+	}
+	
+
+	@Override
+	public boolean start() throws IllegalStateException {
+		return alive;
+	}
+
+	@Override
+	public boolean stop() throws IllegalStateException {
+		return !alive;
+	}
+
+	@Override
+	public void shutdown() throws IllegalStateException {
+		synchronized(this) {
+			alive = false;
+		}
+		
+		try {
+			this.client.close();
+		} catch (Exception e) {
+			logger.warn("{}: cannot close because of {}", this, 
+				        e.getMessage(), e);
+		}
+	}
+
+	@Override
+	public synchronized boolean isAlive() {
+		return this.alive;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public boolean isHttps() {
+		return https;
+	}
+
+	@Override
+	public boolean isSelfSignedCerts() {
+		return selfSignedCerts;
+	}
+
+	@Override
+	public String getHostname() {
+		return hostname;
+	}
+
+	public int getPort() {
+		return port;
+	}
+
+	@Override
+	public String getBasePath() {
+		return basePath;
+	}
+
+	@Override
+	public String getUserName() {
+		return userName;
+	}
+
+	@JsonIgnore
+	@Override
+	public String getPassword() {
+		return password;
+	}
+
+	@Override
+	public String getBaseUrl() {
+		return baseUrl;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("JerseyClient [name=");
+		builder.append(name);
+		builder.append(", https=");
+		builder.append(https);
+		builder.append(", selfSignedCerts=");
+		builder.append(selfSignedCerts);
+		builder.append(", hostname=");
+		builder.append(hostname);
+		builder.append(", port=");
+		builder.append(port);
+		builder.append(", basePath=");
+		builder.append(basePath);
+		builder.append(", userName=");
+		builder.append(userName);
+		builder.append(", password=");
+		builder.append(password);
+		builder.append(", client=");
+		builder.append(client);
+		builder.append(", baseUrl=");
+		builder.append(baseUrl);
+		builder.append(", alive=");
+		builder.append(alive);
+		builder.append("]");
+		return builder.toString();
+	}
+
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java
new file mode 100644
index 00000000..da515af9
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServer.java
@@ -0,0 +1,81 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.server;
+
+import org.onap.policy.drools.properties.Startable;
+
+/**
+ * A Jetty Server to server REST Requests
+ */
+public interface HttpServletServer extends Startable {
+
+	/**
+	 * 
+	 * @return port
+	 */
+	public int getPort();
+	
+	/**
+	 * enables basic authentication with user and password on the the relative path relativeUriPath
+	 * 
+	 * @param user
+	 * @param password
+	 * @param relativeUriPath
+	 */
+	public void setBasicAuthentication(String user, String password, String relativeUriPath);
+
+	/**
+	 * adds a JAX-RS servlet class to serve REST requests
+	 * 
+	 * @param servletPath servlet path
+	 * @param restClass JAX-RS API Class
+	 * @throws IllegalArgumentException unable to process because of invalid input
+	 * @throws IllegalStateException unable to process because of invalid state
+	 */
+	public void addServletClass(String servletPath, String restClass) 
+			throws IllegalArgumentException, IllegalStateException;
+
+	/**
+	 * adds a package containing JAX-RS classes to serve REST requests
+	 * 
+	 * @param servletPath servlet path
+	 * @param restPackage JAX-RS package to scan
+	 * @throws IllegalArgumentException unable to process because of invalid input
+	 * @throws IllegalStateException unable to process because of invalid state
+	 */
+	public void addServletPackage(String servletPath, String restPackage) 
+			throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * blocking start of the http server
+	 * 
+	 * @param maxWaitTime max time to wait for the start to take place
+	 * @return true if start was successful
+	 * 
+	 * @throws IllegalArgumentException if arguments are invalid
+	 */
+	public boolean waitedStart(long maxWaitTime) throws IllegalArgumentException;
+	
+	
+	/**
+	 * factory for managing and tracking DMAAP sources
+	 */
+	public static HttpServletServerFactory factory = new IndexedHttpServletServerFactory();
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java
new file mode 100644
index 00000000..56e9ccdd
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/HttpServletServerFactory.java
@@ -0,0 +1,265 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.server;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.onap.policy.drools.http.server.internal.JettyJerseyServer;
+import org.onap.policy.drools.properties.PolicyProperties;
+
+/**
+ * Factory of HTTP Servlet-Enabled Servlets
+ */
+public interface HttpServletServerFactory {
+
+	/**
+	 * builds an http server with support for servlets
+	 * 
+	 * @param name name
+	 * @param host binding host
+	 * @param port port
+	 * @param contextPath server base path
+	 * @param swagger enable swagger documentation
+	 * @param managed is it managed by infrastructure
+	 * @return http server
+	 * @throws IllegalArgumentException when invalid parameters are provided
+	 */
+	public HttpServletServer build(String name, String host, int port, String contextPath, 
+			                       boolean swagger, boolean managed)
+		   throws IllegalArgumentException;
+	
+	/**
+	 * list of http servers per properties
+	 * 
+	 * @param properties properties based configuration
+	 * @return list of http servers
+	 * @throws IllegalArgumentException when invalid parameters are provided
+	 */
+	public ArrayList<HttpServletServer> build(Properties properties) throws IllegalArgumentException;
+	
+	/**
+	 * gets a server based on the port
+	 * 
+	 * @param port port
+	 * @return http server
+	 */
+	public HttpServletServer get(int port);
+	
+	/**
+	 * provides an inventory of servers
+	 * 
+	 * @return inventory of servers
+	 */
+	public List<HttpServletServer> inventory();
+	
+	/**
+	 * destroys server bound to a port
+	 * @param port
+	 */
+	public void destroy(int port);
+	
+	/**
+	 * destroys the factory and therefore all servers
+	 */
+	public void destroy();
+}
+
+/**
+ * Indexed factory implementation
+ */
+class IndexedHttpServletServerFactory implements HttpServletServerFactory {
+	
+	/**
+	 * logger
+	 */
+	protected static Logger logger = LoggerFactory.getLogger(IndexedHttpServletServerFactory.class);	
+	
+	/**
+	 * servers index
+	 */
+	protected HashMap<Integer, HttpServletServer> servers = new HashMap<Integer, HttpServletServer>();
+
+	@Override
+	public synchronized HttpServletServer build(String name, String host, int port, 
+			                                    String contextPath, boolean swagger,
+			                                    boolean managed) 
+		throws IllegalArgumentException {	
+		
+		if (servers.containsKey(port))
+			return servers.get(port);
+		
+		JettyJerseyServer server = new JettyJerseyServer(name, host, port, contextPath, swagger);
+		if (managed)
+			servers.put(port, server);
+		
+		return server;
+	}
+	
+	@Override
+	public synchronized ArrayList<HttpServletServer> build(Properties properties) 
+		throws IllegalArgumentException {	
+		
+		ArrayList<HttpServletServer> serviceList = new ArrayList<HttpServletServer>();
+		
+		String serviceNames = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES);
+		if (serviceNames == null || serviceNames.isEmpty()) {
+			logger.warn("No topic for HTTP Service: {}", properties);
+			return serviceList;
+		}
+		
+		List<String> serviceNameList = 
+				new ArrayList<String>(Arrays.asList(serviceNames.split("\\s*,\\s*")));
+		
+		for (String serviceName : serviceNameList) {
+			String servicePortString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + 
+		                                                      serviceName + 
+		                                                      PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX);
+			
+			int servicePort;
+			try {
+				if (servicePortString == null || servicePortString.isEmpty()) {
+					if (logger.isWarnEnabled())
+						logger.warn("No HTTP port for service in {}", serviceName);
+					continue;
+				}
+				servicePort = Integer.parseInt(servicePortString);
+			} catch (NumberFormatException nfe) {
+				if (logger.isWarnEnabled())
+					logger.warn("No HTTP port for service in {}", serviceName);
+				continue;
+			}
+			
+			String hostName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                     serviceName + 
+                                                     PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX);
+			
+			String contextUriPath = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                        serviceName + 
+                                                        PolicyProperties.PROPERTY_HTTP_CONTEXT_URIPATH_SUFFIX);
+			
+			String userName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+					                                 serviceName + 
+                                                     PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX);
+
+			String password = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                     serviceName + 
+                                                     PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX);
+			
+			String authUriPath = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                        serviceName + 
+                                                        PolicyProperties.PROPERTY_HTTP_AUTH_URIPATH_SUFFIX);
+			
+			String restClasses = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                      serviceName + 
+                                                      PolicyProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX);
+			
+			String restPackages = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                        serviceName + 
+                                                        PolicyProperties.PROPERTY_HTTP_REST_PACKAGES_SUFFIX);
+			String restUriPath = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                         serviceName + 
+                                                         PolicyProperties.PROPERTY_HTTP_REST_URIPATH_SUFFIX);
+			
+			String managedString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+                                                          serviceName + 
+                                                          PolicyProperties.PROPERTY_MANAGED_SUFFIX);		
+			boolean managed = true;
+			if (managedString != null && !managedString.isEmpty()) {
+				managed = Boolean.parseBoolean(managedString);
+			}
+			
+			String swaggerString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
+									                      serviceName + 
+									                      PolicyProperties.PROPERTY_HTTP_SWAGGER_SUFFIX);		
+			boolean swagger = false;
+			if (swaggerString != null && !swaggerString.isEmpty()) {
+				swagger = Boolean.parseBoolean(swaggerString);
+			}
+			
+			HttpServletServer service = build(serviceName, hostName, servicePort, contextUriPath, swagger, managed);
+			if (userName != null && !userName.isEmpty() && password != null && !password.isEmpty()) {
+				service.setBasicAuthentication(userName, password, authUriPath);
+			}
+			
+			if (restClasses != null && !restClasses.isEmpty()) {
+				List<String> restClassesList = 
+						new ArrayList<String>(Arrays.asList(restClasses.split("\\s*,\\s*")));
+				for (String restClass : restClassesList)
+					service.addServletClass(restUriPath, restClass);
+			}
+			
+			if (restPackages != null && !restPackages.isEmpty()) {
+				List<String> restPackageList = 
+						new ArrayList<String>(Arrays.asList(restPackages.split("\\s*,\\s*")));
+				for (String restPackage : restPackageList)
+					service.addServletPackage(restUriPath, restPackage);
+			}
+			
+			serviceList.add(service);
+		}
+		
+		return serviceList;
+	}
+
+	@Override
+	public synchronized HttpServletServer get(int port) throws IllegalArgumentException {
+		
+		if (servers.containsKey(port)) {
+			return servers.get(port);
+		} 
+		
+		throw new IllegalArgumentException("Http Server for " + port + " not found");
+	}
+
+	@Override
+	public synchronized List<HttpServletServer> inventory() {
+		 return new ArrayList<HttpServletServer>(this.servers.values());
+	}
+	
+	@Override
+	public synchronized void destroy(int port) throws IllegalArgumentException, IllegalStateException {
+		
+		if (!servers.containsKey(port)) {
+			return;
+		}
+		
+		HttpServletServer server = servers.remove(port);
+		server.shutdown();
+	}
+
+	@Override
+	public synchronized void destroy() throws IllegalArgumentException, IllegalStateException {
+		List<HttpServletServer> servers = this.inventory();
+		for (HttpServletServer server: servers) {
+			server.shutdown();
+		}
+		
+		synchronized(this) {
+			this.servers.clear();
+		}
+	}
+	
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java
new file mode 100644
index 00000000..0c724fc8
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyJerseyServer.java
@@ -0,0 +1,241 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.server.internal;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
+import io.swagger.jersey.config.JerseyJaxrsConfig;
+
+/**
+ * REST Jetty Server that uses Jersey Servlets to support JAX-RS Web Services
+ */
+public class JettyJerseyServer extends JettyServletServer {
+	
+	/**
+	 * Jersey Packages Init Param Name
+	 */
+	protected static final String JERSEY_INIT_PACKAGES_PARAM_NAME = "jersey.config.server.provider.packages";
+	
+	/**
+	 * Jersey Packages Init Param Value
+	 */
+	protected static final String JERSEY_INIT_PACKAGES_PARAM_VALUE = "com.fasterxml.jackson.jaxrs.json";
+	
+	/**
+	 * Swagger Packages
+	 */
+	protected static final String SWAGGER_INIT_PACKAGES_PARAM_VALUE = "io.swagger.jaxrs.listing";
+	
+	/**
+	 * Jersey Classes Init Param Name
+	 */
+	protected static final String JERSEY_INIT_CLASSNAMES_PARAM_NAME = "jersey.config.server.provider.classnames";
+	
+	/**
+	 * Jersey Jackson Classes Init Param Value
+	 */
+	protected static final String JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE = "com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider";
+	
+	/**
+	 * Jersey Swagger Classes Init Param Value
+	 */
+	protected static final String SWAGGER_INIT_CLASSNAMES_PARAM_VALUE = "io.swagger.jaxrs.listing.ApiListingResource," +
+																        "io.swagger.jaxrs.listing.SwaggerSerializers";
+	/**
+	 * Logger
+	 */
+	protected static Logger logger = LoggerFactory.getLogger(JettyJerseyServer.class);
+	
+	/**
+	 * Container for servlets
+	 */
+	protected HashMap<String, ServletHolder> servlets = new HashMap<String, ServletHolder>();
+	
+	/**
+	 * Swagger ID
+	 */
+	protected String swaggerId = null;
+	
+	/**
+	 * Constructor
+	 * 
+	 * @param name name
+	 * @param host host server host
+	 * @param port port server port
+	 * @param swagger support swagger?
+	 * @param contextPath context path
+	 * 
+	 * @throws IllegalArgumentException in invalid arguments are provided
+	 */
+	public JettyJerseyServer(String name, String host, int port, String contextPath, boolean swagger) 
+	       throws IllegalArgumentException {
+		
+		super(name, host, port, contextPath);
+		if (swagger) {
+			this.swaggerId = "swagger-" + this.port;
+			attachSwaggerServlet();
+		}
+	}
+	
+	/**
+	 * attaches a swagger initialization servlet
+	 */
+	protected void attachSwaggerServlet() {
+		
+		ServletHolder swaggerServlet = context.addServlet(JerseyJaxrsConfig.class, "/");
+
+		String hostname = this.connector.getHost();
+		if (hostname == null || hostname.isEmpty() || hostname.equals("0.0.0.0")) {
+			try {
+				hostname = InetAddress.getLocalHost().getHostName();
+			} catch (UnknownHostException e) {
+				logger.warn("{}: can't resolve connector's hostname: ", this);
+				hostname = "localhost";
+			}
+		}
+
+		swaggerServlet.setInitParameter("swagger.api.basepath",
+				"http://" + hostname + ":" + this.connector.getPort() + "/");
+		swaggerServlet.setInitParameter("swagger.context.id", swaggerId);
+		swaggerServlet.setInitParameter("swagger.scanner.id", swaggerId);
+		swaggerServlet.setInitParameter("swagger.pretty.print", "true");
+		swaggerServlet.setInitOrder(2);
+		
+        if (logger.isDebugEnabled())
+        	logger.debug("{}: Swagger Servlet has been attached: {}", this, swaggerServlet.dump());
+	}	
+	
+	/**
+	 * retrieves cached server based on servlet path
+	 * 
+	 * @param servletPath servlet path
+	 * @return the jetty servlet holder
+	 * 
+	 * @throws IllegalArgumentException if invalid arguments are provided
+	 */
+	protected synchronized ServletHolder getServlet(String servletPath)
+			  throws IllegalArgumentException {
+		
+		ServletHolder jerseyServlet = servlets.get(servletPath);
+		if (jerseyServlet == null) {
+			jerseyServlet = context.addServlet
+	                (org.glassfish.jersey.servlet.ServletContainer.class, servletPath);  
+			jerseyServlet.setInitOrder(0);
+			servlets.put(servletPath, jerseyServlet);
+		}
+		
+		return jerseyServlet;
+	}
+	
+	@Override
+	public synchronized void addServletPackage(String servletPath, String restPackage) 
+	       throws IllegalArgumentException, IllegalStateException {
+		
+    	if (restPackage == null || restPackage.isEmpty())
+			throw new IllegalArgumentException("No discoverable REST package provided");
+    	
+    	if (servletPath == null || servletPath.isEmpty())
+    		servletPath = "/*";
+		
+		ServletHolder jerseyServlet = this.getServlet(servletPath);
+		
+		String initClasses = 
+				jerseyServlet.getInitParameter(JERSEY_INIT_CLASSNAMES_PARAM_NAME);
+		if (initClasses != null && !initClasses.isEmpty())
+			logger.warn("Both packages and classes are used in Jetty+Jersey Configuration: {}", restPackage);
+		
+		String initPackages = 
+				jerseyServlet.getInitParameter(JERSEY_INIT_PACKAGES_PARAM_NAME);
+		if (initPackages == null) {
+			if (this.swaggerId != null) {
+				initPackages = JERSEY_INIT_PACKAGES_PARAM_VALUE + "," + 
+				               SWAGGER_INIT_PACKAGES_PARAM_VALUE + "," + 
+						       restPackage;
+				
+	        	jerseyServlet.setInitParameter("swagger.context.id", swaggerId);
+	    		jerseyServlet.setInitParameter("swagger.scanner.id", swaggerId);
+			} else {
+				initPackages = JERSEY_INIT_PACKAGES_PARAM_VALUE + "," + 
+				               restPackage;
+			}
+		} else {
+			initPackages = initPackages + "," + restPackage;
+		}
+		
+        jerseyServlet.setInitParameter(JERSEY_INIT_PACKAGES_PARAM_NAME,  initPackages);
+        
+        if (logger.isDebugEnabled())
+        	logger.debug("{}: added REST package: {}", this, jerseyServlet.dump());
+	}
+	
+	@Override
+	public synchronized void addServletClass(String servletPath, String restClass) 
+		       throws IllegalArgumentException, IllegalStateException {
+			
+    	if (restClass == null || restClass.isEmpty())
+			throw new IllegalArgumentException("No discoverable REST class provided");
+    	
+    	if (servletPath == null || servletPath.isEmpty())
+    		servletPath = "/*";
+		
+		ServletHolder jerseyServlet = this.getServlet(servletPath);
+		
+		String initPackages = 
+				jerseyServlet.getInitParameter(JERSEY_INIT_PACKAGES_PARAM_NAME);
+		if (initPackages != null && !initPackages.isEmpty())
+			logger.warn("Both classes and packages are used in Jetty+Jersey Configuration: {}", restClass);
+		
+		String initClasses = 
+				jerseyServlet.getInitParameter(JERSEY_INIT_CLASSNAMES_PARAM_NAME);
+		if (initClasses == null) {
+			if (this.swaggerId != null) {
+				initClasses = JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE + "," + 
+						      SWAGGER_INIT_CLASSNAMES_PARAM_VALUE + "," + 
+				              restClass;
+				
+	        	jerseyServlet.setInitParameter("swagger.context.id", swaggerId);
+	    		jerseyServlet.setInitParameter("swagger.scanner.id", swaggerId);
+			} else {
+				initClasses = JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE + "," + restClass;
+			}			
+		} else {
+			initClasses = initClasses + "," + restClass;
+		}
+		
+        jerseyServlet.setInitParameter(JERSEY_INIT_CLASSNAMES_PARAM_NAME, initClasses);
+        
+        if (logger.isDebugEnabled())
+        	logger.debug("{}: added REST class: {}", this, jerseyServlet.dump());
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("JettyJerseyServer [servlets=").append(servlets).append(", swaggerId=").append(swaggerId)
+				.append(", toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+}
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java
new file mode 100644
index 00000000..d803fe0e
--- /dev/null
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/http/server/internal/JettyServletServer.java
@@ -0,0 +1,346 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.server.internal;
+
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.security.Credential;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Http Server implementation using Embedded Jetty
+ */
+public abstract class JettyServletServer implements HttpServletServer, Runnable {
+	
+	private static Logger logger = LoggerFactory.getLogger(JettyServletServer.class);
+
+	protected final String name;
+
+	protected final String host;
+	protected final int port;
+	
+	protected String user;
+	protected String password;
+	
+	protected final String contextPath;
+	
+	protected final Server jettyServer;
+	protected final ServletContextHandler context;
+	protected final ServerConnector connector;
+	
+	protected volatile Thread jettyThread;
+	
+	protected Object startCondition = new Object();
+	
+	public JettyServletServer(String name, String host, int port, String contextPath) 
+		   throws IllegalArgumentException {
+			
+		if (name == null || name.isEmpty())
+			name = "http-" + port;
+		
+		if (port <= 0 && port >= 65535)
+			throw new IllegalArgumentException("Invalid Port provided: " + port);
+		
+		if (host == null || host.isEmpty())
+			host = "localhost";
+		
+		if (contextPath == null || contextPath.isEmpty())
+			contextPath = "/";
+		
+		this.name = name;
+		
+		this.host = host;
+		this.port = port;
+
+		this.contextPath = contextPath;
+		
+        this.context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        this.context.setContextPath(contextPath);
+        
+        this.jettyServer = new Server();
+        
+        this.connector = new ServerConnector(this.jettyServer);
+        this.connector.setName(name);
+        this.connector.setReuseAddress(true);
+        this.connector.setPort(port);
+        this.connector.setHost(host);    
+        
+        this.jettyServer.addConnector(this.connector);       
+        this.jettyServer.setHandler(context);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setBasicAuthentication(String user, String password, String servletPath) {
+        if (user == null || user.isEmpty() || password == null || password.isEmpty()) 
+        	throw new IllegalArgumentException("Missing user and/or password");
+        
+        if (servletPath == null || servletPath.isEmpty())
+        	servletPath = "/*";
+        	     	
+    	HashLoginService hashLoginService = new HashLoginService();
+        hashLoginService.putUser(user, 
+        		                Credential.getCredential(password), 
+        		                new String[] {"user"});
+        hashLoginService.setName(this.connector.getName() + "-login-service");
+        
+        Constraint constraint = new Constraint();
+        constraint.setName(Constraint.__BASIC_AUTH);
+        constraint.setRoles(new String[]{"user"});
+        constraint.setAuthenticate(true);
+         
+        ConstraintMapping constraintMapping = new ConstraintMapping();
+        constraintMapping.setConstraint(constraint);
+        constraintMapping.setPathSpec(servletPath);
+        
+        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
+        securityHandler.setAuthenticator(new BasicAuthenticator());
+        securityHandler.setRealmName(this.connector.getName() + "-realm");
+        securityHandler.addConstraintMapping(constraintMapping);
+        securityHandler.setLoginService(hashLoginService);		
+        
+        this.context.setSecurityHandler(securityHandler);
+        
+		this.user = user;
+		this.password = password;
+	}
+	
+	/**
+	 * Jetty Server Execution
+	 */
+	@Override
+	public void run() {
+        try {
+        	logger.info("{}: STARTING", this);
+        	
+            this.jettyServer.start();
+            
+            if (logger.isInfoEnabled()) 
+            	logger.info("{}: STARTED: {}", this, this.jettyServer.dump());
+            
+        	synchronized(this.startCondition) {
+        		this.startCondition.notifyAll();
+        	}
+        	
+            this.jettyServer.join();
+        } catch (Exception e) {
+			logger.error("{}: error found while bringing up server", this, e);
+		} 
+	}
+	
+	@Override
+	public boolean waitedStart(long maxWaitTime) throws IllegalArgumentException {
+		logger.info("{}: WAITED-START", this);
+		
+		if (maxWaitTime < 0)
+			throw new IllegalArgumentException("max-wait-time cannot be negative");
+		
+		long pendingWaitTime = maxWaitTime;
+		
+		if (!this.start())
+			return false;
+		
+		synchronized (this.startCondition) {
+			
+			while (!this.jettyServer.isRunning()) {
+				try {
+					long startTs = System.currentTimeMillis();
+					
+					this.startCondition.wait(pendingWaitTime);
+					
+					if (maxWaitTime == 0)
+						/* spurious notification */
+						continue;
+					
+					long endTs = System.currentTimeMillis();
+					pendingWaitTime = pendingWaitTime - (endTs - startTs);
+					
+					logger.info("{}: pending time is {} ms.", this, pendingWaitTime);
+					
+					if (pendingWaitTime <= 0)
+						return false;
+					
+				} catch (InterruptedException e) {
+					logger.warn("{}: waited-start has been interrupted", this);
+					return false;			
+				}
+			}
+			
+			return (this.jettyServer.isRunning());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {
+		logger.info("{}: STARTING", this);
+		
+		synchronized(this) {			
+			if (jettyThread == null || 
+				!this.jettyThread.isAlive()) {
+				
+				this.jettyThread = new Thread(this);
+				this.jettyThread.setName(this.name + "-" + this.port);
+				this.jettyThread.start();
+			}
+		}
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() throws IllegalStateException {
+		logger.info("{}: STOPPING", this);
+		
+		synchronized(this) {
+			if (jettyThread == null) {
+				return true;
+			} 
+			
+			if (!jettyThread.isAlive()) {
+				this.jettyThread = null;
+			} 
+			
+			try {
+				this.connector.stop();
+			} catch (Exception e) {
+				logger.error("{}: error while stopping management server", this, e);
+			}
+			
+			try {
+				this.jettyServer.stop();
+			} catch (Exception e) {
+				logger.error("{}: error while stopping management server", this, e);
+				return false;
+			}
+			
+			Thread.yield();
+		}
+
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		logger.info("{}: SHUTTING DOWN", this);
+		
+		this.stop();
+		
+		if (this.jettyThread == null)
+			return;
+		
+		Thread jettyThreadCopy = this.jettyThread;
+
+		if (jettyThreadCopy.isAlive()) {
+			try {
+				jettyThreadCopy.join(1000L);
+			} catch (InterruptedException e) {
+				logger.warn("{}: error while shutting down management server", this);
+			}
+			if (!jettyThreadCopy.isInterrupted()) {
+				try {
+					jettyThreadCopy.interrupt();
+				} catch(Exception e) {
+					// do nothing
+					logger.warn("{}: exception while shutting down (OK)", this);
+				}
+			}
+		}
+		
+		this.jettyServer.destroy();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isAlive() {
+		if (this.jettyThread != null)
+			return this.jettyThread.isAlive();
+		
+		return false;
+	}
+
+	@Override
+	public int getPort() {
+		return this.port;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @return the host
+	 */
+	public String getHost() {
+		return host;
+	}
+
+	/**
+	 * @return the user
+	 */
+	public String getUser() {
+		return user;
+	}
+
+	/**
+	 * @return the password
+	 */
+	@JsonIgnore
+	public String getPassword() {
+		return password;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("JettyServer [name=").append(name).append(", host=").append(host).append(", port=").append(port)
+				.append(", user=").append(user).append(", password=").append((password != null)).append(", contextPath=")
+				.append(contextPath).append(", jettyServer=").append(jettyServer).append(", context=").append(this.context)
+				.append(", connector=").append(connector).append(", jettyThread=").append(jettyThread)
+				.append("]");
+		return builder.toString();
+	}
+
+}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java
deleted file mode 100644
index 62640bd8..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/Topic.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm;
-
-import java.util.List;
-
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-
-/**
- * Essential Topic Data
- */
-public interface Topic extends TopicRegisterable, Startable, Lockable {
-	
-	/**
-	 * network logger
-	 */
-	public static final String NETWORK_LOGGER = "network";
-	
-	/**
-	 * Underlying Communication infrastructure Types
-	 */
-	public enum CommInfrastructure {
-		/**
-		 * UEB Communication Infrastructure
-		 */
-		UEB,
-		/**
-		 * DMAAP Communication Infrastructure
-		 */		
-		DMAAP,
-		/**
-		 * NOOP for internal use only
-		 */
-		NOOP,
-		/**
-		 * REST Communication Infrastructure
-		 */				
-		REST
-	}
-	
-	/**
-	 * gets the topic name
-	 * 
-	 * @return topic name
-	 */
-	public String getTopic();
-	
-	/**
-	 * gets the communication infrastructure type
-	 * @return
-	 */
-	public CommInfrastructure getTopicCommInfrastructure();
-	
-	/**
-	 * return list of servers
-	 * @return bus servers
-	 */
-	public List<String> getServers();	
-
-	/**
-	 * get the more recent events in this topic entity
-	 * 
-	 * @return list of most recent events
-	 */
-	public String[] getRecentEvents();
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java
deleted file mode 100644
index 337d78e5..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicEndpoint.java
+++ /dev/null
@@ -1,729 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.openecomp.policy.drools.event.comm.bus.NoopTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Abstraction to managed the system's Networked Topic Endpoints,
- * sources of all events input into the System. 
- */
-public interface TopicEndpoint extends Startable, Lockable {
-	
-	/**
-	 * Add Topic Sources to the communication infrastructure initialized per
-	 * properties
-	 * 
-	 * @param properties properties for Topic Source construction
-	 * @return a generic Topic Source
-	 * @throws IllegalArgumentException when invalid arguments are provided
-	 */
-	public List<? extends TopicSource> addTopicSources(Properties properties) 
-		   throws IllegalArgumentException;
-
-	/**
-	 * Add Topic Sinks to the communication infrastructure initialized per
-	 * properties
-	 * 
-	 * @param properties properties for Topic Sink construction
-	 * @return a generic Topic Sink
-	 * @throws IllegalArgumentException when invalid arguments are provided
-	 */
-	public List<? extends TopicSink> addTopicSinks(Properties properties) 
-			   throws IllegalArgumentException;
-	
-	/**
-	 * gets all Topic Sources
-	 * @return the Topic Source List
-	 */
-	List<? extends TopicSource> getTopicSources();
-	
-	/**
-	 * get the Topic Sources for the given topic name
-	 * 
-	 * @param topicName the topic name
-	 * 
-	 * @return the Topic Source List
-	 * @throws IllegalStateException if the entity is in an invalid state
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<? extends TopicSource> getTopicSources(List<String> topicNames) 
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * gets the Topic Source for the given topic name and 
-	 * underlying communication infrastructure type
-	 * 
-	 * @param commType communication infrastructure type
-	 * @param topicName the topic name
-	 * 
-	 * @return the Topic Source
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicReaders for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 * @throws UnsupportedOperationException if the operation is not supported.
-	 */
-	public TopicSource getTopicSource(Topic.CommInfrastructure commType, 
-			                          String topicName) 
-			throws IllegalStateException, IllegalArgumentException, 
-			       UnsupportedOperationException;
-	
-	/**
-	 * get the UEB Topic Source for the given topic name
-	 * 
-	 * @param topicName the topic name
-	 * 
-	 * @return the UEB Topic Source
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicReaders for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSource getUebTopicSource(String topicName)
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * get the DMAAP Topic Source for the given topic name
-	 * 
-	 * @param topicName the topic name
-	 * 
-	 * @return the DMAAP Topic Source
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicReaders for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSource getDmaapTopicSource(String topicName)
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * get the Topic Sinks for the given topic name
-	 * 
-	 * @param topicNames the topic names
-	 * @return the Topic Sink List
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 */
-	public List<? extends TopicSink> getTopicSinks(List<String> topicNames) 
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * get the Topic Sinks for the given topic name and 
-	 * underlying communication infrastructure type
-	 * 
-	 * @param topicName the topic name
-	 * @param commType communication infrastructure type
-	 * 
-	 * @return the Topic Sink List
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicWriters for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public TopicSink getTopicSink(Topic.CommInfrastructure commType, 
-			                      String topicName) 
-			throws IllegalStateException, IllegalArgumentException,
-			       UnsupportedOperationException;
-	
-	/**
-	 * get the Topic Sinks for the given topic name and 
-	 * all the underlying communication infrastructure type
-	 * 
-	 * @param topicName the topic name
-	 * @param commType communication infrastructure type
-	 * 
-	 * @return the Topic Sink List
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicWriters for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<? extends TopicSink> getTopicSinks(String topicName) 
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * get the UEB Topic Source for the given topic name
-	 * 
-	 * @param topicName the topic name
-	 * 
-	 * @return the Topic Source
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicReaders for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSink getUebTopicSink(String topicName)
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * get the no-op Topic Sink for the given topic name
-	 * 
-	 * @param topicName the topic name
-	 * 
-	 * @return the Topic Source
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicReaders for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public NoopTopicSink getNoopTopicSink(String topicName)
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * get the DMAAP Topic Source for the given topic name
-	 * 
-	 * @param topicName the topic name
-	 * 
-	 * @return the Topic Source
-	 * @throws IllegalStateException if the entity is in an invalid state, for
-	 * example multiple TopicReaders for a topic name and communication infrastructure
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSink getDmaapTopicSink(String topicName)
-			throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * gets only the UEB Topic Sources
-	 * @return the UEB Topic Source List
-	 */
-	public List<UebTopicSource> getUebTopicSources();
-	
-	/**
-	 * gets only the DMAAP Topic Sources
-	 * @return the DMAAP Topic Source List
-	 */
-	public List<DmaapTopicSource> getDmaapTopicSources();
-	
-	/**
-	 * gets all Topic Sinks
-	 * @return the Topic Sink List
-	 */
-	public List<? extends TopicSink> getTopicSinks();
-	
-	/**
-	 * gets only the UEB Topic Sinks
-	 * @return the UEB Topic Sink List
-	 */
-	public List<UebTopicSink> getUebTopicSinks();
-	
-	/**
-	 * gets only the DMAAP Topic Sinks
-	 * @return the DMAAP Topic Sink List
-	 */
-	public List<DmaapTopicSink> getDmaapTopicSinks();
-	
-	/**
-	 * gets only the NOOP Topic Sinks
-	 * @return the NOOP Topic Sinks List
-	 */
-	public List<NoopTopicSink> getNoopTopicSinks();
-	
-	/**
-	 * singleton for global access
-	 */
-	public static final TopicEndpoint manager = new ProxyTopicEndpointManager();
-}
-
-/*
- * ----------------- implementation -------------------
- */
-
-/**
- * This implementation of the Topic Endpoint Manager, proxies operations to appropriate
- * implementations according to the communication infrastructure that are supported
- */
-class ProxyTopicEndpointManager implements TopicEndpoint {
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(ProxyTopicEndpointManager.class);
-	/**
-	 * Is this element locked?
-	 */
-	protected volatile boolean locked = false;
-	
-	/**
-	 * Is this element alive?
-	 */
-	protected volatile boolean alive = false;
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSource> addTopicSources(Properties properties) throws IllegalArgumentException {
-		
-		// 1. Create UEB Sources
-		// 2. Create DMAAP Sources
-		
-		List<TopicSource> sources = new ArrayList<TopicSource>();	
-		
-		sources.addAll(UebTopicSource.factory.build(properties));
-		sources.addAll(DmaapTopicSource.factory.build(properties));
-		
-		if (this.isLocked()) {
-			for (TopicSource source : sources) {
-				source.lock();
-			}
-		}
-		
-		return sources;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSink> addTopicSinks(Properties properties) throws IllegalArgumentException {
-		// 1. Create UEB Sinks
-		// 2. Create DMAAP Sinks
-		
-		List<TopicSink> sinks = new ArrayList<TopicSink>();	
-		
-		sinks.addAll(UebTopicSink.factory.build(properties));
-		sinks.addAll(DmaapTopicSink.factory.build(properties));
-		sinks.addAll(NoopTopicSink.factory.build(properties));
-		
-		if (this.isLocked()) {
-			for (TopicSink sink : sinks) {
-				sink.lock();
-			}
-		}
-		
-		return sinks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSource> getTopicSources() {
-	
-		List<TopicSource> sources = new ArrayList<TopicSource>();
-		
-		sources.addAll(UebTopicSource.factory.inventory());
-		sources.addAll(DmaapTopicSource.factory.inventory());
-		
-		return sources;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSink> getTopicSinks() {
-		
-		List<TopicSink> sinks = new ArrayList<TopicSink>();	
-		
-		sinks.addAll(UebTopicSink.factory.inventory());
-		sinks.addAll(DmaapTopicSink.factory.inventory());
-		sinks.addAll(NoopTopicSink.factory.inventory());
-		
-		return sinks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<UebTopicSource> getUebTopicSources() {
-		return UebTopicSource.factory.inventory();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<DmaapTopicSource> getDmaapTopicSources() {
-		return DmaapTopicSource.factory.inventory();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<UebTopicSink> getUebTopicSinks() {
-		return UebTopicSink.factory.inventory();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<DmaapTopicSink> getDmaapTopicSinks() {
-		return DmaapTopicSink.factory.inventory();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<NoopTopicSink> getNoopTopicSinks() {
-		return NoopTopicSink.factory.inventory();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {
-		
-		synchronized (this) {
-			if (this.locked) {
-				throw new IllegalStateException(this + " is locked");
-			}
-			
-			if (this.alive) {
-				return true;
-			}
-			
-			this.alive = true;
-		}
-		
-		List<Startable> endpoints = getEndpoints();
-		
-		boolean success = true;
-		for (Startable endpoint: endpoints) {
-			try {
-				success = endpoint.start() && success;
-			} catch (Exception e) {
-				success = false;
-				logger.error("Problem starting endpoint: {}", endpoint, e);
-			}
-		}
-		
-		return success;
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() throws IllegalStateException {
-		
-		/* 
-		 * stop regardless if it is locked, in other
-		 * words, stop operation has precedence over
-		 * locks.
-		 */
-		synchronized (this) {			
-			this.alive = false;
-		}
-		
-		List<Startable> endpoints = getEndpoints();
-		
-		boolean success = true;
-		for (Startable endpoint: endpoints) {
-			try {
-				success = endpoint.stop() && success;
-			} catch (Exception e) {
-				success = false;
-				logger.error("Problem stopping endpoint: {}", endpoint, e);
-			}
-		}
-		
-		return success;
-	}
-	
-	/**
-	 * 
-	 * @return list of managed endpoints
-	 */
-	@JsonIgnore
-	protected List<Startable> getEndpoints() {
-		List<Startable> endpoints = new ArrayList<Startable>();
-
-		endpoints.addAll(this.getTopicSources());
-		endpoints.addAll(this.getTopicSinks());
-		
-		return endpoints;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		UebTopicSource.factory.destroy();
-		UebTopicSink.factory.destroy();
-		
-		DmaapTopicSource.factory.destroy();
-		DmaapTopicSink.factory.destroy();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAlive() {
-		return this.alive;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean lock() {
-		
-		synchronized (this) {
-			if (locked)
-				return true;
-			
-			this.locked = true;
-		}
-		
-		for (TopicSource source: this.getTopicSources()) {
-			source.lock();
-		}
-		
-		for (TopicSink sink: this.getTopicSinks()) {
-			sink.lock();
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean unlock() {
-		synchronized (this) {
-			if (!locked)
-				return true;
-			
-			this.locked = false;
-		}
-		
-		for (TopicSource source: this.getTopicSources()) {
-			source.unlock();
-		}
-		
-		for (TopicSink sink: this.getTopicSinks()) {
-			sink.unlock();
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isLocked() {
-		return this.locked;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSource> getTopicSources(List<String> topicNames)
-			throws IllegalStateException, IllegalArgumentException {
-		
-		if (topicNames == null) {
-			throw new IllegalArgumentException("must provide a list of topics");
-		}
-		
-		List<TopicSource> sources = new ArrayList<TopicSource>();
-		for (String topic: topicNames) {
-			try {
-				TopicSource uebSource = this.getUebTopicSource(topic);
-				if (uebSource != null)
-					sources.add(uebSource);
-			} catch (Exception e) {
-				logger.info("No UEB source for topic: {}", topic);
-			}
-			
-			try {
-				TopicSource dmaapSource = this.getDmaapTopicSource(topic);
-				if (dmaapSource != null)
-					sources.add(dmaapSource);
-			} catch (Exception e) {
-				logger.info("No DMAAP source for topic: {}", topic);
-			}
-		}
-		return sources;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSink> getTopicSinks(List<String> topicNames)
-			throws IllegalStateException, IllegalArgumentException {
-		
-		if (topicNames == null) {
-			throw new IllegalArgumentException("must provide a list of topics");
-		}
-		
-		List<TopicSink> sinks = new ArrayList<TopicSink>();
-		for (String topic: topicNames) {
-			try {
-				TopicSink uebSink = this.getUebTopicSink(topic);
-				if (uebSink != null)
-					sinks.add(uebSink);
-			} catch (Exception e) {
-				logger.info("No UEB sink for topic: {}", topic);
-			}
-			
-			try {
-				TopicSink dmaapSink = this.getDmaapTopicSink(topic);
-				if (dmaapSink != null)
-					sinks.add(dmaapSink);
-			} catch (Exception e) {
-				logger.info("No DMAAP sink for topic: {}", topic);
-			}
-		}
-		return sinks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public TopicSource getTopicSource(Topic.CommInfrastructure commType, String topicName)
-			throws IllegalStateException, IllegalArgumentException, UnsupportedOperationException {
-		
-		if (commType == null) {
-			throw new IllegalArgumentException
-				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
-		}
-		
-		if (topicName == null) {
-			throw new IllegalArgumentException
-				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
-		}
-		
-		switch (commType) {
-		case UEB:
-			return this.getUebTopicSource(topicName);
-		case DMAAP:
-			return this.getDmaapTopicSource(topicName);
-		case REST:
-		default:
-			throw new UnsupportedOperationException("Unsupported " + commType.name());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public TopicSink getTopicSink(Topic.CommInfrastructure commType, String topicName)
-			throws IllegalStateException, IllegalArgumentException, UnsupportedOperationException {
-		if (commType == null) {
-			throw new IllegalArgumentException
-				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
-		}
-		
-		if (topicName == null) {
-			throw new IllegalArgumentException
-				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
-		}
-		
-		switch (commType) {
-		case UEB:
-			return this.getUebTopicSink(topicName);
-		case DMAAP:
-			return this.getDmaapTopicSink(topicName);
-		case REST:
-		default:
-			throw new UnsupportedOperationException("Unsupported " + commType.name());
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSink> getTopicSinks(String topicName) 
-			throws IllegalStateException, IllegalArgumentException {
-
-		if (topicName == null) {
-			throw new IllegalArgumentException
-				("Invalid parameter: a communication infrastructure required to fetch " + topicName);
-		}
-		
-		List<TopicSink> sinks = new ArrayList<TopicSink>();
-		
-		try {
-			sinks.add(this.getUebTopicSink(topicName));
-		} catch (Exception e) {
-			;
-		}
-		
-		try {
-			sinks.add(this.getDmaapTopicSink(topicName));
-		} catch (Exception e) {
-			;
-		}
-		
-		return sinks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSource getUebTopicSource(String topicName) throws IllegalStateException, IllegalArgumentException {
-		return UebTopicSource.factory.get(topicName);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSink getUebTopicSink(String topicName) throws IllegalStateException, IllegalArgumentException {
-		return UebTopicSink.factory.get(topicName);
-	}
-
-	@Override
-	public DmaapTopicSource getDmaapTopicSource(String topicName)
-			throws IllegalStateException, IllegalArgumentException {
-		return DmaapTopicSource.factory.get(topicName);
-	}
-
-	@Override
-	public DmaapTopicSink getDmaapTopicSink(String topicName) throws IllegalStateException, IllegalArgumentException {
-		return DmaapTopicSink.factory.get(topicName);
-	}
-
-	@Override
-	public NoopTopicSink getNoopTopicSink(String topicName) throws IllegalStateException, IllegalArgumentException {
-		return NoopTopicSink.factory.get(topicName);
-	}
-	
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java
deleted file mode 100644
index a3c2230d..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm;
-
-/**
- * Listener for event messages entering the Policy Engine
- */
-public interface TopicListener {
-	
-	/**
-	 * Notification of a new Event over a given Topic
-	 * 
-	 * @param commType communication infrastructure type
-	 * @param topic topic name
-	 * @param event event message as a string
-	 */
-	public void onTopicEvent(Topic.CommInfrastructure commType, String topic, String event);
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java
deleted file mode 100644
index 2ce8e9e7..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicRegisterable.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm;
-
-/**
- * Marks a Topic entity as registerable
- */
-public interface TopicRegisterable {
-	
-	/**
-	 * Register for notification of events with this Topic Entity
-	 * 
-	 * @param topicListener the listener of events
-	 */
-	public void register(TopicListener topicListener);
-	
-	/**
-	 * Unregisters for notification of events with this Topic Entity
-	 * 
-	 * @param topicListener the listener of events
-	 */
-	public void unregister(TopicListener topicListener);
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java
deleted file mode 100644
index c2c47798..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSink.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm;
-
-/**
- * Marks a given Topic Endpoint as able to send messages over a topic
- */
-public interface TopicSink extends Topic {
-	
-	/**
-	 * Sends a string message over this Topic Endpoint
-	 * 
-	 * @param message message to send
-	 * 
-	 * @return true if the send operation succeeded, false otherwise
-	 * @throws IllegalArgumentException an invalid message has been provided
-	 * @throws IllegalStateException the entity is in an state that prevents
-	 *         it from sending messages, for example, locked or stopped.
-	 */
-	public boolean send(String message) throws IllegalArgumentException, IllegalStateException;
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java
deleted file mode 100644
index 6d1cbda4..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/TopicSource.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm;
-
-/**
- * Marker for a Topic Entity, indicating that the entity is able to read
- * over a topic
- */
-public interface TopicSource extends Topic {
-	
-	/**
-	 * pushes an event into the source programatically
-	 * 
-	 * @param event the event in json format
-	 * @return true if it can be processed correctly, false otherwise
-	 */
-	public boolean offer(String event);
-
-}
\ No newline at end of file
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java
deleted file mode 100644
index 3afd0add..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/ApiKeyEnabled.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-/**
- * API
- */
-public interface ApiKeyEnabled {
-	/**
-	 * @return api key
-	 */
-	public String getApiKey();
-	
-	/**
-	 * @return api secret
-	 */
-	public String getApiSecret();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java
deleted file mode 100644
index 59525334..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSink.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-import org.openecomp.policy.drools.event.comm.TopicSink;
-
-/**
- * Topic Sink over Bus Infrastructure (DMAAP/UEB)
- */
-public interface BusTopicSink extends ApiKeyEnabled, TopicSink {
-	/**
-	 * Log Failures after X number of retries
-	 */
-	public static final int DEFAULT_LOG_SEND_FAILURES_AFTER = 1;
-	
-	/**
-	 * Sets the UEB partition key for published messages
-	 * 
-	 * @param partitionKey the partition key
-	 */
-	public void setPartitionKey(String partitionKey);
-	
-	/**
-	 * return the partition key in used by the system to publish messages
-	 * 
-	 * @return the partition key
-	 */
-	public String getPartitionKey();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java
deleted file mode 100644
index 6796fc0a..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/BusTopicSource.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-import org.openecomp.policy.drools.event.comm.TopicSource;
-
-/**
- * Generic Topic Source for UEB/DMAAP Communication Infrastructure
- *
- */
-public interface BusTopicSource extends ApiKeyEnabled, TopicSource {
-	
-	/**
-	 * Default Consumer Instance Value
-	 */
-	public static String DEFAULT_CONSUMER_INSTANCE = "0";
-	
-	/**
-	 * Default Timeout fetching in milliseconds
-	 */
-	public static int DEFAULT_TIMEOUT_MS_FETCH = 15000;
-	
-	/**
-	 * Default maximum number of messages fetch at the time
-	 */
-	public static int DEFAULT_LIMIT_FETCH = 100;
-	
-	/**
-	 * Definition of No Timeout fetching
-	 */
-	public static int NO_TIMEOUT_MS_FETCH = -1;
-	
-	/**
-	 * Definition of No limit fetching
-	 */
-	public static int NO_LIMIT_FETCH = -1;
-	
-	/**
-	 * gets the consumer group
-	 * 
-	 * @return consumer group
-	 */
-	public String getConsumerGroup();
-	
-	/**
-	 * gets the consumer instance
-	 * 
-	 * @return consumer instance
-	 */
-	public String getConsumerInstance();
-	
-	/**
-	 * gets the fetch timeout
-	 * 
-	 * @return fetch timeout
-	 */
-	public int getFetchTimeout();
-	
-	/**
-	 * gets the fetch limit
-	 * 
-	 * @return fetch limit
-	 */
-	public int getFetchLimit();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java
deleted file mode 100644
index 3c55c9f3..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSink.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-public interface DmaapTopicSink extends BusTopicSink {
-
-	/**
-	 * Factory of UebTopicWriter for instantiation and management purposes
-	 */
-	
-	public static final DmaapTopicSinkFactory factory = new IndexedDmaapTopicSinkFactory();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
deleted file mode 100644
index 8b8ca530..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSinkFactory.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.event.comm.bus.internal.InlineDmaapTopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-
-/**
- * DMAAP Topic Sink Factory
- */
-public interface DmaapTopicSinkFactory {
-	public final String DME2_READ_TIMEOUT_PROPERTY = "AFT_DME2_EP_READ_TIMEOUT_MS";
-	public final String DME2_EP_CONN_TIMEOUT_PROPERTY = "AFT_DME2_EP_CONN_TIMEOUT";
-	public final String DME2_ROUNDTRIP_TIMEOUT_PROPERTY = "AFT_DME2_ROUNDTRIP_TIMEOUT_MS";
-	public final String DME2_VERSION_PROPERTY = "Version";
-	public final String DME2_ROUTE_OFFER_PROPERTY = "routeOffer";
-	public final String DME2_SERVICE_NAME_PROPERTY = "ServiceName";
-	public final String DME2_SUBCONTEXT_PATH_PROPERTY = "SubContextPath";
-	public final String DME2_SESSION_STICKINESS_REQUIRED_PROPERTY = "sessionstickinessrequired";
-
-	/**
-	 * Instantiates a new DMAAP Topic Sink
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param userName AAF user name
-	 * @param password AAF password
-	 * @param partitionKey Consumer Group
-	 * @param environment DME2 environment
-	 * @param aftEnvironment DME2 AFT environment
-	 * @param partner DME2 Partner
-	 * @param latitude DME2 latitude
-	 * @param longitude DME2 longitude
-	 * @param additionalProps additional properties to pass to DME2
-	 * @param managed is this sink endpoint managed?
-	 * 
-	 * @return an DMAAP Topic Sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSink build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret,
-								String userName,
-								String password,
-								String partitionKey,
-								String environment,
-								String aftEnvironment,
-								String partner,
-								String latitude,
-								String longitude,
-								Map<String,String> additionalProps,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts) ;
-	
-	/**
-	 * Instantiates a new DMAAP Topic Sink
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param userName AAF user name
-	 * @param password AAF password
-	 * @param partitionKey Consumer Group
-	 * @param managed is this sink endpoint managed?
-	 * 
-	 * @return an DMAAP Topic Sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSink build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret,
-								String userName,
-								String password,
-								String partitionKey,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Creates an DMAAP Topic Sink based on properties files
-	 * 
-	 * @param properties Properties containing initialization values
-	 * 
-	 * @return an DMAAP Topic Sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<DmaapTopicSink> build(Properties properties)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new DMAAP Topic Sink
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * 
-	 * @return an DMAAP Topic Sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSink build(List<String> servers, String topic)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Destroys an DMAAP Topic Sink based on a topic
-	 * 
-	 * @param topic topic name
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public void destroy(String topic);
-
-	/**
-	 * gets an DMAAP Topic Sink based on topic name
-	 * @param topic the topic name
-	 * 
-	 * @return an DMAAP Topic Sink with topic name
-	 * @throws IllegalArgumentException if an invalid topic is provided
-	 * @throws IllegalStateException if the DMAAP Topic Reader is 
-	 * an incorrect state
-	 */
-	public DmaapTopicSink get(String topic)
-			   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Provides a snapshot of the DMAAP Topic Sinks
-	 * @return a list of the DMAAP Topic Sinks
-	 */
-	public List<DmaapTopicSink> inventory();
-
-	/**
-	 * Destroys all DMAAP Topic Sinks
-	 */
-	public void destroy();
-}
-
-/* ------------- implementation ----------------- */
-
-/**
- * Factory of DMAAP Reader Topics indexed by topic name
- */
-class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(IndexedDmaapTopicSinkFactory.class);	
-	
-	/**
-	 * DMAAP Topic Name Index
-	 */
-	protected HashMap<String, DmaapTopicSink> dmaapTopicWriters =
-			new HashMap<String, DmaapTopicSink>();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSink build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret,
-								String userName,
-								String password,
-								String partitionKey,
-								String environment,
-								String aftEnvironment,
-								String partner,
-								String latitude,
-								String longitude,
-								Map<String,String> additionalProps,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts) 
-			throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized (this) {
-			if (dmaapTopicWriters.containsKey(topic)) {
-				return dmaapTopicWriters.get(topic);
-			}
-			
-			DmaapTopicSink dmaapTopicSink = 
-					new InlineDmaapTopicSink(servers, topic, 
-										     apiKey, apiSecret,
-										     userName, password,
-										     partitionKey,
-										     environment, aftEnvironment, 
-										     partner, latitude, longitude, additionalProps, useHttps, allowSelfSignedCerts);
-			
-			if (managed)
-				dmaapTopicWriters.put(topic, dmaapTopicSink);
-			return dmaapTopicSink;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSink build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret,
-								String userName,
-								String password,
-								String partitionKey,
-								boolean managed,
-								boolean useHttps, boolean allowSelfSignedCerts) 
-			throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized (this) {
-			if (dmaapTopicWriters.containsKey(topic)) {
-				return dmaapTopicWriters.get(topic);
-			}
-			
-			DmaapTopicSink dmaapTopicSink = 
-					new InlineDmaapTopicSink(servers, topic, 
-										     apiKey, apiSecret,
-										     userName, password,
-										     partitionKey, useHttps, allowSelfSignedCerts);
-			
-			if (managed)
-				dmaapTopicWriters.put(topic, dmaapTopicSink);
-			return dmaapTopicSink;
-		}
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSink build(List<String> servers, String topic) throws IllegalArgumentException {
-		return this.build(servers, topic, null, null, null, null, null, true, false, false);
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<DmaapTopicSink> build(Properties properties) throws IllegalArgumentException {
-		
-		String writeTopics = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS);
-		if (writeTopics == null || writeTopics.isEmpty()) {
-			logger.info("{}: no topic for DMaaP Sink", this);
-			return new ArrayList<DmaapTopicSink>();
-		}
-		
-		List<String> writeTopicList = new ArrayList<String>(Arrays.asList(writeTopics.split("\\s*,\\s*")));
-		List<DmaapTopicSink> newDmaapTopicSinks = new ArrayList<DmaapTopicSink>();
-		synchronized(this) {
-			for (String topic: writeTopicList) {
-				if (this.dmaapTopicWriters.containsKey(topic)) {
-					newDmaapTopicSinks.add(this.dmaapTopicWriters.get(topic));
-					continue;
-				}
-				String servers = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + 
-				                                        topic + 
-				                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
-				
-				List<String> serverList;
-				if (servers != null && !servers.isEmpty()) serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
-				else serverList = new ArrayList<>();
-				
-				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
-						                               "." + topic + 
-						                               PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);		 
-				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
-                                                          "." + topic + 
-                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);
-				
-				String aafMechId = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
-                                                          "." + topic + 
-                                                          PolicyProperties.PROPERTY_TOPIC_AAF_MECHID_SUFFIX);
-				String aafPassword = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
-         				                                    "." + topic + 
-         				                                    PolicyProperties.PROPERTY_TOPIC_AAF_PASSWORD_SUFFIX);
-				
-				String partitionKey = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + 
-                                                             "." + topic + 
-                                                             PolicyProperties.PROPERTY_TOPIC_SINK_PARTITION_KEY_SUFFIX);
-				
-				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + topic +
-						                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
-				
-				/* DME2 Properties */
-				
-				String dme2Environment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX);
-
-				String dme2AftEnvironment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX);
-
-				String dme2Partner = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX);
-				
-				String dme2RouteOffer = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX);
-
-				String dme2Latitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX);
-
-				String dme2Longitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX);
-
-				String dme2EpReadTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX);
-
-				String dme2EpConnTimeout = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX);
-
-				String dme2RoundtripTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS
-						+ "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUNDTRIP_TIMEOUT_MS_SUFFIX);
-
-				String dme2Version = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_VERSION_SUFFIX);
-
-				String dme2SubContextPath = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_SUB_CONTEXT_PATH_SUFFIX);
-
-				String dme2SessionStickinessRequired = properties
-						.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic
-								+ PolicyProperties.PROPERTY_DMAAP_DME2_SESSION_STICKINESS_REQUIRED_SUFFIX);
-				
-				Map<String,String> dme2AdditionalProps = new HashMap<>();
-				
-				if (dme2EpReadTimeoutMs != null && !dme2EpReadTimeoutMs.isEmpty())
-					dme2AdditionalProps.put(DME2_READ_TIMEOUT_PROPERTY, dme2EpReadTimeoutMs);
-				if (dme2EpConnTimeout != null && !dme2EpConnTimeout.isEmpty())
-					dme2AdditionalProps.put(DME2_EP_CONN_TIMEOUT_PROPERTY, dme2EpConnTimeout);
-				if (dme2RoundtripTimeoutMs != null && !dme2RoundtripTimeoutMs.isEmpty())
-					dme2AdditionalProps.put(DME2_ROUNDTRIP_TIMEOUT_PROPERTY, dme2RoundtripTimeoutMs);
-				if (dme2Version != null && !dme2Version.isEmpty())
-					dme2AdditionalProps.put(DME2_VERSION_PROPERTY, dme2Version);
-				if (dme2RouteOffer != null && !dme2RouteOffer.isEmpty())
-					dme2AdditionalProps.put(DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
-				if (dme2SubContextPath != null && !dme2SubContextPath.isEmpty())
-					dme2AdditionalProps.put(DME2_SUBCONTEXT_PATH_PROPERTY, dme2SubContextPath);
-				if (dme2SessionStickinessRequired != null && !dme2SessionStickinessRequired.isEmpty())
-					dme2AdditionalProps.put(DME2_SESSION_STICKINESS_REQUIRED_PROPERTY, dme2SessionStickinessRequired);
-
-				if (servers == null || servers.isEmpty()) {
-					logger.error("{}: no DMaaP servers or DME2 ServiceName provided", this);
-					continue;
-				}
-				
-				boolean managed = true;
-				if (managedString != null && !managedString.isEmpty()) {
-					managed = Boolean.parseBoolean(managedString);
-				}
-				
-				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
-
-				//default is to use HTTP if no https property exists
-				boolean useHttps = false;
-				if (useHttpsString != null && !useHttpsString.isEmpty()){
-					useHttps = Boolean.parseBoolean(useHttpsString);
-				}
-				
-				
-				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
-
-					//default is to disallow self-signed certs 
-				boolean allowSelfSignedCerts = false;
-				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
-					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
-				}				
-				
-				DmaapTopicSink dmaapTopicSink = this.build(serverList, topic, 
-						   						           apiKey, apiSecret,
-						   						           aafMechId, aafPassword,
-						   						           partitionKey,
-						   						           dme2Environment, dme2AftEnvironment,
-						   						           dme2Partner, dme2Latitude, dme2Longitude,
-						   						           dme2AdditionalProps, managed, useHttps, allowSelfSignedCerts);
-				
-				newDmaapTopicSinks.add(dmaapTopicSink);
-			}
-			return newDmaapTopicSinks;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(String topic) 
-		   throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		DmaapTopicSink dmaapTopicWriter;
-		synchronized(this) {
-			if (!dmaapTopicWriters.containsKey(topic)) {
-				return;
-			}
-			
-			dmaapTopicWriter = dmaapTopicWriters.remove(topic);
-		}
-		
-		dmaapTopicWriter.shutdown();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy() {
-		List<DmaapTopicSink> writers = this.inventory();
-		for (DmaapTopicSink writer: writers) {
-			writer.shutdown();
-		}
-		
-		synchronized(this) {
-			this.dmaapTopicWriters.clear();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSink get(String topic) 
-			throws IllegalArgumentException, IllegalStateException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (dmaapTopicWriters.containsKey(topic)) {
-				return dmaapTopicWriters.get(topic);
-			} else {
-				throw new IllegalStateException("DmaapTopicSink for " + topic + " not found");
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized List<DmaapTopicSink> inventory() {
-		 List<DmaapTopicSink> writers = 
-				 new ArrayList<DmaapTopicSink>(this.dmaapTopicWriters.values());
-		 return writers;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("IndexedDmaapTopicSinkFactory []");
-		return builder.toString();
-	}
-	
-}
\ No newline at end of file
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java
deleted file mode 100644
index 8da7906a..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSource.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-public interface DmaapTopicSource extends BusTopicSource {
-
-	/**
-	 * factory for managing and tracking DMAAP sources
-	 */
-	public static DmaapTopicSourceFactory factory = new IndexedDmaapTopicSourceFactory();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
deleted file mode 100644
index 89793d28..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/DmaapTopicSourceFactory.java
+++ /dev/null
@@ -1,598 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.event.comm.bus.internal.SingleThreadedDmaapTopicSource;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-
-/**
- * DMAAP Topic Source Factory
- */
-public interface DmaapTopicSourceFactory {
-	public final String DME2_READ_TIMEOUT_PROPERTY = "AFT_DME2_EP_READ_TIMEOUT_MS";
-	public final String DME2_EP_CONN_TIMEOUT_PROPERTY = "AFT_DME2_EP_CONN_TIMEOUT";
-	public final String DME2_ROUNDTRIP_TIMEOUT_PROPERTY = "AFT_DME2_ROUNDTRIP_TIMEOUT_MS";
-	public final String DME2_VERSION_PROPERTY = "Version";
-	public final String DME2_ROUTE_OFFER_PROPERTY = "routeOffer";
-	public final String DME2_SERVICE_NAME_PROPERTY = "ServiceName";
-	public final String DME2_SUBCONTEXT_PATH_PROPERTY = "SubContextPath";
-	public final String DME2_SESSION_STICKINESS_REQUIRED_PROPERTY = "sessionstickinessrequired";
-	
-	/**
-	 * Creates an DMAAP Topic Source based on properties files
-	 * 
-	 * @param properties Properties containing initialization values
-	 * 
-	 * @return an DMAAP Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<DmaapTopicSource> build(Properties properties)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new DMAAP Topic Source
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param userName user name
-	 * @param password password
-	 * @param consumerGroup Consumer Group
-	 * @param consumerInstance Consumer Instance
-	 * @param fetchTimeout Read Fetch Timeout
-	 * @param fetchLimit Fetch Limit
-	 * @param managed is this endpoind managed?
-	 * @param useHttps does the connection use HTTPS?
-	 * @param allowSelfSignedCerts does connection allow self-signed certificates?
-	 * 
-	 * @return an DMAAP Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret, 
-								String userName, 
-								String password,
-								String consumerGroup, 
-								String consumerInstance,
-								int fetchTimeout,
-								int fetchLimit,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new DMAAP Topic Source
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param userName user name
-	 * @param password password
-	 * @param consumerGroup Consumer Group
-	 * @param consumerInstance Consumer Instance
-	 * @param fetchTimeout Read Fetch Timeout
-	 * @param fetchLimit Fetch Limit
-	 * @param environment DME2 environment
-	 * @param aftEnvironment DME2 AFT environment
-	 * @param partner DME2 Partner
-	 * @param latitude DME2 latitude
-	 * @param longitude DME2 longitude
-	 * @param additionalProps additional properties to pass to DME2
-	 * @param managed is this endpoind managed?
-	 * @param useHttps does the connection use HTTPS?
-	 * @param allowSelfSignedCerts does connection allow self-signed certificates?
-	 * 
-	 * @return an DMAAP Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret, 
-								String userName, 
-								String password,
-								String consumerGroup, 
-								String consumerInstance,
-								int fetchTimeout,
-								int fetchLimit,
-								String environment,
-								String aftEnvironment,
-								String partner,
-								String latitude,
-								String longitude,
-								Map<String,String> additionalProps,
-								boolean managed,
-								boolean useHttps, 
-								boolean allowSelfSignedCerts)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new DMAAP Topic Source
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * 
-	 * @return an DMAAP Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret)
-			throws IllegalArgumentException;
-
-	/**
-	 * Instantiates a new DMAAP Topic Source
-	 * 
-	 * @param uebTopicReaderType Implementation type
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * 
-	 * @return an DMAAP Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public DmaapTopicSource build(List<String> servers,
-								String topic)
-			throws IllegalArgumentException;	
-	
-	/**
-	 * Destroys an DMAAP Topic Source based on a topic
-	 * 
-	 * @param topic topic name
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public void destroy(String topic);
-	
-	/**
-	 * Destroys all DMAAP Topic Sources
-	 */
-	public void destroy();
-	
-	/**
-	 * gets an DMAAP Topic Source based on topic name
-	 * @param topic the topic name
-	 * @return an DMAAP Topic Source with topic name
-	 * @throws IllegalArgumentException if an invalid topic is provided
-	 * @throws IllegalStateException if the DMAAP Topic Source is 
-	 * an incorrect state
-	 */
-	public DmaapTopicSource get(String topic)
-		   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Provides a snapshot of the DMAAP Topic Sources
-	 * @return a list of the DMAAP Topic Sources
-	 */
-	public List<DmaapTopicSource> inventory();
-}
-
-
-/* ------------- implementation ----------------- */
-
-/**
- * Factory of DMAAP Source Topics indexed by topic name
- */
-
-class IndexedDmaapTopicSourceFactory implements DmaapTopicSourceFactory {
-	/**
-	 * Logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(IndexedDmaapTopicSourceFactory.class);	
-	
-	/**
-	 * DMaaP Topic Name Index
-	 */
-	protected HashMap<String, DmaapTopicSource> dmaapTopicSources =
-			new HashMap<String, DmaapTopicSource>();
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret, 
-								String userName, 
-								String password,
-								String consumerGroup, 
-								String consumerInstance,
-								int fetchTimeout,
-								int fetchLimit,
-								String environment,
-								String aftEnvironment,
-								String partner,
-								String latitude,
-								String longitude,
-								Map<String,String> additionalProps,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts) 
-			throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (dmaapTopicSources.containsKey(topic)) {
-				return dmaapTopicSources.get(topic);
-			}
-			
-			DmaapTopicSource dmaapTopicSource = 
-					new SingleThreadedDmaapTopicSource(servers, topic, 
-													 apiKey, apiSecret, userName, password,
-													 consumerGroup, consumerInstance, 
-													 fetchTimeout, fetchLimit,
-													 environment, aftEnvironment, partner,
-													 latitude, longitude, additionalProps, useHttps, allowSelfSignedCerts);
-			
-			if (managed)
-				dmaapTopicSources.put(topic, dmaapTopicSource);
-			
-			return dmaapTopicSource;
-		}
-	}
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret, 
-								String userName, 
-								String password,
-								String consumerGroup, 
-								String consumerInstance,
-								int fetchTimeout,
-								int fetchLimit,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts) 
-			throws IllegalArgumentException {
-		
-		if (servers == null || servers.isEmpty()) {
-			throw new IllegalArgumentException("DMaaP Server(s) must be provided");
-		}
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (dmaapTopicSources.containsKey(topic)) {
-				return dmaapTopicSources.get(topic);
-			}
-			
-			DmaapTopicSource dmaapTopicSource = 
-					new SingleThreadedDmaapTopicSource(servers, topic, 
-													 apiKey, apiSecret, userName, password,
-													 consumerGroup, consumerInstance, 
-													 fetchTimeout, fetchLimit, useHttps,allowSelfSignedCerts);
-			
-			if (managed)
-				dmaapTopicSources.put(topic, dmaapTopicSource);
-			
-			return dmaapTopicSource;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<DmaapTopicSource> build(Properties properties) 
-			throws IllegalArgumentException {
-		
-		String readTopics = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS);
-		if (readTopics == null || readTopics.isEmpty()) {
-			logger.info("{}: no topic for DMaaP Source", this);
-			return new ArrayList<DmaapTopicSource>();
-		}
-		List<String> readTopicList = new ArrayList<String>(Arrays.asList(readTopics.split("\\s*,\\s*")));		
-		
-		List<DmaapTopicSource> dmaapTopicSource_s = new ArrayList<DmaapTopicSource>();
-		synchronized(this) {
-			for (String topic: readTopicList) {
-				if (this.dmaapTopicSources.containsKey(topic)) {
-					dmaapTopicSource_s.add(this.dmaapTopicSources.get(topic));
-					continue;
-				}
-				
-				String servers = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + 
-                                                        topic + 
-                                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
-				
-				List<String> serverList;
-				if (servers != null && !servers.isEmpty()) serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
-				else serverList = new ArrayList<>();
-				
-				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-                        							   "." + topic + 
-                                                       PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);
-				
-				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-						                                  "." + topic + 
-                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);
-				
-				String aafMechId = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-								                          "." + topic + 
-								                          PolicyProperties.PROPERTY_TOPIC_AAF_MECHID_SUFFIX);
-
-				String aafPassword = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-				                           				  "." + topic + 
-				                           				  PolicyProperties.PROPERTY_TOPIC_AAF_PASSWORD_SUFFIX);
-				
-				String consumerGroup = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-						                                      "." + topic + 
-                                                              PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX);
-				
-				String consumerInstance = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-						                                         "." + topic + 
-                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX);
-				
-				String fetchTimeoutString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-						                                           "." + topic + 
-                                                                   PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
-				
-				/* DME2 Properties */
-				
-				String dme2Environment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX);
-
-				String dme2AftEnvironment = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX);
-
-				String dme2Partner = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX);
-				
-				String dme2RouteOffer = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX);
-
-				String dme2Latitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX);
-
-				String dme2Longitude = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX);
-
-				String dme2EpReadTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX);
-
-				String dme2EpConnTimeout = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX);
-
-				String dme2RoundtripTimeoutMs = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS
-						+ "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUNDTRIP_TIMEOUT_MS_SUFFIX);
-
-				String dme2Version = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
-						+ PolicyProperties.PROPERTY_DMAAP_DME2_VERSION_SUFFIX);
-
-				String dme2SubContextPath = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "."
-						+ topic + PolicyProperties.PROPERTY_DMAAP_DME2_SUB_CONTEXT_PATH_SUFFIX);
-
-				String dme2SessionStickinessRequired = properties
-						.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic
-								+ PolicyProperties.PROPERTY_DMAAP_DME2_SESSION_STICKINESS_REQUIRED_SUFFIX);
-				
-				Map<String,String> dme2AdditionalProps = new HashMap<>();
-				
-				if (dme2EpReadTimeoutMs != null && !dme2EpReadTimeoutMs.isEmpty())
-					dme2AdditionalProps.put(DME2_READ_TIMEOUT_PROPERTY, dme2EpReadTimeoutMs);
-				if (dme2EpConnTimeout != null && !dme2EpConnTimeout.isEmpty())
-					dme2AdditionalProps.put(DME2_EP_CONN_TIMEOUT_PROPERTY, dme2EpConnTimeout);
-				if (dme2RoundtripTimeoutMs != null && !dme2RoundtripTimeoutMs.isEmpty())
-					dme2AdditionalProps.put(DME2_ROUNDTRIP_TIMEOUT_PROPERTY, dme2RoundtripTimeoutMs);
-				if (dme2Version != null && !dme2Version.isEmpty())
-					dme2AdditionalProps.put(DME2_VERSION_PROPERTY, dme2Version);
-				if (dme2RouteOffer != null && !dme2RouteOffer.isEmpty())
-					dme2AdditionalProps.put(DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
-				if (dme2SubContextPath != null && !dme2SubContextPath.isEmpty())
-					dme2AdditionalProps.put(DME2_SUBCONTEXT_PATH_PROPERTY, dme2SubContextPath);
-				if (dme2SessionStickinessRequired != null && !dme2SessionStickinessRequired.isEmpty())
-					dme2AdditionalProps.put(DME2_SESSION_STICKINESS_REQUIRED_PROPERTY, dme2SessionStickinessRequired);
-				
-				
-				if (servers == null || servers.isEmpty()) {
-
-					logger.error("{}: no DMaaP servers or DME2 ServiceName provided", this);
-					continue;
-				}
-				
-				int fetchTimeout = DmaapTopicSource.DEFAULT_TIMEOUT_MS_FETCH;
-				if (fetchTimeoutString != null && !fetchTimeoutString.isEmpty()) {
-					try {
-						fetchTimeout = Integer.parseInt(fetchTimeoutString);
-					} catch (NumberFormatException nfe) {
-						logger.warn("{}: fetch timeout {} is in invalid format for topic {} ", 
-								    this, fetchTimeoutString, topic);
-					}
-				}
-					
-				String fetchLimitString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-                                                                 "." + topic + 
-                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
-				int fetchLimit = DmaapTopicSource.DEFAULT_LIMIT_FETCH;
-				if (fetchLimitString != null && !fetchLimitString.isEmpty()) {
-					try {
-						fetchLimit = Integer.parseInt(fetchLimitString);
-					} catch (NumberFormatException nfe) {
-						logger.warn("{}: fetch limit {} is in invalid format for topic {} ", 
-							        this, fetchLimitString, topic);
-					}
-				}
-				
-				String managedString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + 
-                                                               "." + topic + 
-                                                              PolicyProperties.PROPERTY_MANAGED_SUFFIX);
-				boolean managed = true;
-				if (managedString != null && !managedString.isEmpty()) {
-					managed = Boolean.parseBoolean(managedString);
-				}
-				
-				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
-
-					//default is to use HTTP if no https property exists
-				boolean useHttps = false;
-				if (useHttpsString != null && !useHttpsString.isEmpty()){
-					useHttps = Boolean.parseBoolean(useHttpsString);
-				}
-				
-				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
-
-					//default is to disallow self-signed certs 
-				boolean allowSelfSignedCerts = false;
-				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
-					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
-				}				
-				
-				
-				DmaapTopicSource uebTopicSource = this.build(serverList, topic, 
-						   						           apiKey, apiSecret, aafMechId, aafPassword,
-						   						           consumerGroup, consumerInstance, 
-						   						           fetchTimeout, fetchLimit, 
-						   						           dme2Environment, dme2AftEnvironment, dme2Partner,
-						   						           dme2Latitude, dme2Longitude, dme2AdditionalProps,
-						   						           managed, useHttps, allowSelfSignedCerts);
-				
-				dmaapTopicSource_s.add(uebTopicSource);
-			}
-		}
-		return dmaapTopicSource_s;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 * @throws IllegalArgumentException 
-	 */
-	@Override
-	public DmaapTopicSource build(List<String> servers, 
-								String topic,
-								String apiKey, 
-								String apiSecret) throws IllegalArgumentException {
-		return this.build(servers, topic, 
-				  		  apiKey, apiSecret, null, null,
-				  		  null, null,
-				  		  DmaapTopicSource.DEFAULT_TIMEOUT_MS_FETCH,
-				  		  DmaapTopicSource.DEFAULT_LIMIT_FETCH,
-				  		  true,
-				  		  false,
-				  		  false);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @throws IllegalArgumentException 
-	 */
-	@Override
-	public DmaapTopicSource build(List<String> servers, String topic) throws IllegalArgumentException {
-		return this.build(servers, topic, null, null);
-	}	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(String topic) 
-		   throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		DmaapTopicSource uebTopicSource;
-		
-		synchronized(this) {
-			if (!dmaapTopicSources.containsKey(topic)) {
-				return;
-			}
-			
-			uebTopicSource = dmaapTopicSources.remove(topic);
-		}
-		
-		uebTopicSource.shutdown();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DmaapTopicSource get(String topic) 
-	       throws IllegalArgumentException, IllegalStateException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (dmaapTopicSources.containsKey(topic)) {
-				return dmaapTopicSources.get(topic);
-			} else {
-				throw new IllegalArgumentException("DmaapTopiceSource for " + topic + " not found");
-			}
-		}
-	}
-
-	@Override
-	public synchronized List<DmaapTopicSource> inventory() {
-		 List<DmaapTopicSource> readers = 
-				 new ArrayList<DmaapTopicSource>(this.dmaapTopicSources.values());
-		 return readers;
-	}
-
-	@Override
-	public void destroy() {
-		List<DmaapTopicSource> readers = this.inventory();
-		for (DmaapTopicSource reader: readers) {
-			reader.shutdown();
-		}
-		
-		synchronized(this) {
-			this.dmaapTopicSources.clear();
-		}
-	}
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("IndexedDmaapTopicSourceFactory []");
-		return builder.toString();
-	}
-	
-}
-
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java
deleted file mode 100644
index e9d503e2..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSink.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.event.comm.bus;
-
-import java.util.List;
-
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.bus.internal.TopicBase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * NOOP topic sink 
- */
-public class NoopTopicSink extends TopicBase implements TopicSink {
-	
-	/**
-	 * factory
-	 */
-	public static final NoopTopicSinkFactory factory = new IndexedNoopTopicSinkFactory();
-
-	/**
-	 * logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(NoopTopicSink.class);
-	
-	/**
-	 * net logger
-	 */
-	private static final Logger netLogger = LoggerFactory.getLogger(NETWORK_LOGGER);
-	
-	/**
-	 * constructor
-	 * @param servers  servers
-	 * @param topic topic
-	 * @throws IllegalArgumentException if an invalid argument has been passed in
-	 */
-	public NoopTopicSink(List<String> servers, String topic) throws IllegalArgumentException {
-		super(servers, topic);
-	}
-
-	@Override
-	public boolean send(String message) throws IllegalArgumentException, IllegalStateException {
-		
-		if (message == null || message.isEmpty())
-			throw new IllegalArgumentException("Message to send is empty");
-
-		if (!this.alive)
-			throw new IllegalStateException(this + " is stopped");
-		
-		try {
-			synchronized (this) {
-				this.recentEvents.add(message);
-			}
-			
-			netLogger.info("[OUT|{}|{}]{}{}", this.getTopicCommInfrastructure(), 
-			               this.topic, System.lineSeparator(), message);
-			
-			broadcast(message);
-		} catch (Exception e) {
-			logger.warn("{}: cannot send because of {}", this, e.getMessage(), e);
-			return false;
-		}
-		
-		return true;
-	}
-
-	@Override
-	public CommInfrastructure getTopicCommInfrastructure() {
-		return CommInfrastructure.NOOP;
-	}
-
-	@Override
-	public boolean start() throws IllegalStateException {
-		logger.info("{}: starting", this);
-		
-		synchronized(this) {
-			
-			if (this.alive)
-				return true;
-			
-			if (locked)
-				throw new IllegalStateException(this + " is locked.");
-			
-			this.alive = true;
-		}
-				
-		return true;
-	}
-
-	@Override
-	public boolean stop() throws IllegalStateException {
-		synchronized(this) {
-			this.alive = false;
-		}
-		return true;
-	}
-
-	@Override
-	public void shutdown() throws IllegalStateException {
-		this.stop();
-	}
-
-	@Override
-	public String toString() {
-		return "NoopTopicSink [toString()=" + super.toString() + "]";
-	}
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
deleted file mode 100644
index 788ea683..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/NoopTopicSinkFactory.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.event.comm.bus;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Noop Topic Sink Factory
- */
-public interface NoopTopicSinkFactory {
-	
-	/**
-	 * Creates noop topic sinks based on properties files
-	 * 
-	 * @param properties Properties containing initialization values
-	 * 
-	 * @return a noop topic sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<NoopTopicSink> build(Properties properties) 
-			throws IllegalArgumentException;
-
-	/**
-	 * builds a noop sink
-	 *  
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param managed is this sink endpoint managed?
-	 * @return a noop topic sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public NoopTopicSink build(List<String> servers, String topic, boolean managed) 
-			throws IllegalArgumentException;
-	
-	/**
-	 * Destroys a sink based on the topic
-	 * 
-	 * @param topic topic name
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public void destroy(String topic);
-
-	/**
-	 * gets a sink based on topic name
-	 * @param topic the topic name
-	 * 
-	 * @return a sink with topic name
-	 * @throws IllegalArgumentException if an invalid topic is provided
-	 * @throws IllegalStateException if the sink is in an incorrect state
-	 */
-	public NoopTopicSink get(String topic)
-			   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Provides a snapshot of the UEB Topic Writers
-	 * @return a list of the UEB Topic Writers
-	 */
-	public List<NoopTopicSink> inventory();
-
-	/**
-	 * Destroys all sinks
-	 */
-	public void destroy();
-}
-
-/* ------------- implementation ----------------- */
-
-/**
- * Factory of noop sinks
- */
-class IndexedNoopTopicSinkFactory implements NoopTopicSinkFactory {
-	/**
-	 * Logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSinkFactory.class);	
-	
-	/**
-	 * noop topic sinks map
-	 */
-	protected HashMap<String, NoopTopicSink> noopTopicSinks = new HashMap<String, NoopTopicSink>();
-
-	@Override
-	public List<NoopTopicSink> build(Properties properties) throws IllegalArgumentException {
-		
-		String sinkTopics = properties.getProperty(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS);
-		if (sinkTopics == null || sinkTopics.isEmpty()) {
-			logger.info("{}: no topic for noop sink", this);
-			return new ArrayList<NoopTopicSink>();
-		}
-		
-		List<String> sinkTopicList = new ArrayList<String>(Arrays.asList(sinkTopics.split("\\s*,\\s*")));
-		List<NoopTopicSink> newSinks = new ArrayList<NoopTopicSink>();
-		synchronized(this) {
-			for (String topic: sinkTopicList) {
-				if (this.noopTopicSinks.containsKey(topic)) {
-					newSinks.add(this.noopTopicSinks.get(topic));
-					continue;
-				}
-				
-				String servers = properties.getProperty(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS + "." + 
-				                                        topic + 
-				                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
-				
-				if (servers == null || servers.isEmpty()) 
-					servers = "noop";
-				
-				List<String> serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
-				
-				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + topic +
-						                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
-				boolean managed = true;
-				if (managedString != null && !managedString.isEmpty()) {
-					managed = Boolean.parseBoolean(managedString);
-				}			
-				
-				NoopTopicSink noopSink = this.build(serverList, topic, managed);
-				newSinks.add(noopSink);
-			}
-			return newSinks;
-		}
-	}
-
-	@Override
-	public NoopTopicSink build(List<String> servers, String topic, boolean managed) throws IllegalArgumentException {
-		if (servers == null) {
-			servers = new ArrayList<>();
-		}
-		
-		if (servers.isEmpty()) {
-			servers.add("noop");
-		}
-
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized (this) {
-			if (noopTopicSinks.containsKey(topic)) {
-				return noopTopicSinks.get(topic);
-			}
-			
-			NoopTopicSink sink = 
-					new NoopTopicSink(servers, topic);
-			
-			if (managed)
-				noopTopicSinks.put(topic, sink);
-			
-			return sink;
-		}
-	}
-
-	@Override
-	public void destroy(String topic) {		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		NoopTopicSink noopSink;
-		synchronized(this) {
-			if (!noopTopicSinks.containsKey(topic)) {
-				return;
-			}
-			
-			noopSink = noopTopicSinks.remove(topic);
-		}
-		
-		noopSink.shutdown();
-	}
-	
-	@Override
-	public void destroy() {
-		List<NoopTopicSink> sinks = this.inventory();
-		for (NoopTopicSink sink: sinks) {
-			sink.shutdown();
-		}
-		
-		synchronized(this) {
-			this.noopTopicSinks.clear();
-		}
-	}
-
-	@Override
-	public NoopTopicSink get(String topic) throws IllegalArgumentException, IllegalStateException {
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (noopTopicSinks.containsKey(topic)) {
-				return noopTopicSinks.get(topic);
-			} else {
-				throw new IllegalStateException("DmaapTopicSink for " + topic + " not found");
-			}
-		}
-	}
-
-	@Override
-	public List<NoopTopicSink> inventory() {
-		 return new ArrayList<>(this.noopTopicSinks.values());
-	}
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java
deleted file mode 100644
index 3966d1ff..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSink.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-/**
- * Topic Writer over UEB Infrastructure
- */
-public interface UebTopicSink extends BusTopicSink {
-	
-	/**
-	 * Factory of UEB Topic Sinks for instantiation and management purposes
-	 */
-	public static final UebTopicSinkFactory factory = new IndexedUebTopicSinkFactory();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java
deleted file mode 100644
index 58d5dff5..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSinkFactory.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.event.comm.bus.internal.InlineUebTopicSink;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-
-/**
- * UEB Topic Sink Factory
- */
-public interface UebTopicSinkFactory {
-	
-	/**
-	 * Instantiates a new UEB Topic Writer
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param partitionKey Consumer Group
-	 * @param managed is this sink endpoint managed?
-	 * 
-	 * @return an UEB Topic Sink
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSink build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret,
-								String partitionKey,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Creates an UEB Topic Writer based on properties files
-	 * 
-	 * @param properties Properties containing initialization values
-	 * 
-	 * @return an UEB Topic Writer
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<UebTopicSink> build(Properties properties)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new UEB Topic Writer
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * 
-	 * @return an UEB Topic Writer
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSink build(List<String> servers, String topic)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Destroys an UEB Topic Writer based on a topic
-	 * 
-	 * @param topic topic name
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public void destroy(String topic);
-
-	/**
-	 * gets an UEB Topic Writer based on topic name
-	 * @param topic the topic name
-	 * 
-	 * @return an UEB Topic Writer with topic name
-	 * @throws IllegalArgumentException if an invalid topic is provided
-	 * @throws IllegalStateException if the UEB Topic Reader is 
-	 * an incorrect state
-	 */
-	public UebTopicSink get(String topic)
-			   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Provides a snapshot of the UEB Topic Writers
-	 * @return a list of the UEB Topic Writers
-	 */
-	public List<UebTopicSink> inventory();
-
-	/**
-	 * Destroys all UEB Topic Writers
-	 */
-	public void destroy();
-}
-
-/* ------------- implementation ----------------- */
-
-/**
- * Factory of UEB Reader Topics indexed by topic name
- */
-class IndexedUebTopicSinkFactory implements UebTopicSinkFactory {
-	/**
-	 * Logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSinkFactory.class);	
-	
-	/**
-	 * UEB Topic Name Index
-	 */
-	protected HashMap<String, UebTopicSink> uebTopicSinks =
-			new HashMap<String, UebTopicSink>();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSink build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret,
-								String partitionKey,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts) 
-			throws IllegalArgumentException {
-		
-		if (servers == null || servers.isEmpty()) {
-			throw new IllegalArgumentException("UEB Server(s) must be provided");
-		}
-
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized (this) {
-			if (uebTopicSinks.containsKey(topic)) {
-				return uebTopicSinks.get(topic);
-			}
-			
-			UebTopicSink uebTopicWriter = 
-					new InlineUebTopicSink(servers, topic, 
-										   apiKey, apiSecret,partitionKey, useHttps, allowSelfSignedCerts);
-			
-			if (managed)
-				uebTopicSinks.put(topic, uebTopicWriter);
-			
-			return uebTopicWriter;
-		}
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSink build(List<String> servers, String topic) throws IllegalArgumentException {	
-		return this.build(servers, topic, null, null, null, true, false, false);
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<UebTopicSink> build(Properties properties) throws IllegalArgumentException {
-		
-		String writeTopics = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS);
-		if (writeTopics == null || writeTopics.isEmpty()) {
-			logger.info("{}: no topic for UEB Sink", this);
-			return new ArrayList<UebTopicSink>();
-		}
-		
-		List<String> writeTopicList = new ArrayList<String>(Arrays.asList(writeTopics.split("\\s*,\\s*")));
-		List<UebTopicSink> newUebTopicSinks = new ArrayList<UebTopicSink>();
-		synchronized(this) {
-			for (String topic: writeTopicList) {
-				if (this.uebTopicSinks.containsKey(topic)) {
-					newUebTopicSinks.add(this.uebTopicSinks.get(topic));
-					continue;
-				}
-				
-				String servers = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + 
-				                                        topic + 
-				                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
-				if (servers == null || servers.isEmpty()) {
-					logger.error("{}: no UEB servers configured for sink {}", this, topic);
-					continue;
-				}
-				
-				List<String> serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
-				
-				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + 
-						                               "." + topic + 
-						                               PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);		 
-				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + 
-                                                          "." + topic + 
-                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);	
-				String partitionKey = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + 
-                                                             "." + topic + 
-                                                             PolicyProperties.PROPERTY_TOPIC_SINK_PARTITION_KEY_SUFFIX);
-				
-				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SINK_TOPICS + "." + topic +
-						                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
-				boolean managed = true;
-				if (managedString != null && !managedString.isEmpty()) {
-					managed = Boolean.parseBoolean(managedString);
-				}
-				
-				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
-				
-				//default is to use HTTP if no https property exists
-				boolean useHttps = false;
-				if (useHttpsString != null && !useHttpsString.isEmpty()){
-					useHttps = Boolean.parseBoolean(useHttpsString);
-				}
-				
-				
-				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
-
-					//default is to disallow self-signed certs 
-				boolean allowSelfSignedCerts = false;
-				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
-					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
-				}			
-				
-				UebTopicSink uebTopicWriter = this.build(serverList, topic, 
-						   						         apiKey, apiSecret, 
-						   						         partitionKey, managed, useHttps, allowSelfSignedCerts);
-				newUebTopicSinks.add(uebTopicWriter);
-			}
-			return newUebTopicSinks;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(String topic) 
-		   throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		UebTopicSink uebTopicWriter;
-		synchronized(this) {
-			if (!uebTopicSinks.containsKey(topic)) {
-				return;
-			}
-			
-			uebTopicWriter = uebTopicSinks.remove(topic);
-		}
-		
-		uebTopicWriter.shutdown();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy() {
-		List<UebTopicSink> writers = this.inventory();
-		for (UebTopicSink writer: writers) {
-			writer.shutdown();
-		}
-		
-		synchronized(this) {
-			this.uebTopicSinks.clear();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSink get(String topic) 
-			throws IllegalArgumentException, IllegalStateException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (uebTopicSinks.containsKey(topic)) {
-				return uebTopicSinks.get(topic);
-			} else {
-				throw new IllegalStateException("UebTopicSink for " + topic + " not found");
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized List<UebTopicSink> inventory() {
-		 List<UebTopicSink> writers = 
-				 new ArrayList<UebTopicSink>(this.uebTopicSinks.values());
-		 return writers;
-	}
-
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("IndexedUebTopicSinkFactory []");
-		return builder.toString();
-	}
-	
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java
deleted file mode 100644
index 4da01302..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSource.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-/**
- * Topic Source for UEB Communication Infrastructure
- *
- */
-public interface UebTopicSource extends BusTopicSource {
-	
-	/**
-	 * factory for managing and tracking UEB readers
-	 */
-	public static UebTopicSourceFactory factory = 
-					new IndexedUebTopicSourceFactory();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java
deleted file mode 100644
index 77b894db..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/UebTopicSourceFactory.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.event.comm.bus.internal.SingleThreadedUebTopicSource;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-
-/**
- * UEB Topic Source Factory
- */
-public interface UebTopicSourceFactory {
-	
-	/**
-	 * Creates an UEB Topic Source based on properties files
-	 * 
-	 * @param properties Properties containing initialization values
-	 * 
-	 * @return an UEB Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public List<UebTopicSource> build(Properties properties)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new UEB Topic Source
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param consumerGroup Consumer Group
-	 * @param consumerInstance Consumer Instance
-	 * @param fetchTimeout Read Fetch Timeout
-	 * @param fetchLimit Fetch Limit
-	 * @param managed is this source endpoint managed?
-	 * 
-	 * @return an UEB Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret, 
-								String consumerGroup, 
-								String consumerInstance,
-								int fetchTimeout,
-								int fetchLimit,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts)
-			throws IllegalArgumentException;
-	
-	/**
-	 * Instantiates a new UEB Topic Source
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * 
-	 * @return an UEB Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret)
-			throws IllegalArgumentException;
-
-	/**
-	 * Instantiates a new UEB Topic Source
-	 * 
-	 * @param uebTopicSourceType Implementation type
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * 
-	 * @return an UEB Topic Source
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public UebTopicSource build(List<String> servers, 
-								String topic)
-			throws IllegalArgumentException;	
-	
-	/**
-	 * Destroys an UEB Topic Source based on a topic
-	 * 
-	 * @param topic topic name
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public void destroy(String topic);
-	
-	/**
-	 * Destroys all UEB Topic Sources
-	 */
-	public void destroy();
-	
-	/**
-	 * gets an UEB Topic Source based on topic name
-	 * @param topic the topic name
-	 * @return an UEB Topic Source with topic name
-	 * @throws IllegalArgumentException if an invalid topic is provided
-	 * @throws IllegalStateException if the UEB Topic Source is 
-	 * an incorrect state
-	 */
-	public UebTopicSource get(String topic)
-		   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Provides a snapshot of the UEB Topic Sources
-	 * @return a list of the UEB Topic Sources
-	 */
-	public List<UebTopicSource> inventory();
-}
-
-/* ------------- implementation ----------------- */
-
-/**
- * Factory of UEB Source Topics indexed by topic name
- */
-class IndexedUebTopicSourceFactory implements UebTopicSourceFactory {
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(IndexedUebTopicSourceFactory.class);	
-	
-	/**
-	 * UEB Topic Name Index
-	 */
-	protected HashMap<String, UebTopicSource> uebTopicSources =
-			new HashMap<String, UebTopicSource>();
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSource build(List<String> servers, 
-								String topic, 
-								String apiKey, 
-								String apiSecret, 
-								String consumerGroup, 
-								String consumerInstance,
-								int fetchTimeout,
-								int fetchLimit,
-								boolean managed,
-								boolean useHttps,
-								boolean allowSelfSignedCerts) 
-	throws IllegalArgumentException {
-		if (servers == null || servers.isEmpty()) {
-			throw new IllegalArgumentException("UEB Server(s) must be provided");
-		}
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (uebTopicSources.containsKey(topic)) {
-				return uebTopicSources.get(topic);
-			}
-			
-			UebTopicSource uebTopicSource = 
-					new SingleThreadedUebTopicSource(servers, topic, 
-													 apiKey, apiSecret,
-													 consumerGroup, consumerInstance, 
-													 fetchTimeout, fetchLimit, useHttps, allowSelfSignedCerts);
-			
-			if (managed)
-				uebTopicSources.put(topic, uebTopicSource);
-			
-			return uebTopicSource;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<UebTopicSource> build(Properties properties) 
-			throws IllegalArgumentException {
-		
-		String readTopics = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS);
-		if (readTopics == null || readTopics.isEmpty()) {
-			logger.info("{}: no topic for UEB Source", this);
-			return new ArrayList<UebTopicSource>();
-		}
-		List<String> readTopicList = new ArrayList<String>(Arrays.asList(readTopics.split("\\s*,\\s*")));		
-		
-		List<UebTopicSource> newUebTopicSources = new ArrayList<UebTopicSource>();
-		synchronized(this) {
-			for (String topic: readTopicList) {
-				if (this.uebTopicSources.containsKey(topic)) {
-					newUebTopicSources.add(this.uebTopicSources.get(topic));
-					continue;
-				}
-				
-				String servers = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + 
-                                                        topic + 
-                                                        PolicyProperties.PROPERTY_TOPIC_SERVERS_SUFFIX);
-				
-				if (servers == null || servers.isEmpty()) {
-					logger.error("{}: no UEB servers configured for sink {}", this, topic);
-					continue;
-				}
-				
-				List<String> serverList = new ArrayList<String>(Arrays.asList(servers.split("\\s*,\\s*")));
-				
-				String apiKey = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
-                        							   "." + topic + 
-                                                       PolicyProperties.PROPERTY_TOPIC_API_KEY_SUFFIX);
-				
-				String apiSecret = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
-						                                  "." + topic + 
-                                                          PolicyProperties.PROPERTY_TOPIC_API_SECRET_SUFFIX);
-				
-				String consumerGroup = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
-						                                      "." + topic + 
-                                                              PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX);
-				
-				String consumerInstance = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
-						                                         "." + topic + 
-                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_INSTANCE_SUFFIX);
-				
-				String fetchTimeoutString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
-						                                           "." + topic + 
-                                                                   PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
-				int fetchTimeout = UebTopicSource.DEFAULT_TIMEOUT_MS_FETCH;
-				if (fetchTimeoutString != null && !fetchTimeoutString.isEmpty()) {
-					try {
-						fetchTimeout = Integer.parseInt(fetchTimeoutString);
-					} catch (NumberFormatException nfe) {
-						logger.warn("{}: fetch timeout {} is in invalid format for topic {} ", 
-							        this, fetchTimeoutString, topic);
-					}
-				}
-					
-				String fetchLimitString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + 
-                                                                 "." + topic + 
-                                                                 PolicyProperties.PROPERTY_TOPIC_SOURCE_FETCH_TIMEOUT_SUFFIX);
-				int fetchLimit = UebTopicSource.DEFAULT_LIMIT_FETCH;
-				if (fetchLimitString != null && !fetchLimitString.isEmpty()) {
-					try {
-						fetchLimit = Integer.parseInt(fetchLimitString);
-					} catch (NumberFormatException nfe) {
-						logger.warn("{}: fetch limit {} is in invalid format for topic {} ", 
-						            this, fetchLimitString, topic);
-					}
-				}
-				
-				String managedString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." +
-						                                      topic + PolicyProperties.PROPERTY_MANAGED_SUFFIX);
-				boolean managed = true;
-				if (managedString != null && !managedString.isEmpty()) {
-					managed = Boolean.parseBoolean(managedString);
-				}
-			
-				String useHttpsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
-
-					//default is to use HTTP if no https property exists
-				boolean useHttps = false;
-				if (useHttpsString != null && !useHttpsString.isEmpty()){
-					useHttps = Boolean.parseBoolean(useHttpsString);
-				}
-
-				String allowSelfSignedCertsString = properties.getProperty(PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic +
-						PolicyProperties.PROPERTY_ALLOW_SELF_SIGNED_CERTIFICATES_SUFFIX);
-
-					//default is to disallow self-signed certs 
-				boolean allowSelfSignedCerts = false;
-				if (allowSelfSignedCertsString != null && !allowSelfSignedCertsString.isEmpty()){
-					allowSelfSignedCerts = Boolean.parseBoolean(allowSelfSignedCertsString);
-				}
-				
-				UebTopicSource uebTopicSource = this.build(serverList, topic, 
-						   						           apiKey, apiSecret,
-						   						           consumerGroup, consumerInstance, 
-						   						           fetchTimeout, fetchLimit, managed, useHttps, allowSelfSignedCerts);
-				newUebTopicSources.add(uebTopicSource);
-			}
-		}
-		return newUebTopicSources;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSource build(List<String> servers, 
-								String topic,
-								String apiKey, 
-								String apiSecret) {
-		
-		return this.build(servers, topic, 
-				  		  apiKey, apiSecret,
-				  		  null, null,
-				  		  UebTopicSource.DEFAULT_TIMEOUT_MS_FETCH,
-				  		  UebTopicSource.DEFAULT_LIMIT_FETCH, true, false, true);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSource build(List<String> servers, String topic) {
-		return this.build(servers, topic, null, null);
-	}	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(String topic) 
-		   throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		UebTopicSource uebTopicSource;
-		
-		synchronized(this) {
-			if (!uebTopicSources.containsKey(topic)) {
-				return;
-			}
-			
-			uebTopicSource = uebTopicSources.remove(topic);
-		}
-		
-		uebTopicSource.shutdown();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public UebTopicSource get(String topic) 
-	       throws IllegalArgumentException, IllegalStateException {
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A topic must be provided");
-		}
-		
-		synchronized(this) {
-			if (uebTopicSources.containsKey(topic)) {
-				return uebTopicSources.get(topic);
-			} else {
-				throw new IllegalStateException("UebTopiceSource for " + topic + " not found");
-			}
-		}
-	}
-
-	@Override
-	public synchronized List<UebTopicSource> inventory() {
-		 List<UebTopicSource> readers = 
-				 new ArrayList<UebTopicSource>(this.uebTopicSources.values());
-		 return readers;
-	}
-
-	@Override
-	public void destroy() {
-		List<UebTopicSource> readers = this.inventory();
-		for (UebTopicSource reader: readers) {
-			reader.shutdown();
-		}
-		
-		synchronized(this) {
-			this.uebTopicSources.clear();
-		}
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("IndexedUebTopicSourceFactory []");
-		return builder.toString();
-	}
-	
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java
deleted file mode 100644
index d8eb80b8..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusConsumer.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.att.nsa.cambria.client.CambriaClientBuilders;
-import com.att.nsa.cambria.client.CambriaConsumer;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
-import com.att.nsa.mr.client.response.MRConsumerResponse;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
-import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
-
-/**
- * Wrapper around libraries to consume from message bus
- *
- */
-public interface BusConsumer {
-	
-	/**
-	 * fetch messages
-	 * 
-	 * @return list of messages
-	 * @throws Exception when error encountered by underlying libraries
-	 */
-	public Iterable<String> fetch() throws Exception;
-	
-	/**
-	 * close underlying library consumer
-	 */
-	public void close();
-
-	/**
-	 * Cambria based consumer
-	 */
-	public static class CambriaConsumerWrapper implements BusConsumer {
-		
-		/**
-		 * Cambria client
-		 */
-		protected CambriaConsumer consumer;
-		
-		/**
-		 * Cambria Consumer Wrapper
-		 * 
-		 * @param servers messaging bus hosts
-		 * @param topic topic
-		 * @param apiKey API Key
-		 * @param apiSecret API Secret
-		 * @param consumerGroup Consumer Group
-		 * @param consumerInstance Consumer Instance
-		 * @param fetchTimeout Fetch Timeout
-		 * @param fetchLimit Fetch Limit
-		 * @throws GeneralSecurityException 
-		 * @throws MalformedURLException 
-		 */
-		public CambriaConsumerWrapper(List<String> servers, String topic, 
-								  String apiKey, String apiSecret,
-								  String consumerGroup, String consumerInstance,
-								  int fetchTimeout, int fetchLimit, boolean useHttps, boolean useSelfSignedCerts) 
-		       throws IllegalArgumentException {
-			
-			ConsumerBuilder builder = 
-					new CambriaClientBuilders.ConsumerBuilder();
-			
-			
-			if (useHttps){
-				
-				if(useSelfSignedCerts){
-					builder.knownAs(consumerGroup, consumerInstance)
-					.usingHosts(servers)
-					.onTopic(topic)
-					.waitAtServer(fetchTimeout)
-					.receivingAtMost(fetchLimit)
-					.usingHttps()
-					.allowSelfSignedCertificates();
-				}
-				else{
-					builder.knownAs(consumerGroup, consumerInstance)
-					.usingHosts(servers)
-					.onTopic(topic)
-					.waitAtServer(fetchTimeout)
-					.receivingAtMost(fetchLimit)
-					.usingHttps();
-				}
-			}
-			else{
-				builder.knownAs(consumerGroup, consumerInstance)
-			       .usingHosts(servers)
-			       .onTopic(topic)
-			       .waitAtServer(fetchTimeout)
-			       .receivingAtMost(fetchLimit);
-			}
-			
-			if (apiKey != null && !apiKey.isEmpty() &&
-				apiSecret != null && !apiSecret.isEmpty()) {
-				builder.authenticatedBy(apiKey, apiSecret);
-			}
-					
-			try {
-				this.consumer = builder.build();
-			} catch (MalformedURLException | GeneralSecurityException e) {
-				throw new IllegalArgumentException(e);
-			}
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		public Iterable<String> fetch() throws Exception {
-			return this.consumer.fetch();
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		public void close() {
-			this.consumer.close();
-		}
-		
-		@Override
-		public String toString() {
-			return "CambriaConsumerWrapper []";
-		}
-	}
-	
-	/**
-	 * MR based consumer
-	 */
-	public abstract class DmaapConsumerWrapper implements BusConsumer {	
-		
-		private static Logger logger = LoggerFactory.getLogger(DmaapConsumerWrapper.class);
-		
-		protected int fetchTimeout;
-		protected Object closeCondition = new Object();
-			
-		/**
-		 * MR Consumer
-		 */
-		protected MRConsumerImpl consumer;
-		
-		/**
-		 * MR Consumer Wrapper
-		 * 
-		 * @param servers messaging bus hosts
-		 * @param topic topic
-		 * @param apiKey API Key
-		 * @param apiSecret API Secret
-		 * @param username AAF Login
-		 * @param password AAF Password
-		 * @param consumerGroup Consumer Group
-		 * @param consumerInstance Consumer Instance
-		 * @param fetchTimeout Fetch Timeout
-		 * @param fetchLimit Fetch Limit
-		 * @throws MalformedURLException 
-		 */
-		public DmaapConsumerWrapper(List<String> servers, String topic, 
-								String apiKey, String apiSecret,
-								String username, String password,
-								String consumerGroup, String consumerInstance,
-								int fetchTimeout, int fetchLimit, boolean useHttps)									
-		throws MalformedURLException {
-			
-			this.fetchTimeout = fetchTimeout;
-			
-			if (topic == null || topic.isEmpty()) {
-				throw new IllegalArgumentException("No topic for DMaaP");
-			}
-					
-			this.consumer = new MRConsumerImpl(servers, topic, 
-											   consumerGroup, consumerInstance, 
-											   fetchTimeout, fetchLimit, 
-									           null, apiKey, apiSecret);
-			
-			this.consumer.setUsername(username);
-			this.consumer.setPassword(password);
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		public Iterable<String> fetch() throws Exception {
-			MRConsumerResponse response = this.consumer.fetchWithReturnConsumerResponse();
-			if (response == null) {
-				logger.warn("{}: DMaaP NULL response received", this);
-				
-				synchronized (closeCondition) {
-					closeCondition.wait(fetchTimeout);
-				}
-				return new ArrayList<String>();
-			} else {
-				logger.debug("DMaaP consumer received {} : {}" + 
-		                      response.getResponseCode(), 
-					          response.getResponseMessage());
-				
-				if (response.getResponseCode() == null || 
-					!response.getResponseCode().equals("200")) {
-					
-					logger.error("DMaaP consumer received: {} : {}", 
-							     response.getResponseCode(), 
-							     response.getResponseMessage());
-					
-					synchronized (closeCondition) {
-						closeCondition.wait(fetchTimeout);
-					}
-					/* fall through */
-				}
-			}
-			
-			if (response.getActualMessages() == null)
-				return new ArrayList<String>();
-			else
-				return response.getActualMessages();
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		public void close() {
-			synchronized (closeCondition) {
-				closeCondition.notifyAll();
-			}
-			
-			this.consumer.close();
-		}
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.
-			append("DmaapConsumerWrapper [").
-			append("consumer.getAuthDate()=").append(consumer.getAuthDate()).
-			append(", consumer.getAuthKey()=").append(consumer.getAuthKey()).
-			append(", consumer.getHost()=").append(consumer.getHost()).
-			append(", consumer.getProtocolFlag()=").append(consumer.getProtocolFlag()).
-			append(", consumer.getUsername()=").append(consumer.getUsername()).
-			append("]");
-			return builder.toString();
-		}
-	}
-
-	/**
-	 * MR based consumer
-	 */
-	public static class DmaapAafConsumerWrapper extends DmaapConsumerWrapper {
-		
-		private static Logger logger = LoggerFactory.getLogger(DmaapAafConsumerWrapper.class);
-		
-		private Properties props;
-		
-		/**
-		 * MR Consumer Wrapper
-		 * 
-		 * @param servers messaging bus hosts
-		 * @param topic topic
-		 * @param apiKey API Key
-		 * @param apiSecret API Secret
-		 * @param aafLogin AAF Login
-		 * @param aafPassword AAF Password
-		 * @param consumerGroup Consumer Group
-		 * @param consumerInstance Consumer Instance
-		 * @param fetchTimeout Fetch Timeout
-		 * @param fetchLimit Fetch Limit
-		 * @throws MalformedURLException 
-		 */
-		public DmaapAafConsumerWrapper(List<String> servers, String topic, 
-									String apiKey, String apiSecret,
-									String aafLogin, String aafPassword,
-									String consumerGroup, String consumerInstance,
-									int fetchTimeout, int fetchLimit, boolean useHttps) throws MalformedURLException {
-			
-			super(servers, topic, apiKey, apiSecret,
-								aafLogin, aafPassword,
-								consumerGroup, consumerInstance,
-								fetchTimeout, fetchLimit, useHttps);
-			
-			// super constructor sets servers = {""} if empty to avoid errors when using DME2
-			if ((servers.size() == 1 && servers.get(0).equals("")) ||
-				(servers == null) || (servers.size() == 0)) {
-				throw new IllegalArgumentException("Must provide at least one host for HTTP AAF");
-			}
-
-			this.consumer.setProtocolFlag(ProtocolTypeConstants.AAF_AUTH.getValue());
-
-			props = new Properties();
-			
-			if(useHttps){
-				props.setProperty("Protocol", "https");
-				this.consumer.setHost(servers.get(0) + ":3905");
-				
-			}
-			else{
-				props.setProperty("Protocol", "http");
-				this.consumer.setHost(servers.get(0) + ":3904");
-			}
-
-			this.consumer.setProps(props);
-			logger.info("{}: CREATION", this);
-		}
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			MRConsumerImpl consumer = (MRConsumerImpl) this.consumer;
-			
-			builder.
-			append("DmaapConsumerWrapper [").
-			append("consumer.getAuthDate()=").append(consumer.getAuthDate()).
-			append(", consumer.getAuthKey()=").append(consumer.getAuthKey()).
-			append(", consumer.getHost()=").append(consumer.getHost()).
-			append(", consumer.getProtocolFlag()=").append(consumer.getProtocolFlag()).
-			append(", consumer.getUsername()=").append(consumer.getUsername()).
-			append("]");
-			return builder.toString();
-		}
-	}
-	
-	public static class DmaapDmeConsumerWrapper extends DmaapConsumerWrapper {
-		
-		private static Logger logger = LoggerFactory.getLogger(DmaapDmeConsumerWrapper.class);
-		
-		private Properties props;
-		
-		public DmaapDmeConsumerWrapper(List<String> servers, String topic, 
-								String apiKey, String apiSecret,
-								String dme2Login, String dme2Password,
-								String consumerGroup, String consumerInstance,
-								int fetchTimeout, int fetchLimit,
-								String environment, String aftEnvironment, String dme2Partner,
-								String latitude, String longitude, Map<String,String> additionalProps, boolean useHttps) throws MalformedURLException {
-			
-			
-			
-			super(servers, topic, apiKey, apiSecret,
-								dme2Login, dme2Password,
-								consumerGroup, consumerInstance,
-								fetchTimeout, fetchLimit, useHttps);
-			
-			
-			String dme2RouteOffer = additionalProps.get(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY);
-			
-			if (environment == null || environment.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
-			} if (aftEnvironment == null || aftEnvironment.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
-			} if (latitude == null || latitude.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX + " property for DME2 in DMaaP");
-			} if (longitude == null || longitude.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX + " property for DME2 in DMaaP");
-			} 
-			
-			if ((dme2Partner == null || dme2Partner.isEmpty()) && (dme2RouteOffer == null || dme2RouteOffer.isEmpty())) {
-				throw new IllegalArgumentException("Must provide at least " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX + " or " + 
-						PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX + " for DME2");
-			}
-			
-			String serviceName = servers.get(0);
-			
-			this.consumer.setProtocolFlag(ProtocolTypeConstants.DME2.getValue());
-			
-			this.consumer.setUsername(dme2Login);
-			this.consumer.setPassword(dme2Password);
-			
-			props = new Properties();
-			
-			props.setProperty(DmaapTopicSinkFactory.DME2_SERVICE_NAME_PROPERTY, serviceName);
-			
-			props.setProperty("username", dme2Login);
-			props.setProperty("password", dme2Password);
-			
-			/* These are required, no defaults */
-			props.setProperty("topic", topic);
-			
-			props.setProperty("Environment", environment);
-			props.setProperty("AFT_ENVIRONMENT", aftEnvironment);
-			
-			if (dme2Partner != null)
-				props.setProperty("Partner", dme2Partner);
-			if (dme2RouteOffer != null)
-				props.setProperty(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
-			
-			props.setProperty("Latitude", latitude);
-			props.setProperty("Longitude", longitude);
-			
-			/* These are optional, will default to these values if not set in additionalProps */
-			props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-			props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-			props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", "15000");
-			props.setProperty("Version", "1.0");
-			props.setProperty("SubContextPath", "/");
-			props.setProperty("sessionstickinessrequired", "no");
-			
-			/* These should not change */
-			props.setProperty("TransportType", "DME2");
-			props.setProperty("MethodType", "GET");
-			
-			if(useHttps){
-				props.setProperty("Protocol", "https");
-				
-			}
-			else{
-				props.setProperty("Protocol", "http");
-			}
-			
-			props.setProperty("contenttype", "application/json");
-			
-			if (additionalProps != null) {
-				for(String key : additionalProps.keySet())
-					props.put(key, additionalProps.get(key));
-			}
-			
-			MRClientFactory.prop = props;
-			this.consumer.setProps(props);
-			
-			logger.info("{}: CREATION", this);
-		}
-	}
-}
-
-
-
-
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java
deleted file mode 100644
index 54e0bcb2..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusPublisher.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSinkFactory;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.att.nsa.cambria.client.CambriaBatchingPublisher;
-import com.att.nsa.cambria.client.CambriaClientBuilders;
-import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import com.att.nsa.mr.client.response.MRPublisherResponse;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-public interface BusPublisher {
-	
-	/**
-	 * sends a message
-	 * 
-	 * @param partition id
-	 * @param message the message
-	 * @return true if success, false otherwise
-	 * @throws IllegalArgumentException if no message provided
-	 */
-	public boolean send(String partitionId, String message) throws IllegalArgumentException;
-	
-	/**
-	 * closes the publisher
-	 */
-	public void close();
-	
-	/**
-	 * Cambria based library publisher
-	 */
-	public static class CambriaPublisherWrapper implements BusPublisher {
-		
-		private static Logger logger = LoggerFactory.getLogger(CambriaPublisherWrapper.class);
-
-		/**
-		 * The actual Cambria publisher
-		 */
-		@JsonIgnore
-		protected volatile CambriaBatchingPublisher publisher;
-		
-		public CambriaPublisherWrapper(List<String> servers, String topic,
-						               String apiKey,
-						               String apiSecret, boolean useHttps) throws IllegalArgumentException {
-			PublisherBuilder builder = new CambriaClientBuilders.PublisherBuilder();
-		
-
-			if (useHttps){
-				
-				builder.usingHosts(servers)
-			       .onTopic(topic)
-			       .usingHttps();
-			}
-			else{
-				builder.usingHosts(servers)
-			       .onTopic(topic);
-			}
-		
-			
-			if (apiKey != null && !apiKey.isEmpty() &&
-				apiSecret != null && !apiSecret.isEmpty()) {
-				builder.authenticatedBy(apiKey, apiSecret);
-			}
-			
-			try {
-				this.publisher = builder.build();
-			} catch (MalformedURLException | GeneralSecurityException e) {
-				throw new IllegalArgumentException(e);
-			}
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public boolean send(String partitionId, String message) 
-				throws IllegalArgumentException {
-			if (message == null)
-				throw new IllegalArgumentException("No message provided");
-			
-			try {
-				this.publisher.send(partitionId, message);
-			} catch (Exception e) {
-				logger.warn("{}: SEND of {} cannot be performed because of {}",
-						    this, message, e.getMessage(), e);
-				return false;
-			}
-			return true;			
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void close() {
-			logger.info("{}: CLOSE", this);
-			
-			try {
-				this.publisher.close();
-			} catch (Exception e) {
-				logger.warn("{}: CLOSE FAILED because of {}", 
-						    this, e.getMessage(),e);
-			}
-		}
-		
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("CambriaPublisherWrapper [").
-			append("publisher.getPendingMessageCount()=").
-			append(publisher.getPendingMessageCount()).
-			append("]");
-			return builder.toString();
-		}
-		
-	}
-	
-	/**
-	 * DmaapClient library wrapper
-	 */
-	public abstract class DmaapPublisherWrapper implements BusPublisher {
-		
-		private static Logger logger = LoggerFactory.getLogger(DmaapPublisherWrapper.class);
-		
-		/**
-		 * MR based Publisher
-		 */		
-		protected MRSimplerBatchPublisher publisher;
-		protected Properties props;
-		
-		/**
-		 * MR Publisher Wrapper
-		 *
-		 * @param servers messaging bus hosts
-		 * @param topic topic
-		 * @param username AAF or DME2 Login
-		 * @param password AAF or DME2 Password
-		 */
-		public DmaapPublisherWrapper(ProtocolTypeConstants protocol,
-									 List<String> servers, String topic,
-				                     String username,
-				                     String password, boolean useHttps) throws IllegalArgumentException {
-
-			
-			if (topic == null || topic.isEmpty())
-				throw new IllegalArgumentException("No topic for DMaaP");
-
-			
-			if (protocol == ProtocolTypeConstants.AAF_AUTH) {
-				if (servers == null || servers.isEmpty())
-					throw new IllegalArgumentException("No DMaaP servers or DME2 partner provided");
-				
-				ArrayList<String> dmaapServers = new ArrayList<String>();
-				if(useHttps){
-					for (String server: servers) {
-						dmaapServers.add(server + ":3905");
-					}
-				
-				}
-				else{
-					for (String server: servers) {
-						dmaapServers.add(server + ":3904");
-					}				
-				}
-				
-										
-				this.publisher = 
-					new MRSimplerBatchPublisher.Builder().
-												againstUrls(dmaapServers).
-												onTopic(topic).
-												build();
-				
-				this.publisher.setProtocolFlag(ProtocolTypeConstants.AAF_AUTH.getValue());
-			} else if (protocol == ProtocolTypeConstants.DME2) {
-				ArrayList<String> dmaapServers = new ArrayList<String>();
-				dmaapServers.add("0.0.0.0:3904");
-						
-				this.publisher = 
-					new MRSimplerBatchPublisher.Builder().
-												againstUrls(dmaapServers).
-												onTopic(topic).
-												build();
-				
-				this.publisher.setProtocolFlag(ProtocolTypeConstants.DME2.getValue());
-			}
-			
-			this.publisher.logTo(LoggerFactory.getLogger(MRSimplerBatchPublisher.class.getName()));
-			
-			this.publisher.setUsername(username);
-			this.publisher.setPassword(password);  
-			
-			props = new Properties();
-						
-			if (useHttps) {				
-				props.setProperty("Protocol", "https");
-			} else {			
-				props.setProperty("Protocol", "http");
-			}
-
-			props.setProperty("contenttype", "application/json");
-			props.setProperty("username", username);
-			props.setProperty("password", password);
-			
-			props.setProperty("topic", topic);
-			
-			this.publisher.setProps(props);
-			
-			if (protocol == ProtocolTypeConstants.AAF_AUTH)
-				this.publisher.setHost(servers.get(0));
-			
-			logger.info("{}: CREATION: using protocol {}", this, protocol.getValue());
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void close() {
-			logger.info("{}: CLOSE", this);
-			
-			try {
-				this.publisher.close(1, TimeUnit.SECONDS);
-			} catch (Exception e) {
-				logger.warn("{}: CLOSE FAILED because of {}",
-						    this, e.getMessage(), e);
-			}
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public boolean send(String partitionId, String message) 
-				throws IllegalArgumentException {
-			if (message == null)
-				throw new IllegalArgumentException("No message provided");
-			
-			this.publisher.setPubResponse(new MRPublisherResponse());
-			this.publisher.send(partitionId, message);
-			MRPublisherResponse response = this.publisher.sendBatchWithResponse();
-			if (response != null) {
-				logger.debug("DMaaP publisher received {} : {}",
-						     response.getResponseCode(), 
-						     response.getResponseMessage());
-			}
-
-			return true;
-		}
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("DmaapPublisherWrapper [").
-			append("publisher.getAuthDate()=").append(publisher.getAuthDate()).
-			append(", publisher.getAuthKey()=").append(publisher.getAuthKey()).
-			append(", publisher.getHost()=").append(publisher.getHost()).
-			append(", publisher.getProtocolFlag()=").append(publisher.getProtocolFlag()).
-			append(", publisher.getUsername()=").append(publisher.getUsername()).
-			append(", publisher.getPendingMessageCount()=").append(publisher.getPendingMessageCount()).
-			append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * DmaapClient library wrapper
-	 */
-	public static class DmaapAafPublisherWrapper extends DmaapPublisherWrapper {
-		/**
-		 * MR based Publisher
-		 */		
-		protected MRSimplerBatchPublisher publisher;
-		
-		public DmaapAafPublisherWrapper(List<String> servers, String topic,
-				                     String aafLogin,
-				                     String aafPassword, boolean useHttps) {
-			
-			super(ProtocolTypeConstants.AAF_AUTH, servers, topic, aafLogin, aafPassword, useHttps);
-		}
-	}
-	
-	public static class DmaapDmePublisherWrapper extends DmaapPublisherWrapper {
-		public DmaapDmePublisherWrapper(List<String> servers, String topic,
-										String username, String password,
-										String environment, String aftEnvironment, String dme2Partner,
-										String latitude, String longitude, Map<String,String> additionalProps, boolean useHttps) {
-			
-			super(ProtocolTypeConstants.DME2, servers, topic, username, password, useHttps);
-			
-			
-			
-			
-			
-			
-			String dme2RouteOffer = additionalProps.get(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY);
-			
-			 if (environment == null || environment.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
-			} if (aftEnvironment == null || aftEnvironment.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_AFT_ENVIRONMENT_SUFFIX + " property for DME2 in DMaaP");
-			} if (latitude == null || latitude.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LATITUDE_SUFFIX + " property for DME2 in DMaaP");
-			} if (longitude == null || longitude.isEmpty()) {
-				throw new IllegalArgumentException("Missing " + PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_LONGITUDE_SUFFIX + " property for DME2 in DMaaP");
-			}
-			
-			if ((dme2Partner == null || dme2Partner.isEmpty()) && (dme2RouteOffer == null || dme2RouteOffer.isEmpty())) {
-				throw new IllegalArgumentException("Must provide at least " + PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS +
-						"." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_PARTNER_SUFFIX + " or " + 
-						PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + "." + topic + PolicyProperties.PROPERTY_DMAAP_DME2_ROUTE_OFFER_SUFFIX + " for DME2");
-			}
-			
-			String serviceName = servers.get(0);
-			
-			/* These are required, no defaults */
-			props.setProperty("Environment", environment);
-			props.setProperty("AFT_ENVIRONMENT", aftEnvironment);
-			
-			props.setProperty(DmaapTopicSinkFactory.DME2_SERVICE_NAME_PROPERTY, serviceName);
-
-			if (dme2Partner != null)
-				props.setProperty("Partner", dme2Partner);
-			if (dme2RouteOffer != null)
-				props.setProperty(DmaapTopicSinkFactory.DME2_ROUTE_OFFER_PROPERTY, dme2RouteOffer);
-			
-			props.setProperty("Latitude", latitude);
-			props.setProperty("Longitude", longitude);
-			
-			// ServiceName also a default, found in additionalProps
-			
-			/* These are optional, will default to these values if not set in optionalProps */
-			props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", "50000");
-			props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", "240000");
-			props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", "15000");
-			props.setProperty("Version", "1.0");
-			props.setProperty("SubContextPath", "/");
-			props.setProperty("sessionstickinessrequired", "no");
-			
-			/* These should not change */
-			props.setProperty("TransportType", "DME2");
-			props.setProperty("MethodType", "POST");
-			
-			for (String key : additionalProps.keySet()) {
-				String value = additionalProps.get(key);
-				
-				if (value != null)
-					props.setProperty(key, value);
-			}
-			
-			this.publisher.setProps(props);
-		}
-	}
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java
deleted file mode 100644
index 4beaa1f1..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/BusTopicBase.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.List;
-
-import org.openecomp.policy.drools.event.comm.bus.ApiKeyEnabled;
-
-/**
- * Bus Topic Base
- */
-public abstract class BusTopicBase extends TopicBase implements ApiKeyEnabled {
-	
-	/**
-	 * API Key
-	 */
-	protected String apiKey;
-	
-	/**
-	 * API Secret
-	 */
-	protected String apiSecret;
-	
-	/**
-	 * Use https
-	 */
-	protected boolean useHttps;
-	
-	/**
-	 * allow self signed certificates
-	 */
-	protected boolean allowSelfSignedCerts;
-	
-	/**
-	 * Instantiates a new Bus Topic Base
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 * @param apiKey API Key
-	 * @param apiSecret API Secret
-	 * @param useHttps does connection use HTTPS?
-	 * @param allowSelfSignedCerts are self-signed certificates allow
-	 *  
-	 * @return a Bus Topic Base
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public BusTopicBase(List<String> servers, 
-						  String topic, 
-						  String apiKey, 
-						  String apiSecret,
-						  boolean useHttps,
-						  boolean allowSelfSignedCerts) 
-	throws IllegalArgumentException {
-		
-		super(servers, topic);
-		
-		this.apiKey = apiKey;
-		this.apiSecret = apiSecret;
-		this.useHttps = useHttps;
-		this.allowSelfSignedCerts = allowSelfSignedCerts;
-	}
-	
-	@Override
-	public String getApiKey() {
-		return apiKey;
-	}
-
-	@Override
-	public String getApiSecret() {
-		return apiSecret;
-	}
-	
-	/**
-	 * @return if using https
-	 */
-	public boolean isUseHttps(){
-		return useHttps;
-	}
-
-	/**
-	 * @return if self signed certificates are allowed
-	 */
-	public boolean isAllowSelfSignedCerts(){
-		return allowSelfSignedCerts;
-	}
-
-
-	@Override
-	public String toString() {
-		return "BusTopicBase [apiKey=" + apiKey + ", apiSecret=" + apiSecret + ", useHttps=" + useHttps
-				+ ", allowSelfSignedCerts=" + allowSelfSignedCerts + ", toString()=" + super.toString() + "]";
-	}
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
deleted file mode 100644
index 3f1f3610..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineBusTopicSink.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.List;
-import java.util.UUID;
-
-import org.openecomp.policy.drools.event.comm.bus.BusTopicSink;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-/**
- * Transport Agnostic Bus Topic Sink to carry out the core functionality
- * to interact with a sink regardless if it is UEB or DMaaP.
- *
- */
-public abstract class InlineBusTopicSink extends BusTopicBase implements BusTopicSink {
-	
-	/**
-	 * loggers
-	 */
-	private static Logger logger = LoggerFactory.getLogger(InlineBusTopicSink.class);
-	private static final Logger netLogger = LoggerFactory.getLogger(NETWORK_LOGGER);
-	
-	/**
-	 * The partition key to publish to
-	 */
-	protected String partitionId;
-	
-	/**
-	 * message bus publisher
-	 */
-	protected BusPublisher publisher;
-
-	/**
-	 * constructor for abstract sink
-	 * 
-	 * @param servers servers
-	 * @param topic topic
-	 * @param apiKey api secret
-	 * @param apiSecret api secret
-	 * @param partitionId partition id
-	 * @param useHttps does connection use HTTPS?
-	 * @param allowSelfSignedCerts are self-signed certificates allow
-	 * @throws IllegalArgumentException in invalid parameters are passed in
-	 */
-	public InlineBusTopicSink(List<String> servers, String topic, 
-			                  String apiKey, String apiSecret, String partitionId, boolean useHttps, boolean allowSelfSignedCerts)
-			throws IllegalArgumentException {
-		
-		super(servers, topic, apiKey, apiSecret, useHttps, allowSelfSignedCerts);		
-		
-		if (partitionId == null || partitionId.isEmpty()) {
-			this.partitionId = UUID.randomUUID ().toString();
-		}
-	}
-	
-	/**
-	 * Initialize the Bus publisher
-	 */
-	public abstract void init();
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {		
-		logger.info("{}: starting", this);
-		
-		synchronized(this) {
-			
-			if (this.alive)
-				return true;
-			
-			if (locked)
-				throw new IllegalStateException(this + " is locked.");
-			
-			this.alive = true;
-		}
-				
-		this.init();
-		return true;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() {
-		
-		BusPublisher publisherCopy;
-		synchronized(this) {
-			this.alive = false;
-			publisherCopy = this.publisher;
-			this.publisher = null;
-		}
-		
-		if (publisherCopy != null) {
-			try {
-				publisherCopy.close();
-			} catch (Exception e) {
-				logger.warn("{}: cannot stop publisher because of {}", 
-						    this, e.getMessage(), e);
-			}
-		} else {
-			logger.warn("{}: there is no publisher", this);
-			return false;
-		}
-		
-		return true;
-	}	
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean send(String message) throws IllegalArgumentException, IllegalStateException {
-		
-		if (message == null || message.isEmpty()) {
-			throw new IllegalArgumentException("Message to send is empty");
-		}
-
-		if (!this.alive) {
-			throw new IllegalStateException(this + " is stopped");
-		}
-		
-		try {
-			synchronized (this) {
-				this.recentEvents.add(message);
-			}
-			
-			netLogger.info("[OUT|{}|{}]{}{}", this.getTopicCommInfrastructure(), 
-			               this.topic, System.lineSeparator(), message);
-			
-			publisher.send(this.partitionId, message);			
-			broadcast(message);
-		} catch (Exception e) {
-			logger.warn("{}: cannot send because of {}", this, e.getMessage(), e);
-			return false;
-		}
-		
-		return true;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setPartitionKey(String partitionKey) {
-		this.partitionId = partitionKey;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getPartitionKey() {
-		return this.partitionId;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		this.stop();
-	}
-	
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("InlineBusTopicSink [partitionId=").append(partitionId).append(", alive=").append(alive)
-				.append(", publisher=").append(publisher).append("]");
-		return builder.toString();
-	}
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
deleted file mode 100644
index 37051e2f..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineDmaapTopicSink.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-
-/**
- * This implementation publishes events for the associated DMAAP topic,
- * inline with the calling thread.
- */
-public class InlineDmaapTopicSink extends InlineBusTopicSink implements DmaapTopicSink {
-	
-	protected static Logger logger = 
-			LoggerFactory.getLogger(InlineDmaapTopicSink.class);
-	
-	protected final String userName;
-	protected final String password;
-	
-	protected String environment = null;
-	protected String aftEnvironment = null;
-	protected String partner = null;
-	protected String latitude = null;
-	protected String longitude = null;
-	
-	protected Map<String,String> additionalProps = null;
-	
-	/**
-	 * 
-	 * @param servers DMaaP servers
-	 * @param topic DMaaP Topic to be monitored
-	 * @param apiKey DMaaP API Key (optional)
-	 * @param apiSecret DMaaP API Secret (optional)
-	 * @param consumerGroup DMaaP Reader Consumer Group
-	 * @param consumerInstance DMaaP Reader Instance
-	 * @param fetchTimeout DMaaP fetch timeout
-	 * @param fetchLimit DMaaP fetch limit
-	 * @param environment DME2 Environment
-	 * @param aftEnvironment DME2 AFT Environment
-	 * @param partner DME2 Partner
-	 * @param latitude DME2 Latitude
-	 * @param longitude DME2 Longitude
-	 * @param additionalProps Additional properties to pass to DME2
-	 * @param useHttps does connection use HTTPS?
-	 * @param allowSelfSignedCerts are self-signed certificates allow
-	 * 
-	 * @throws IllegalArgumentException An invalid parameter passed in
-	 */
-	public InlineDmaapTopicSink(List<String> servers, String topic, 
-											String apiKey, String apiSecret,
-											String userName, String password,
-											String partitionKey,
-											String environment, String aftEnvironment, String partner,
-											String latitude, String longitude, Map<String,String> additionalProps,
-											boolean useHttps, boolean allowSelfSignedCerts)
-			throws IllegalArgumentException {
-			
-		super(servers, topic, apiKey, apiSecret, partitionKey, useHttps, allowSelfSignedCerts);
-		
-		this.userName = userName;
-		this.password = password;
-		
-		this.environment = environment;
-		this.aftEnvironment = aftEnvironment;
-		this.partner = partner;
-		
-		this.latitude = latitude;
-		this.longitude = longitude;
-		
-		this.additionalProps = additionalProps;
-	}
-	
-	public InlineDmaapTopicSink(List<String> servers, String topic, 
-			                    String apiKey, String apiSecret,
-	                            String userName, String password,
-			                    String partitionKey, boolean useHttps,  boolean allowSelfSignedCerts) 
-		throws IllegalArgumentException {
-		
-		super(servers, topic, apiKey, apiSecret, partitionKey, useHttps, allowSelfSignedCerts);
-		
-		this.userName = userName;
-		this.password = password;
-	}
-	
-
-	@Override
-	public void init() {
-		if ((this.environment == null	|| this.environment.isEmpty()) &&
-		   (this.aftEnvironment == null || this.aftEnvironment.isEmpty()) &&
-		   (this.latitude == null		|| this.latitude.isEmpty()) &&
-		   (this.longitude == null		|| this.longitude.isEmpty()) &&
-		   (this.partner == null		|| this.partner.isEmpty())) {
-			this.publisher = 
-				new BusPublisher.DmaapAafPublisherWrapper(this.servers, 
-						                               this.topic, 
-						                               this.userName, 
-						                               this.password, this.useHttps);
-		} else {
-			this.publisher = 
-				new BusPublisher.DmaapDmePublisherWrapper(this.servers, this.topic, 
-						                               this.userName, this.password,
-						                               this.environment, this.aftEnvironment,
-						                               this.partner, this.latitude, this.longitude,
-						                               this.additionalProps, this.useHttps);
-		}
-		
-		logger.info("{}: DMAAP SINK created", this);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public CommInfrastructure getTopicCommInfrastructure() {
-		return Topic.CommInfrastructure.DMAAP;
-	}
-
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("InlineDmaapTopicSink [userName=").append(userName).append(", password=").append(password)
-				.append(", getTopicCommInfrastructure()=").append(getTopicCommInfrastructure()).append(", toString()=")
-				.append(super.toString()).append("]");
-		return builder.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
deleted file mode 100644
index d657f06e..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/InlineUebTopicSink.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.List;
-
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-/**
- * This implementation publishes events for the associated UEB topic,
- * inline with the calling thread.
- */
-public class InlineUebTopicSink extends InlineBusTopicSink implements UebTopicSink {
-	
-	/**
-	 * logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(InlineUebTopicSink.class);
-	
-	/**
-	 * Argument-based UEB Topic Writer instantiation
-	 * 
-	 * @param servers list of UEB servers available for publishing
-	 * @param topic the topic to publish to
-	 * @param apiKey the api key (optional)
-	 * @param apiSecret the api secret (optional)
-	 * @param partitionId the partition key (optional, autogenerated if not provided)
-	 * @param useHttps does connection use HTTPS?
-	 * @param allowSelfSignedCerts are self-signed certificates allow
-	 * 
-	 * @throws IllegalArgumentException if invalid arguments are detected
-	 */
-	public InlineUebTopicSink(List<String> servers, 
-								String topic, 
-            					String apiKey, 
-            					String apiSecret,
-            					String partitionId,
-            					boolean useHttps,
-            					boolean allowSelfSignedCerts) 
-    throws IllegalArgumentException {		
-		super(servers, topic, apiKey, apiSecret, partitionId, useHttps, allowSelfSignedCerts);
-	}
-	
-	/**
-	 * Instantiation of internal resources
-	 */
-	@Override
-	public void init() {	
-		
-		this.publisher = 
-				new BusPublisher.CambriaPublisherWrapper(this.servers, 
-						                                 this.topic, 
-						                                 this.apiKey, 
-						                                 this.apiSecret,
-						                                 this.useHttps);
-		logger.info("{}: UEB SINK created", this);
-	}
-	
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("InlineUebTopicSink [getTopicCommInfrastructure()=").append(getTopicCommInfrastructure())
-				.append(", toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public CommInfrastructure getTopicCommInfrastructure() {
-		return Topic.CommInfrastructure.UEB;
-	}
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
deleted file mode 100644
index 0fa90b50..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedBusTopicSource.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.bus.BusTopicSource;
-
-/**
- * This topic source implementation specializes in reading messages
- * over a bus topic source and notifying its listeners
- */
-public abstract class SingleThreadedBusTopicSource 
-       extends BusTopicBase
-       implements Runnable, BusTopicSource {
-	   
-	/**
-	 * Not to be converted to PolicyLogger.
-	 * This will contain all instract /out traffic and only that in a single file in a concise format.
-	 */
-	private static Logger logger = LoggerFactory.getLogger(InlineBusTopicSink.class);
-	private static final Logger netLogger = LoggerFactory.getLogger(NETWORK_LOGGER);
-	
-	/**
-	 * Bus consumer group
-	 */
-	protected final String consumerGroup;
-	
-	/**
-	 * Bus consumer instance
-	 */
-	protected final String consumerInstance;
-	
-	/**
-	 * Bus fetch timeout
-	 */
-	protected final int fetchTimeout;
-	
-	/**
-	 * Bus fetch limit
-	 */
-	protected final int fetchLimit;
-	
-	/**
-	 * Message Bus Consumer
-	 */
-	protected BusConsumer consumer;
-	
-	/**
-	 * Am I running?
-	 * reflects invocation of start()/stop() 
-	 * !locked & start() => alive
-	 * stop() => !alive
-	 */
-	protected volatile boolean alive = false;
-	
-	/**
-	 * Independent thread reading message over my topic
-	 */
-	protected Thread busPollerThread;
-	
-	/**
-	 * All my subscribers for new message notifications
-	 */
-	protected final ArrayList<TopicListener> topicListeners = new ArrayList<TopicListener>();
-	
-
-	/**
-	 * 
-	 * @param servers Bus servers
-	 * @param topic Bus Topic to be monitored
-	 * @param apiKey Bus API Key (optional)
-	 * @param apiSecret Bus API Secret (optional)
-	 * @param consumerGroup Bus Reader Consumer Group
-	 * @param consumerInstance Bus Reader Instance
-	 * @param fetchTimeout Bus fetch timeout
-	 * @param fetchLimit Bus fetch limit
-	 * @param useHttps does the bus use https
-	 * @param allowSelfSignedCerts are self-signed certificates allowed
-	 * @throws IllegalArgumentException An invalid parameter passed in
-	 */
-	public SingleThreadedBusTopicSource(List<String> servers, 
-										String topic, 
-			                  			String apiKey, 
-			                  			String apiSecret, 
-			                  			String consumerGroup, 
-			                  			String consumerInstance,
-			                  			int fetchTimeout,
-			                  			int fetchLimit,
-			                  			boolean useHttps,
-			                  			boolean allowSelfSignedCerts) 
-	throws IllegalArgumentException {
-		
-		super(servers, topic, apiKey, apiSecret, useHttps, allowSelfSignedCerts);
-		
-		if (consumerGroup == null || consumerGroup.isEmpty()) {
-			this.consumerGroup = UUID.randomUUID ().toString();
-		} else {
-			this.consumerGroup = consumerGroup;
-		}
-		
-		if (consumerInstance == null || consumerInstance.isEmpty()) {
-			this.consumerInstance = DEFAULT_CONSUMER_INSTANCE;
-		} else {
-			this.consumerInstance = consumerInstance;
-		}
-		
-		if (fetchTimeout <= 0) {
-			this.fetchTimeout = NO_TIMEOUT_MS_FETCH;
-		} else {
-			this.fetchTimeout = fetchTimeout;
-		}
-		
-		if (fetchLimit <= 0) {
-			this.fetchLimit = NO_LIMIT_FETCH;
-		} else {
-			this.fetchLimit = fetchLimit;
-		}
-		
-	}
-	
-	/**
-	 * Initialize the Bus client
-	 */
-	public abstract void init() throws Exception;
-	
-	@Override
-	public void register(TopicListener topicListener) 
-		throws IllegalArgumentException {		
-		
-		super.register(topicListener);
-		
-		try {
-			if (!alive && !locked)
-				this.start();
-			else
-				logger.info("{}: register: start not attempted", this);
-		} catch (Exception e) {
-			logger.warn("{}: cannot start after registration of because of: {}",
-		                this, topicListener, e.getMessage(), e);
-		}
-	}
-
-	@Override
-	public void unregister(TopicListener topicListener) {
-		boolean stop = false;
-		synchronized (this) {
-			super.unregister(topicListener);
-			stop = (this.topicListeners.isEmpty());
-		}
-		
-		if (stop) {		
-			this.stop();
-		}
-	}
-	
-	@Override
-	public boolean start() throws IllegalStateException {		
-		logger.info("{}: starting", this);
-		
-		synchronized(this) {
-			
-			if (alive)
-				return true;
-			
-			if (locked)
-				throw new IllegalStateException(this + " is locked.");
-			
-			if (this.busPollerThread == null || 
-				!this.busPollerThread.isAlive() || 
-				this.consumer == null) {
-				
-				try {
-					this.init();
-					this.alive = true;
-					this.busPollerThread = new Thread(this);
-					this.busPollerThread.setName(this.getTopicCommInfrastructure() + "-source-" + this.getTopic());
-					busPollerThread.start();
-				} catch (Exception e) {
-					logger.warn("{}: cannot start because of {}", this, e.getMessage(), e);
-					throw new IllegalStateException(e);
-				}
-			}
-		}
-		
-		return this.alive;
-	}
-
-	@Override
-	public boolean stop() {
-		logger.info("{}: stopping", this);
-		
-		synchronized(this) {
-			BusConsumer consumerCopy = this.consumer;
-			
-			this.alive = false;
-			this.consumer = null;
-			
-			if (consumerCopy != null) {
-				try {
-					consumerCopy.close();
-				} catch (Exception e) {
-					logger.warn("{}: stop failed because of {}", this, e.getMessage(), e);
-				}
-			}
-		}
-							
-		Thread.yield();
-				
-		return true;
-	}
-	
-	/**
-	 * Run thread method for the Bus Reader
-	 */
-	@Override
-	public void run() {
-		while (this.alive) {
-			try {
-				for (String event: this.consumer.fetch()) {					
-					synchronized (this) {
-						this.recentEvents.add(event);
-					}
-					
-					netLogger.info("[IN|{}|{}]{}{}",
-						           this.getTopicCommInfrastructure(), this.topic, 
-						           System.lineSeparator(), event);
-					
-					broadcast(event);
-					
-					if (!this.alive)
-						break;
-				}
-			} catch (Exception e) {
-				logger.error("{}: cannot fetch because of ", this, e.getMessage(), e);
-			}
-		}
-		
-		logger.info("{}: exiting thread", this);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean offer(String event) {
-		if (!this.alive) {
-			throw new IllegalStateException(this + " is not alive.");
-		}
-		
-		synchronized (this) {
-			this.recentEvents.add(event);
-		}
-		
-		netLogger.info("[IN|{}|{}]{}{}",this.getTopicCommInfrastructure(),this.topic, 
-				       System.lineSeparator(), event);
-		
-		
-		return broadcast(event);
-	}
-	
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("SingleThreadedBusTopicSource [consumerGroup=").append(consumerGroup)
-				.append(", consumerInstance=").append(consumerInstance).append(", fetchTimeout=").append(fetchTimeout)
-				.append(", fetchLimit=").append(fetchLimit)
-				.append(", consumer=").append(this.consumer).append(", alive=")
-				.append(alive).append(", locked=").append(locked).append(", uebThread=").append(busPollerThread)
-				.append(", topicListeners=").append(topicListeners.size()).append(", toString()=").append(super.toString())
-				.append("]");
-		return builder.toString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAlive() {
-		return alive;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getConsumerGroup() {
-		return consumerGroup;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getConsumerInstance() {
-		return consumerInstance;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		this.stop();
-		this.topicListeners.clear();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getFetchTimeout() {
-		return fetchTimeout;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int getFetchLimit() {
-		return fetchLimit;
-	}
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
deleted file mode 100644
index 7e3e3153..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedDmaapTopicSource.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This topic reader implementation specializes in reading messages
- * over DMAAP topic and notifying its listeners
- */
-public class SingleThreadedDmaapTopicSource extends SingleThreadedBusTopicSource
-                                            implements DmaapTopicSource, Runnable {	
-
-	private static Logger logger = LoggerFactory.getLogger(SingleThreadedDmaapTopicSource.class);
-	
-	protected boolean allowSelfSignedCerts;
-	protected final String userName;
-	protected final String password;
-	
-	protected String environment = null;
-	protected String aftEnvironment = null;
-	protected String partner = null;
-	protected String latitude = null;
-	protected String longitude = null;
-	
-	protected Map<String,String> additionalProps = null;
-
-	
-	/**
-	 * 
-	 * @param servers DMaaP servers
-	 * @param topic DMaaP Topic to be monitored
-	 * @param apiKey DMaaP API Key (optional)
-	 * @param apiSecret DMaaP API Secret (optional)
-	 * @param consumerGroup DMaaP Reader Consumer Group
-	 * @param consumerInstance DMaaP Reader Instance
-	 * @param fetchTimeout DMaaP fetch timeout
-	 * @param fetchLimit DMaaP fetch limit
-	 * @param environment DME2 Environment
-	 * @param aftEnvironment DME2 AFT Environment
-	 * @param partner DME2 Partner
-	 * @param latitude DME2 Latitude
-	 * @param longitude DME2 Longitude
-	 * @param additionalProps Additional properties to pass to DME2
-	 * @param useHttps does connection use HTTPS?
-	 * @param allowSelfSignedCerts are self-signed certificates allow
-	 * 
-	 * @throws IllegalArgumentException An invalid parameter passed in
-	 */
-	public SingleThreadedDmaapTopicSource(List<String> servers, String topic, 
-											String apiKey, String apiSecret,
-											String userName, String password,
-											String consumerGroup, String consumerInstance,
-											int fetchTimeout, int fetchLimit,
-											String environment, String aftEnvironment, String partner,
-											String latitude, String longitude, Map<String,String> additionalProps,
-											boolean useHttps, boolean allowSelfSignedCerts)
-			throws IllegalArgumentException {
-			
-		super(servers, topic, apiKey, apiSecret, 
-			  consumerGroup, consumerInstance, 
-			  fetchTimeout, fetchLimit, useHttps,allowSelfSignedCerts);
-		
-		this.userName = userName;
-		this.password = password;
-		
-		this.environment = environment;
-		this.aftEnvironment = aftEnvironment;
-		this.partner = partner;
-		
-		this.latitude = latitude;
-		this.longitude = longitude;
-		
-		this.additionalProps = additionalProps;
-		try {
-			this.init();
-		} catch (Exception e) {
-			logger.error("ERROR during init of topic {}", this.topic);
-			throw new IllegalArgumentException(e);
-		}
-	}
-
-	/**
-	 * 
-	 * @param servers DMaaP servers
-	 * @param topic DMaaP Topic to be monitored
-	 * @param apiKey DMaaP API Key (optional)
-	 * @param apiSecret DMaaP API Secret (optional)
-	 * @param consumerGroup DMaaP Reader Consumer Group
-	 * @param consumerInstance DMaaP Reader Instance
-	 * @param fetchTimeout DMaaP fetch timeout
-	 * @param fetchLimit DMaaP fetch limit
-	 * @param useHttps does connection use HTTPS?
-	 * @param allowSelfSignedCerts are self-signed certificates allow
-	 * @throws IllegalArgumentException An invalid parameter passed in
-	 */
-	public SingleThreadedDmaapTopicSource(List<String> servers, String topic, 
-			                              String apiKey, String apiSecret,
-			                              String userName, String password,
-			                              String consumerGroup, String consumerInstance, 
-			                              int fetchTimeout, int fetchLimit, boolean useHttps, boolean allowSelfSignedCerts)
-			throws IllegalArgumentException {
-		
-		
-		super(servers, topic, apiKey, apiSecret, 
-			  consumerGroup, consumerInstance, 
-			  fetchTimeout, fetchLimit, useHttps, allowSelfSignedCerts);
-		
-		this.userName = userName;
-		this.password = password;		
-		
-		try {
-			this.init();
-		} catch (Exception e) {
-			logger.warn("dmaap-source: cannot create topic {} because of {}", topic, e.getMessage(), e);
-			throw new IllegalArgumentException(e);
-		}
-	}
-	
-
-	/**
-	 * Initialize the Cambria or MR Client
-	 */
-	@Override
-	public void init() throws Exception {
-		if (this.userName == null || this.userName.isEmpty() || 
-				this.password == null || this.password.isEmpty()) {
-				this.consumer =
-						new BusConsumer.CambriaConsumerWrapper(this.servers, this.topic, 
-								                           this.apiKey, this.apiSecret,
-								                           this.consumerGroup, this.consumerInstance,
-								                           this.fetchTimeout, this.fetchLimit,
-								                           this.useHttps, this.allowSelfSignedCerts);
-		} else if ((this.environment == null    || this.environment.isEmpty()) &&
-				   (this.aftEnvironment == null || this.aftEnvironment.isEmpty()) &&
-				   (this.latitude == null	   || this.latitude.isEmpty()) &&
-				   (this.longitude == null	   || this.longitude.isEmpty()) &&
-				   (this.partner == null 	   || this.partner.isEmpty())) {
-			this.consumer =
-					new BusConsumer.DmaapAafConsumerWrapper(this.servers, this.topic, 
-							                            this.apiKey, this.apiSecret,
-							                            this.userName, this.password,
-							                            this.consumerGroup, this.consumerInstance,
-							                            this.fetchTimeout, this.fetchLimit, this.useHttps);
-		} else {
-			this.consumer =
-					new BusConsumer.DmaapDmeConsumerWrapper(this.servers, this.topic, 
-							                            this.apiKey, this.apiSecret,
-							                            this.userName, this.password,
-							                            this.consumerGroup, this.consumerInstance,
-							                            this.fetchTimeout, this.fetchLimit,
-							                            this.environment, this.aftEnvironment, this.partner,
-							                            this.latitude, this.longitude, this.additionalProps, this.useHttps);
-		}
-			
-		logger.info("{}: INITTED", this);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public CommInfrastructure getTopicCommInfrastructure() {
-		return Topic.CommInfrastructure.DMAAP;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("SingleThreadedDmaapTopicSource [userName=").append(userName).append(", password=")
-				.append((password == null || password.isEmpty()) ? "-" : password.length())
-				.append(", getTopicCommInfrastructure()=").append(getTopicCommInfrastructure())
-				.append(", toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
deleted file mode 100644
index 641eddaa..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/SingleThreadedUebTopicSource.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.List;
-
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
-
-/**
- * This topic source implementation specializes in reading messages
- * over an UEB Bus topic source and notifying its listeners
- */
-public class SingleThreadedUebTopicSource extends SingleThreadedBusTopicSource 
-                                          implements UebTopicSource {
-
-	/**
-	 * 
-	 * @param servers UEB servers
-	 * @param topic UEB Topic to be monitored
-	 * @param apiKey UEB API Key (optional)
-	 * @param apiSecret UEB API Secret (optional)
-	 * @param consumerGroup UEB Reader Consumer Group
-	 * @param consumerInstance UEB Reader Instance
-	 * @param fetchTimeout UEB fetch timeout
-	 * @param fetchLimit UEB fetch limit
-	 * @param useHttps does topicSource use HTTPS?
-	 * @param allowSelfSignedCerts does topicSource allow self-signed certs?
-	 * 
-	 * @throws IllegalArgumentException An invalid parameter passed in
-	 */
-	
-		
-	public SingleThreadedUebTopicSource(List<String> servers, String topic, 
-			                            String apiKey, String apiSecret,
-			                            String consumerGroup, String consumerInstance, 
-			                            int fetchTimeout, int fetchLimit, boolean useHttps, boolean allowSelfSignedCerts)
-			throws IllegalArgumentException {
-		
-		super(servers, topic, apiKey, apiSecret, 
-			  consumerGroup, consumerInstance, 
-			  fetchTimeout, fetchLimit, useHttps, allowSelfSignedCerts);
-		
-		this.allowSelfSignedCerts = allowSelfSignedCerts;
-		
-		this.init();
-	}
-	
-	/**
-	 * Initialize the Cambria client
-	 */
-	@Override
-	public void init() {
-		this.consumer =
-			new BusConsumer.CambriaConsumerWrapper(this.servers, this.topic, 
-					                           this.apiKey, this.apiSecret,
-					                           this.consumerGroup, this.consumerInstance,
-					                           this.fetchTimeout, this.fetchLimit, this.useHttps, this.allowSelfSignedCerts);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public CommInfrastructure getTopicCommInfrastructure() {
-		return Topic.CommInfrastructure.UEB;
-	}
-	
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("SingleThreadedUebTopicSource [getTopicCommInfrastructure()=")
-				.append(getTopicCommInfrastructure()).append(", toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java
deleted file mode 100644
index ff3d4667..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/event/comm/bus/internal/TopicBase.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.event.comm.bus.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.collections4.queue.CircularFifoQueue;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class TopicBase implements Topic {
-	
-	/**
-	 * logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(TopicBase.class);
-	
-	/**
-	 * list of servers
-	 */
-	protected List<String> servers;
-
-	/**
-	 * Topic
-	 */
-	protected String topic;
-	
-	/**
-	 * event cache
-	 */
-	protected CircularFifoQueue<String> recentEvents = new CircularFifoQueue<String>(10);
-		
-	/**
-	 * Am I running?
-	 * reflects invocation of start()/stop() 
-	 * !locked & start() => alive
-	 * stop() => !alive
-	 */
-	protected volatile boolean alive = false;
-	
-	/**
-	 * Am I locked?
-	 * reflects invocation of lock()/unlock() operations
-	 * locked => !alive (but not in the other direction necessarily)
-	 * locked => !offer, !run, !start, !stop (but this last one is obvious
-	 *                                        since locked => !alive)
-	 */
-	protected volatile boolean locked = false;
-	
-	/**
-	 * All my subscribers for new message notifications
-	 */
-	protected final ArrayList<TopicListener> topicListeners = new ArrayList<TopicListener>();
-	
-	/**
-	 * Instantiates a new Topic Base
-	 * 
-	 * @param servers list of servers
-	 * @param topic topic name
-	 *  
-	 * @return a Topic Base
-	 * @throws IllegalArgumentException if invalid parameters are present
-	 */
-	public TopicBase(List<String> servers, String topic) throws IllegalArgumentException {
-		
-		if (servers == null || servers.isEmpty()) {
-			throw new IllegalArgumentException("Server(s) must be provided");
-		}
-		
-		if (topic == null || topic.isEmpty()) {
-			throw new IllegalArgumentException("A Topic must be provided");
-		}
-		
-		this.servers = servers;
-		this.topic = topic;
-	}
-	
-	@Override
-	public void register(TopicListener topicListener) 
-		throws IllegalArgumentException {		
-		
-		logger.info("{}: registering {}", this, topicListener);
-		
-		synchronized(this) {
-			if (topicListener == null)
-				throw new IllegalArgumentException("TopicListener must be provided");
-			
-			for (TopicListener listener: this.topicListeners) {
-				if (listener == topicListener) return;
-			}
-			
-			this.topicListeners.add(topicListener);
-		}
-	}
-
-	@Override
-	public void unregister(TopicListener topicListener) {
-		
-		logger.info("{}: unregistering {}", this, topicListener);
-		
-		synchronized (this) {
-			if (topicListener == null)
-				throw new IllegalArgumentException("TopicListener must be provided");
-			
-			this.topicListeners.remove(topicListener);
-		}
-	}
-	
-	/**
-	 * broadcast event to all listeners
-	 * 
-	 * @param message the event
-	 * @return true if all notifications are performed with no error, false otherwise
-	 */
-	protected boolean broadcast(String message) {
-		List<TopicListener> snapshotListeners = this.snapshotTopicListeners();
-		
-		boolean success = true;
-		for (TopicListener topicListener: snapshotListeners) {
-			try {
-				topicListener.onTopicEvent(this.getTopicCommInfrastructure(), this.topic, message);
-			} catch (Exception e) {
-				logger.warn("{}: notification error @ {} because of {}", 
-						    this, topicListener, e.getMessage(), e);
-				success = false;
-			}
-		}
-		return success;
-	}
-	
-	/**
-	 * take a snapshot of current topic listeners
-	 * 
-	 * @return the topic listeners
-	 */
-	protected synchronized List<TopicListener> snapshotTopicListeners() {
-		@SuppressWarnings("unchecked")
-		List<TopicListener> listeners = (List<TopicListener>) topicListeners.clone();
-		return listeners;
-	}
-	
-	@Override
-	public boolean lock() {	
-
-		logger.info("{}: locking", this);
-		
-		synchronized (this) {
-			if (this.locked)
-				return true;
-			
-			this.locked = true;
-		}
-		
-		return this.stop();
-	}
-
-	@Override
-	public boolean unlock() {		
-		logger.info("{}: unlocking", this);
-		
-		synchronized(this) {
-			if (!this.locked)
-				return true;
-			
-			this.locked = false;
-		}
-		
-		try {
-			return this.start();
-		} catch (Exception e) {
-			logger.warn("{}: cannot after unlocking because of {}", this, e.getMessage(), e);
-			return false;
-		}
-	}
-	
-	@Override
-	public boolean isLocked() {
-		return this.locked;
-	}	
-	
-	@Override
-	public String getTopic() {
-		return topic;
-	}
-	
-	@Override
-	public boolean isAlive() {
-		return this.alive;
-	}
-	
-	@Override
-	public List<String> getServers() {
-		return servers;
-	}
-
-	@Override
-	public synchronized String[] getRecentEvents() {
-		String[] events = new String[recentEvents.size()];
-		return recentEvents.toArray(events);
-	}
-	
-	
-	@Override
-	public String toString() {
-		return "TopicBase [servers=" + servers + ", topic=" + topic + ", #recentEvents=" + recentEvents.size() + ", locked="
-				+ locked + ", #topicListeners=" + topicListeners.size() + "]";
-	}
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java
deleted file mode 100644
index 2e81b2c8..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.client;
-
-import javax.ws.rs.core.Response;
-
-import org.openecomp.policy.drools.properties.Startable;
-
-public interface HttpClient extends Startable {
-	
-	public Response get(String path);
-	
-	public Response get();
-	
-	public static <T> T getBody(Response response, Class<T> entityType) {
-		return response.readEntity(entityType);
-	}
-
-	public String getName();
-	public boolean isHttps();
-	public boolean isSelfSignedCerts();
-	public String getHostname();
-	public int getPort();
-	public String getBasePath();
-	public String getUserName();
-	public String getPassword();
-	public String getBaseUrl();
-	
-	
-	public static final HttpClientFactory factory = new IndexedHttpClientFactory();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java
deleted file mode 100644
index 15586b66..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/HttpClientFactory.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.client;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.http.client.internal.JerseyClient;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public interface HttpClientFactory {
-	
-	public HttpClient build(String name, boolean https, 
-                            boolean selfSignedCerts,
-                            String hostname, int port, 
-                            String baseUrl, String userName,
-                            String password, boolean managed) 
-    throws Exception;
-	
-	public ArrayList<HttpClient> build(Properties properties) throws Exception;
-	
-	public HttpClient get(String name);
-	
-	public List<HttpClient> inventory();
-	
-	public void destroy(String name);
-	
-	public void destroy();
-}
-
-class IndexedHttpClientFactory implements HttpClientFactory {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(IndexedHttpClientFactory.class);
-	
-	protected HashMap<String, HttpClient> clients = new HashMap<String, HttpClient>();
-
-	@Override
-	public synchronized HttpClient build(String name, boolean https, boolean selfSignedCerts, 
-			                             String hostname, int port,
-			                             String baseUrl, String userName, String password,
-			                             boolean managed) 
-	throws Exception {
-		if (clients.containsKey(name))
-			return clients.get(name);
-		
-		JerseyClient client = 
-				new JerseyClient(name, https, selfSignedCerts, hostname, port, baseUrl, userName, password);
-		
-		if (managed)
-			clients.put(name, client);
-		
-		return client;
-	}
-
-	@Override
-	public synchronized ArrayList<HttpClient> build(Properties properties) throws Exception {
-		ArrayList<HttpClient> clientList = new ArrayList<HttpClient>();
-		
-		String clientNames = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES);
-		if (clientNames == null || clientNames.isEmpty()) {
-			return clientList;
-		}
-		
-		List<String> clientNameList = 
-				new ArrayList<String>(Arrays.asList(clientNames.split("\\s*,\\s*")));
-		
-		for (String clientName : clientNameList) {
-			String httpsString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + 
-                                                        clientName + 
-                                                        PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX);
-			boolean https = false;
-			if (httpsString != null && !httpsString.isEmpty()) {
-				https = Boolean.parseBoolean(httpsString);
-			}
-			
-			String hostName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
-					                                 clientName + 
-                                                     PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX);
-					
-			String servicePortString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + 
-		                                                      clientName + 
-		                                                      PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX);
-			int port;
-			try {
-				if (servicePortString == null || servicePortString.isEmpty()) {
-					continue;
-				}
-				port = Integer.parseInt(servicePortString);
-			} catch (NumberFormatException nfe) {
-				logger.error("http-client-factory: cannot parse port {}", servicePortString, nfe);
-				continue;
-			}
-			
-			String baseUrl = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
-					                                clientName + 
-                                                    PolicyProperties.PROPERTY_HTTP_URL_SUFFIX);
-			
-			String userName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
-					                                 clientName + 
-                                                     PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX);
-
-			String password = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
-		                                             clientName + 
-                                                     PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX);
-			
-			String managedString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." +
-					                                      clientName + 
-					                                      PolicyProperties.PROPERTY_MANAGED_SUFFIX);
-			boolean managed = true;
-			if (managedString != null && !managedString.isEmpty()) {
-				managed = Boolean.parseBoolean(managedString);
-			}
-			
-			try {
-				HttpClient client =
-						this.build(clientName, https, https, hostName, port, baseUrl, 
-								   userName, password, managed);
-				clientList.add(client);
-			} catch (Exception e) {
-				logger.error("http-client-factory: cannot build client {}", clientName, e);
-			}
-		}
-		
-		return clientList;
-	}
-
-	@Override
-	public synchronized HttpClient get(String name) {
-		if (clients.containsKey(name)) {
-			return clients.get(name);
-		} 
-		
-		throw new IllegalArgumentException("Http Client " + name + " not found");
-	}
-
-	@Override
-	public synchronized List<HttpClient> inventory() {
-		return new ArrayList<HttpClient>(this.clients.values());
-	}
-
-	@Override
-	public synchronized void destroy(String name) {
-		if (!clients.containsKey(name)) {
-			return;
-		}
-		
-		HttpClient client = clients.remove(name);
-		try {
-			client.shutdown();
-		} catch (IllegalStateException e) {
-			logger.error("http-client-factory: cannot shutdown client {}", client, e);
-		}
-	}
-
-	@Override
-	public void destroy() {
-		List<HttpClient> clientsInventory = this.inventory();
-		for (HttpClient client: clientsInventory) {
-			client.shutdown();
-		}
-		
-		synchronized(this) {
-			this.clients.clear();
-		}
-	}
-	
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java
deleted file mode 100644
index 6cbabb2c..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/client/internal/JerseyClient.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.http.client.internal;
-
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
-
-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-public class JerseyClient implements HttpClient {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(JerseyClient.class); 
-	
-	protected final String name;
-	protected final boolean https;
-	protected final boolean selfSignedCerts;
-	protected final String hostname;
-	protected final int port;
-	protected final String basePath;
-	protected final String userName;
-	protected final String password;
-	
-	protected final Client client;
-	protected final String baseUrl;
-	
-	protected boolean alive = true;
-	
-	
-	public JerseyClient(String name, boolean https, 
-			            boolean selfSignedCerts,
-			            String hostname, int port, 
-			            String basePath, String userName,
-			            String password) 
-	throws Exception {
-		
-		super();
-		
-		if (name == null || name.isEmpty())
-			throw new IllegalArgumentException("Name must be provided");
-		
-		if (hostname == null || hostname.isEmpty())
-			throw new IllegalArgumentException("Hostname must be provided");
-		
-		if (port <= 0 && port >= 65535)
-			throw new IllegalArgumentException("Invalid Port provided: " + port);
-		
-		this.name = name;
-		this.https = https;
-		this.hostname = hostname;
-		this.port = port;
-		this.basePath = basePath;
-		this.userName = userName;
-		this.password = password;
-		this.selfSignedCerts = selfSignedCerts;
-		
-		StringBuffer tmpBaseUrl = new StringBuffer();
-		if (this.https) {
-			tmpBaseUrl.append("https://");
-			ClientBuilder clientBuilder;
-			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
-			if (this.selfSignedCerts) {
-				sslContext.init(null, new TrustManager[]{new X509TrustManager() {
-					@Override
-			        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {}
-					@Override
-			        public void checkServerTrusted(X509Certificate[]  chain, String authType) throws CertificateException {}
-					@Override
-			        public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; }
-	
-			    }}, new SecureRandom());
-				 clientBuilder = ClientBuilder.newBuilder().sslContext(sslContext).hostnameVerifier(new HostnameVerifier() {
-					@Override
-					public boolean verify(String hostname, SSLSession session) {return true;}
-				 });
-			} else {
-				sslContext.init(null, null, null);
-				clientBuilder = ClientBuilder.newBuilder().sslContext(sslContext);
-			}
-			this.client = clientBuilder.build();
-		} else {	
-			tmpBaseUrl.append("http://");
-			this.client = ClientBuilder.newClient();
-		}
-		
-		if (this.userName != null && !this.userName.isEmpty() &&
-			this.password != null && !this.password.isEmpty()) {
-			HttpAuthenticationFeature authFeature = HttpAuthenticationFeature.basic(userName, password);
-			this.client.register(authFeature);
-		}
-		
-		this.baseUrl = tmpBaseUrl.append(this.hostname).append(":").
-				                  append(this.port).append("/").
-		                          append((this.basePath == null) ? "" : this.basePath).
-		                          toString();
-	}
-	
-	@Override
-	public Response get(String path) {		
-		if (path != null && !path.isEmpty())
-			return this.client.target(this.baseUrl).path(path).request().get();
-		else
-			return this.client.target(this.baseUrl).request().get();
-	}
-	
-	@Override
-	public Response get() {
-		return this.client.target(this.baseUrl).request().get();
-	}
-	
-
-	@Override
-	public boolean start() throws IllegalStateException {
-		return alive;
-	}
-
-	@Override
-	public boolean stop() throws IllegalStateException {
-		return !alive;
-	}
-
-	@Override
-	public void shutdown() throws IllegalStateException {
-		synchronized(this) {
-			alive = false;
-		}
-		
-		try {
-			this.client.close();
-		} catch (Exception e) {
-			logger.warn("{}: cannot close because of {}", this, 
-				        e.getMessage(), e);
-		}
-	}
-
-	@Override
-	public synchronized boolean isAlive() {
-		return this.alive;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public boolean isHttps() {
-		return https;
-	}
-
-	@Override
-	public boolean isSelfSignedCerts() {
-		return selfSignedCerts;
-	}
-
-	@Override
-	public String getHostname() {
-		return hostname;
-	}
-
-	public int getPort() {
-		return port;
-	}
-
-	@Override
-	public String getBasePath() {
-		return basePath;
-	}
-
-	@Override
-	public String getUserName() {
-		return userName;
-	}
-
-	@JsonIgnore
-	@Override
-	public String getPassword() {
-		return password;
-	}
-
-	@Override
-	public String getBaseUrl() {
-		return baseUrl;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("JerseyClient [name=");
-		builder.append(name);
-		builder.append(", https=");
-		builder.append(https);
-		builder.append(", selfSignedCerts=");
-		builder.append(selfSignedCerts);
-		builder.append(", hostname=");
-		builder.append(hostname);
-		builder.append(", port=");
-		builder.append(port);
-		builder.append(", basePath=");
-		builder.append(basePath);
-		builder.append(", userName=");
-		builder.append(userName);
-		builder.append(", password=");
-		builder.append(password);
-		builder.append(", client=");
-		builder.append(client);
-		builder.append(", baseUrl=");
-		builder.append(baseUrl);
-		builder.append(", alive=");
-		builder.append(alive);
-		builder.append("]");
-		return builder.toString();
-	}
-
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java
deleted file mode 100644
index 106602bc..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.server;
-
-import org.openecomp.policy.drools.properties.Startable;
-
-/**
- * A Jetty Server to server REST Requests
- */
-public interface HttpServletServer extends Startable {
-
-	/**
-	 * 
-	 * @return port
-	 */
-	public int getPort();
-	
-	/**
-	 * enables basic authentication with user and password on the the relative path relativeUriPath
-	 * 
-	 * @param user
-	 * @param password
-	 * @param relativeUriPath
-	 */
-	public void setBasicAuthentication(String user, String password, String relativeUriPath);
-
-	/**
-	 * adds a JAX-RS servlet class to serve REST requests
-	 * 
-	 * @param servletPath servlet path
-	 * @param restClass JAX-RS API Class
-	 * @throws IllegalArgumentException unable to process because of invalid input
-	 * @throws IllegalStateException unable to process because of invalid state
-	 */
-	public void addServletClass(String servletPath, String restClass) 
-			throws IllegalArgumentException, IllegalStateException;
-
-	/**
-	 * adds a package containing JAX-RS classes to serve REST requests
-	 * 
-	 * @param servletPath servlet path
-	 * @param restPackage JAX-RS package to scan
-	 * @throws IllegalArgumentException unable to process because of invalid input
-	 * @throws IllegalStateException unable to process because of invalid state
-	 */
-	public void addServletPackage(String servletPath, String restPackage) 
-			throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * blocking start of the http server
-	 * 
-	 * @param maxWaitTime max time to wait for the start to take place
-	 * @return true if start was successful
-	 * 
-	 * @throws IllegalArgumentException if arguments are invalid
-	 */
-	public boolean waitedStart(long maxWaitTime) throws IllegalArgumentException;
-	
-	
-	/**
-	 * factory for managing and tracking DMAAP sources
-	 */
-	public static HttpServletServerFactory factory = new IndexedHttpServletServerFactory();
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java
deleted file mode 100644
index 83f4b3d7..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/HttpServletServerFactory.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.server;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.openecomp.policy.drools.http.server.internal.JettyJerseyServer;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-
-/**
- * Factory of HTTP Servlet-Enabled Servlets
- */
-public interface HttpServletServerFactory {
-
-	/**
-	 * builds an http server with support for servlets
-	 * 
-	 * @param name name
-	 * @param host binding host
-	 * @param port port
-	 * @param contextPath server base path
-	 * @param swagger enable swagger documentation
-	 * @param managed is it managed by infrastructure
-	 * @return http server
-	 * @throws IllegalArgumentException when invalid parameters are provided
-	 */
-	public HttpServletServer build(String name, String host, int port, String contextPath, 
-			                       boolean swagger, boolean managed)
-		   throws IllegalArgumentException;
-	
-	/**
-	 * list of http servers per properties
-	 * 
-	 * @param properties properties based configuration
-	 * @return list of http servers
-	 * @throws IllegalArgumentException when invalid parameters are provided
-	 */
-	public ArrayList<HttpServletServer> build(Properties properties) throws IllegalArgumentException;
-	
-	/**
-	 * gets a server based on the port
-	 * 
-	 * @param port port
-	 * @return http server
-	 */
-	public HttpServletServer get(int port);
-	
-	/**
-	 * provides an inventory of servers
-	 * 
-	 * @return inventory of servers
-	 */
-	public List<HttpServletServer> inventory();
-	
-	/**
-	 * destroys server bound to a port
-	 * @param port
-	 */
-	public void destroy(int port);
-	
-	/**
-	 * destroys the factory and therefore all servers
-	 */
-	public void destroy();
-}
-
-/**
- * Indexed factory implementation
- */
-class IndexedHttpServletServerFactory implements HttpServletServerFactory {
-	
-	/**
-	 * logger
-	 */
-	protected static Logger logger = LoggerFactory.getLogger(IndexedHttpServletServerFactory.class);	
-	
-	/**
-	 * servers index
-	 */
-	protected HashMap<Integer, HttpServletServer> servers = new HashMap<Integer, HttpServletServer>();
-
-	@Override
-	public synchronized HttpServletServer build(String name, String host, int port, 
-			                                    String contextPath, boolean swagger,
-			                                    boolean managed) 
-		throws IllegalArgumentException {	
-		
-		if (servers.containsKey(port))
-			return servers.get(port);
-		
-		JettyJerseyServer server = new JettyJerseyServer(name, host, port, contextPath, swagger);
-		if (managed)
-			servers.put(port, server);
-		
-		return server;
-	}
-	
-	@Override
-	public synchronized ArrayList<HttpServletServer> build(Properties properties) 
-		throws IllegalArgumentException {	
-		
-		ArrayList<HttpServletServer> serviceList = new ArrayList<HttpServletServer>();
-		
-		String serviceNames = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES);
-		if (serviceNames == null || serviceNames.isEmpty()) {
-			logger.warn("No topic for HTTP Service: {}", properties);
-			return serviceList;
-		}
-		
-		List<String> serviceNameList = 
-				new ArrayList<String>(Arrays.asList(serviceNames.split("\\s*,\\s*")));
-		
-		for (String serviceName : serviceNameList) {
-			String servicePortString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + 
-		                                                      serviceName + 
-		                                                      PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX);
-			
-			int servicePort;
-			try {
-				if (servicePortString == null || servicePortString.isEmpty()) {
-					if (logger.isWarnEnabled())
-						logger.warn("No HTTP port for service in {}", serviceName);
-					continue;
-				}
-				servicePort = Integer.parseInt(servicePortString);
-			} catch (NumberFormatException nfe) {
-				if (logger.isWarnEnabled())
-					logger.warn("No HTTP port for service in {}", serviceName);
-				continue;
-			}
-			
-			String hostName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                     serviceName + 
-                                                     PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX);
-			
-			String contextUriPath = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                        serviceName + 
-                                                        PolicyProperties.PROPERTY_HTTP_CONTEXT_URIPATH_SUFFIX);
-			
-			String userName = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-					                                 serviceName + 
-                                                     PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX);
-
-			String password = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                     serviceName + 
-                                                     PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX);
-			
-			String authUriPath = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                        serviceName + 
-                                                        PolicyProperties.PROPERTY_HTTP_AUTH_URIPATH_SUFFIX);
-			
-			String restClasses = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                      serviceName + 
-                                                      PolicyProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX);
-			
-			String restPackages = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                        serviceName + 
-                                                        PolicyProperties.PROPERTY_HTTP_REST_PACKAGES_SUFFIX);
-			String restUriPath = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                         serviceName + 
-                                                         PolicyProperties.PROPERTY_HTTP_REST_URIPATH_SUFFIX);
-			
-			String managedString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-                                                          serviceName + 
-                                                          PolicyProperties.PROPERTY_MANAGED_SUFFIX);		
-			boolean managed = true;
-			if (managedString != null && !managedString.isEmpty()) {
-				managed = Boolean.parseBoolean(managedString);
-			}
-			
-			String swaggerString = properties.getProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." +
-									                      serviceName + 
-									                      PolicyProperties.PROPERTY_HTTP_SWAGGER_SUFFIX);		
-			boolean swagger = false;
-			if (swaggerString != null && !swaggerString.isEmpty()) {
-				swagger = Boolean.parseBoolean(swaggerString);
-			}
-			
-			HttpServletServer service = build(serviceName, hostName, servicePort, contextUriPath, swagger, managed);
-			if (userName != null && !userName.isEmpty() && password != null && !password.isEmpty()) {
-				service.setBasicAuthentication(userName, password, authUriPath);
-			}
-			
-			if (restClasses != null && !restClasses.isEmpty()) {
-				List<String> restClassesList = 
-						new ArrayList<String>(Arrays.asList(restClasses.split("\\s*,\\s*")));
-				for (String restClass : restClassesList)
-					service.addServletClass(restUriPath, restClass);
-			}
-			
-			if (restPackages != null && !restPackages.isEmpty()) {
-				List<String> restPackageList = 
-						new ArrayList<String>(Arrays.asList(restPackages.split("\\s*,\\s*")));
-				for (String restPackage : restPackageList)
-					service.addServletPackage(restUriPath, restPackage);
-			}
-			
-			serviceList.add(service);
-		}
-		
-		return serviceList;
-	}
-
-	@Override
-	public synchronized HttpServletServer get(int port) throws IllegalArgumentException {
-		
-		if (servers.containsKey(port)) {
-			return servers.get(port);
-		} 
-		
-		throw new IllegalArgumentException("Http Server for " + port + " not found");
-	}
-
-	@Override
-	public synchronized List<HttpServletServer> inventory() {
-		 return new ArrayList<HttpServletServer>(this.servers.values());
-	}
-	
-	@Override
-	public synchronized void destroy(int port) throws IllegalArgumentException, IllegalStateException {
-		
-		if (!servers.containsKey(port)) {
-			return;
-		}
-		
-		HttpServletServer server = servers.remove(port);
-		server.shutdown();
-	}
-
-	@Override
-	public synchronized void destroy() throws IllegalArgumentException, IllegalStateException {
-		List<HttpServletServer> servers = this.inventory();
-		for (HttpServletServer server: servers) {
-			server.shutdown();
-		}
-		
-		synchronized(this) {
-			this.servers.clear();
-		}
-	}
-	
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java
deleted file mode 100644
index c60a62ca..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyJerseyServer.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.server.internal;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-import io.swagger.jersey.config.JerseyJaxrsConfig;
-
-/**
- * REST Jetty Server that uses Jersey Servlets to support JAX-RS Web Services
- */
-public class JettyJerseyServer extends JettyServletServer {
-	
-	/**
-	 * Jersey Packages Init Param Name
-	 */
-	protected static final String JERSEY_INIT_PACKAGES_PARAM_NAME = "jersey.config.server.provider.packages";
-	
-	/**
-	 * Jersey Packages Init Param Value
-	 */
-	protected static final String JERSEY_INIT_PACKAGES_PARAM_VALUE = "com.fasterxml.jackson.jaxrs.json";
-	
-	/**
-	 * Swagger Packages
-	 */
-	protected static final String SWAGGER_INIT_PACKAGES_PARAM_VALUE = "io.swagger.jaxrs.listing";
-	
-	/**
-	 * Jersey Classes Init Param Name
-	 */
-	protected static final String JERSEY_INIT_CLASSNAMES_PARAM_NAME = "jersey.config.server.provider.classnames";
-	
-	/**
-	 * Jersey Jackson Classes Init Param Value
-	 */
-	protected static final String JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE = "com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider";
-	
-	/**
-	 * Jersey Swagger Classes Init Param Value
-	 */
-	protected static final String SWAGGER_INIT_CLASSNAMES_PARAM_VALUE = "io.swagger.jaxrs.listing.ApiListingResource," +
-																        "io.swagger.jaxrs.listing.SwaggerSerializers";
-	/**
-	 * Logger
-	 */
-	protected static Logger logger = LoggerFactory.getLogger(JettyJerseyServer.class);
-	
-	/**
-	 * Container for servlets
-	 */
-	protected HashMap<String, ServletHolder> servlets = new HashMap<String, ServletHolder>();
-	
-	/**
-	 * Swagger ID
-	 */
-	protected String swaggerId = null;
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param name name
-	 * @param host host server host
-	 * @param port port server port
-	 * @param swagger support swagger?
-	 * @param contextPath context path
-	 * 
-	 * @throws IllegalArgumentException in invalid arguments are provided
-	 */
-	public JettyJerseyServer(String name, String host, int port, String contextPath, boolean swagger) 
-	       throws IllegalArgumentException {
-		
-		super(name, host, port, contextPath);
-		if (swagger) {
-			this.swaggerId = "swagger-" + this.port;
-			attachSwaggerServlet();
-		}
-	}
-	
-	/**
-	 * attaches a swagger initialization servlet
-	 */
-	protected void attachSwaggerServlet() {
-		
-		ServletHolder swaggerServlet = context.addServlet(JerseyJaxrsConfig.class, "/");
-
-		String hostname = this.connector.getHost();
-		if (hostname == null || hostname.isEmpty() || hostname.equals("0.0.0.0")) {
-			try {
-				hostname = InetAddress.getLocalHost().getHostName();
-			} catch (UnknownHostException e) {
-				logger.warn("{}: can't resolve connector's hostname: ", this);
-				hostname = "localhost";
-			}
-		}
-
-		swaggerServlet.setInitParameter("swagger.api.basepath",
-				"http://" + hostname + ":" + this.connector.getPort() + "/");
-		swaggerServlet.setInitParameter("swagger.context.id", swaggerId);
-		swaggerServlet.setInitParameter("swagger.scanner.id", swaggerId);
-		swaggerServlet.setInitParameter("swagger.pretty.print", "true");
-		swaggerServlet.setInitOrder(2);
-		
-        if (logger.isDebugEnabled())
-        	logger.debug("{}: Swagger Servlet has been attached: {}", this, swaggerServlet.dump());
-	}	
-	
-	/**
-	 * retrieves cached server based on servlet path
-	 * 
-	 * @param servletPath servlet path
-	 * @return the jetty servlet holder
-	 * 
-	 * @throws IllegalArgumentException if invalid arguments are provided
-	 */
-	protected synchronized ServletHolder getServlet(String servletPath)
-			  throws IllegalArgumentException {
-		
-		ServletHolder jerseyServlet = servlets.get(servletPath);
-		if (jerseyServlet == null) {
-			jerseyServlet = context.addServlet
-	                (org.glassfish.jersey.servlet.ServletContainer.class, servletPath);  
-			jerseyServlet.setInitOrder(0);
-			servlets.put(servletPath, jerseyServlet);
-		}
-		
-		return jerseyServlet;
-	}
-	
-	@Override
-	public synchronized void addServletPackage(String servletPath, String restPackage) 
-	       throws IllegalArgumentException, IllegalStateException {
-		
-    	if (restPackage == null || restPackage.isEmpty())
-			throw new IllegalArgumentException("No discoverable REST package provided");
-    	
-    	if (servletPath == null || servletPath.isEmpty())
-    		servletPath = "/*";
-		
-		ServletHolder jerseyServlet = this.getServlet(servletPath);
-		
-		String initClasses = 
-				jerseyServlet.getInitParameter(JERSEY_INIT_CLASSNAMES_PARAM_NAME);
-		if (initClasses != null && !initClasses.isEmpty())
-			logger.warn("Both packages and classes are used in Jetty+Jersey Configuration: {}", restPackage);
-		
-		String initPackages = 
-				jerseyServlet.getInitParameter(JERSEY_INIT_PACKAGES_PARAM_NAME);
-		if (initPackages == null) {
-			if (this.swaggerId != null) {
-				initPackages = JERSEY_INIT_PACKAGES_PARAM_VALUE + "," + 
-				               SWAGGER_INIT_PACKAGES_PARAM_VALUE + "," + 
-						       restPackage;
-				
-	        	jerseyServlet.setInitParameter("swagger.context.id", swaggerId);
-	    		jerseyServlet.setInitParameter("swagger.scanner.id", swaggerId);
-			} else {
-				initPackages = JERSEY_INIT_PACKAGES_PARAM_VALUE + "," + 
-				               restPackage;
-			}
-		} else {
-			initPackages = initPackages + "," + restPackage;
-		}
-		
-        jerseyServlet.setInitParameter(JERSEY_INIT_PACKAGES_PARAM_NAME,  initPackages);
-        
-        if (logger.isDebugEnabled())
-        	logger.debug("{}: added REST package: {}", this, jerseyServlet.dump());
-	}
-	
-	@Override
-	public synchronized void addServletClass(String servletPath, String restClass) 
-		       throws IllegalArgumentException, IllegalStateException {
-			
-    	if (restClass == null || restClass.isEmpty())
-			throw new IllegalArgumentException("No discoverable REST class provided");
-    	
-    	if (servletPath == null || servletPath.isEmpty())
-    		servletPath = "/*";
-		
-		ServletHolder jerseyServlet = this.getServlet(servletPath);
-		
-		String initPackages = 
-				jerseyServlet.getInitParameter(JERSEY_INIT_PACKAGES_PARAM_NAME);
-		if (initPackages != null && !initPackages.isEmpty())
-			logger.warn("Both classes and packages are used in Jetty+Jersey Configuration: {}", restClass);
-		
-		String initClasses = 
-				jerseyServlet.getInitParameter(JERSEY_INIT_CLASSNAMES_PARAM_NAME);
-		if (initClasses == null) {
-			if (this.swaggerId != null) {
-				initClasses = JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE + "," + 
-						      SWAGGER_INIT_CLASSNAMES_PARAM_VALUE + "," + 
-				              restClass;
-				
-	        	jerseyServlet.setInitParameter("swagger.context.id", swaggerId);
-	    		jerseyServlet.setInitParameter("swagger.scanner.id", swaggerId);
-			} else {
-				initClasses = JERSEY_JACKSON_INIT_CLASSNAMES_PARAM_VALUE + "," + restClass;
-			}			
-		} else {
-			initClasses = initClasses + "," + restClass;
-		}
-		
-        jerseyServlet.setInitParameter(JERSEY_INIT_CLASSNAMES_PARAM_NAME, initClasses);
-        
-        if (logger.isDebugEnabled())
-        	logger.debug("{}: added REST class: {}", this, jerseyServlet.dump());
-	}
-	
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("JettyJerseyServer [servlets=").append(servlets).append(", swaggerId=").append(swaggerId)
-				.append(", toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-}
diff --git a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java
deleted file mode 100644
index 009ad303..00000000
--- a/policy-endpoints/src/main/java/org/openecomp/policy/drools/http/server/internal/JettyServletServer.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.server.internal;
-
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
-import org.eclipse.jetty.security.HashLoginService;
-import org.eclipse.jetty.security.authentication.BasicAuthenticator;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.util.security.Constraint;
-import org.eclipse.jetty.util.security.Credential;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Http Server implementation using Embedded Jetty
- */
-public abstract class JettyServletServer implements HttpServletServer, Runnable {
-	
-	private static Logger logger = LoggerFactory.getLogger(JettyServletServer.class);
-
-	protected final String name;
-
-	protected final String host;
-	protected final int port;
-	
-	protected String user;
-	protected String password;
-	
-	protected final String contextPath;
-	
-	protected final Server jettyServer;
-	protected final ServletContextHandler context;
-	protected final ServerConnector connector;
-	
-	protected volatile Thread jettyThread;
-	
-	protected Object startCondition = new Object();
-	
-	public JettyServletServer(String name, String host, int port, String contextPath) 
-		   throws IllegalArgumentException {
-			
-		if (name == null || name.isEmpty())
-			name = "http-" + port;
-		
-		if (port <= 0 && port >= 65535)
-			throw new IllegalArgumentException("Invalid Port provided: " + port);
-		
-		if (host == null || host.isEmpty())
-			host = "localhost";
-		
-		if (contextPath == null || contextPath.isEmpty())
-			contextPath = "/";
-		
-		this.name = name;
-		
-		this.host = host;
-		this.port = port;
-
-		this.contextPath = contextPath;
-		
-        this.context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        this.context.setContextPath(contextPath);
-        
-        this.jettyServer = new Server();
-        
-        this.connector = new ServerConnector(this.jettyServer);
-        this.connector.setName(name);
-        this.connector.setReuseAddress(true);
-        this.connector.setPort(port);
-        this.connector.setHost(host);    
-        
-        this.jettyServer.addConnector(this.connector);       
-        this.jettyServer.setHandler(context);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void setBasicAuthentication(String user, String password, String servletPath) {
-        if (user == null || user.isEmpty() || password == null || password.isEmpty()) 
-        	throw new IllegalArgumentException("Missing user and/or password");
-        
-        if (servletPath == null || servletPath.isEmpty())
-        	servletPath = "/*";
-        	     	
-    	HashLoginService hashLoginService = new HashLoginService();
-        hashLoginService.putUser(user, 
-        		                Credential.getCredential(password), 
-        		                new String[] {"user"});
-        hashLoginService.setName(this.connector.getName() + "-login-service");
-        
-        Constraint constraint = new Constraint();
-        constraint.setName(Constraint.__BASIC_AUTH);
-        constraint.setRoles(new String[]{"user"});
-        constraint.setAuthenticate(true);
-         
-        ConstraintMapping constraintMapping = new ConstraintMapping();
-        constraintMapping.setConstraint(constraint);
-        constraintMapping.setPathSpec(servletPath);
-        
-        ConstraintSecurityHandler securityHandler = new ConstraintSecurityHandler();
-        securityHandler.setAuthenticator(new BasicAuthenticator());
-        securityHandler.setRealmName(this.connector.getName() + "-realm");
-        securityHandler.addConstraintMapping(constraintMapping);
-        securityHandler.setLoginService(hashLoginService);		
-        
-        this.context.setSecurityHandler(securityHandler);
-        
-		this.user = user;
-		this.password = password;
-	}
-	
-	/**
-	 * Jetty Server Execution
-	 */
-	@Override
-	public void run() {
-        try {
-        	logger.info("{}: STARTING", this);
-        	
-            this.jettyServer.start();
-            
-            if (logger.isInfoEnabled()) 
-            	logger.info("{}: STARTED: {}", this, this.jettyServer.dump());
-            
-        	synchronized(this.startCondition) {
-        		this.startCondition.notifyAll();
-        	}
-        	
-            this.jettyServer.join();
-        } catch (Exception e) {
-			logger.error("{}: error found while bringing up server", this, e);
-		} 
-	}
-	
-	@Override
-	public boolean waitedStart(long maxWaitTime) throws IllegalArgumentException {
-		logger.info("{}: WAITED-START", this);
-		
-		if (maxWaitTime < 0)
-			throw new IllegalArgumentException("max-wait-time cannot be negative");
-		
-		long pendingWaitTime = maxWaitTime;
-		
-		if (!this.start())
-			return false;
-		
-		synchronized (this.startCondition) {
-			
-			while (!this.jettyServer.isRunning()) {
-				try {
-					long startTs = System.currentTimeMillis();
-					
-					this.startCondition.wait(pendingWaitTime);
-					
-					if (maxWaitTime == 0)
-						/* spurious notification */
-						continue;
-					
-					long endTs = System.currentTimeMillis();
-					pendingWaitTime = pendingWaitTime - (endTs - startTs);
-					
-					logger.info("{}: pending time is {} ms.", this, pendingWaitTime);
-					
-					if (pendingWaitTime <= 0)
-						return false;
-					
-				} catch (InterruptedException e) {
-					logger.warn("{}: waited-start has been interrupted", this);
-					return false;			
-				}
-			}
-			
-			return (this.jettyServer.isRunning());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {
-		logger.info("{}: STARTING", this);
-		
-		synchronized(this) {			
-			if (jettyThread == null || 
-				!this.jettyThread.isAlive()) {
-				
-				this.jettyThread = new Thread(this);
-				this.jettyThread.setName(this.name + "-" + this.port);
-				this.jettyThread.start();
-			}
-		}
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() throws IllegalStateException {
-		logger.info("{}: STOPPING", this);
-		
-		synchronized(this) {
-			if (jettyThread == null) {
-				return true;
-			} 
-			
-			if (!jettyThread.isAlive()) {
-				this.jettyThread = null;
-			} 
-			
-			try {
-				this.connector.stop();
-			} catch (Exception e) {
-				logger.error("{}: error while stopping management server", this, e);
-			}
-			
-			try {
-				this.jettyServer.stop();
-			} catch (Exception e) {
-				logger.error("{}: error while stopping management server", this, e);
-				return false;
-			}
-			
-			Thread.yield();
-		}
-
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		logger.info("{}: SHUTTING DOWN", this);
-		
-		this.stop();
-		
-		if (this.jettyThread == null)
-			return;
-		
-		Thread jettyThreadCopy = this.jettyThread;
-
-		if (jettyThreadCopy.isAlive()) {
-			try {
-				jettyThreadCopy.join(1000L);
-			} catch (InterruptedException e) {
-				logger.warn("{}: error while shutting down management server", this);
-			}
-			if (!jettyThreadCopy.isInterrupted()) {
-				try {
-					jettyThreadCopy.interrupt();
-				} catch(Exception e) {
-					// do nothing
-					logger.warn("{}: exception while shutting down (OK)", this);
-				}
-			}
-		}
-		
-		this.jettyServer.destroy();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAlive() {
-		if (this.jettyThread != null)
-			return this.jettyThread.isAlive();
-		
-		return false;
-	}
-
-	@Override
-	public int getPort() {
-		return this.port;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @return the host
-	 */
-	public String getHost() {
-		return host;
-	}
-
-	/**
-	 * @return the user
-	 */
-	public String getUser() {
-		return user;
-	}
-
-	/**
-	 * @return the password
-	 */
-	@JsonIgnore
-	public String getPassword() {
-		return password;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("JettyServer [name=").append(name).append(", host=").append(host).append(", port=").append(port)
-				.append(", user=").append(user).append(", password=").append((password != null)).append(", contextPath=")
-				.append(contextPath).append(", jettyServer=").append(jettyServer).append(", context=").append(this.context)
-				.append(", connector=").append(connector).append(", jettyThread=").append(jettyThread)
-				.append("]");
-		return builder.toString();
-	}
-
-}
diff --git a/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java
new file mode 100644
index 00000000..0717a091
--- /dev/null
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpClientTest.java
@@ -0,0 +1,218 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.http.server.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Properties;
+
+import javax.ws.rs.core.Response;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpClientTest {
+	
+	private static Logger logger = LoggerFactory.getLogger(HttpClientTest.class);
+	
+	@BeforeClass
+	public static void setUp() {
+		logger.info("-- setup() --");
+		
+		/* echo server */
+		
+		HttpServletServer echoServerNoAuth = HttpServletServer.factory.build("echo", "localhost", 6666, "/", false, true);
+		echoServerNoAuth.addServletPackage("/*", HttpClientTest.class.getPackage().getName());
+		echoServerNoAuth.waitedStart(5000);
+		
+		/* no auth echo server */
+		
+		HttpServletServer echoServerAuth = HttpServletServer.factory.build("echo", "localhost", 6667, "/", false, true);
+		echoServerAuth.setBasicAuthentication("x", "y", null);
+		echoServerAuth.addServletPackage("/*", HttpClientTest.class.getPackage().getName());
+		echoServerAuth.waitedStart(5000);
+	}
+	
+	@AfterClass
+	public static void tearDown() {
+		logger.info("-- tearDown() --");
+		
+		HttpServletServer.factory.destroy();
+		HttpClient.factory.destroy();
+	}
+	
+	@Test
+	public void testHttpNoAuthClient() throws Exception {		
+		logger.info("-- testHttpNoAuthClient() --");
+
+		HttpClient client = HttpClient.factory.build("testHttpNoAuthClient", false, false, 
+				                                     "localhost", 6666, "junit/echo", 
+				                                     null, null, true);
+		Response response = client.get("hello");
+		String body = HttpClient.getBody(response, String.class);
+		
+		assertTrue(response.getStatus() == 200);
+		assertTrue(body.equals("hello"));
+	}
+	
+	@Test
+	public void testHttpAuthClient() throws Exception {		
+		logger.info("-- testHttpAuthClient() --");
+		
+		HttpClient client = HttpClient.factory.build("testHttpAuthClient",false, false, 
+				                                     "localhost", 6667, "junit/echo", 
+				                                     "x", "y", true);
+		Response response = client.get("hello");
+		String body = HttpClient.getBody(response, String.class);
+		
+		assertTrue(response.getStatus() == 200);
+		assertTrue(body.equals("hello"));
+	}
+	
+	@Test
+	public void testHttpAuthClient401() throws Exception {		
+		logger.info("-- testHttpAuthClient401() --");
+		
+		HttpClient client = HttpClient.factory.build("testHttpAuthClient401",false, false, 
+				                                     "localhost", 6667, "junit/echo", 
+				                                     null, null, true);
+		Response response = client.get("hello");
+		assertTrue(response.getStatus() == 401);
+	}
+    
+    @Test
+    public void testHttpAuthClientProps() throws Exception {
+    	logger.info("-- testHttpAuthClientProps() --");
+		
+		Properties httpProperties = new Properties();
+		
+		httpProperties.setProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES, "PAP,PDP");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
+			 "localhost");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
+			 "7777");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
+			 "testpap");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
+			 "alpha123");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, 
+			RestMockHealthCheck.class.getName());
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
+			 "true");
+		
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
+			 "localhost");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
+			 "7778");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
+			 "testpdp");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
+			 "alpha123");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, 
+			 RestMockHealthCheck.class.getName());
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
+			 "true");
+		
+		httpProperties.setProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES, "PAP,PDP");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
+			 "localhost");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
+			 "7777");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_URL_SUFFIX, 
+			 "pap/test");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX, 
+			 "false");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
+			 "testpap");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
+			 "alpha123");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
+			 "true");
+		
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
+			 "localhost");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
+			 "7778");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_URL_SUFFIX, 
+			 "pdp");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX, 
+			 "false");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
+			 "testpdp");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
+			 "alpha123");
+		httpProperties.setProperty
+			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
+			 "true");
+		
+		ArrayList<HttpServletServer> servers = HttpServletServer.factory.build(httpProperties);
+		assertTrue(servers.size() == 2);
+		
+		ArrayList<HttpClient> clients = HttpClient.factory.build(httpProperties);
+		assertTrue(clients.size() == 2);
+		
+		for (HttpServletServer server: servers) {
+			server.waitedStart(5000);
+		}
+		
+		HttpClient clientPAP = HttpClient.factory.get("PAP");
+		Response response = clientPAP.get();
+		assertTrue(response.getStatus() == 200);
+
+		HttpClient clientPDP = HttpClient.factory.get("PDP");
+		Response response2 = clientPDP.get("test");
+		assertTrue(response2.getStatus() == 500);	
+    }
+
+
+}
diff --git a/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java
new file mode 100644
index 00000000..db2fa0a9
--- /dev/null
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/HttpServerTest.java
@@ -0,0 +1,207 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.server.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * HttpServletServer JUNIT tests
+ */
+public class HttpServerTest {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(HttpServerTest.class);
+
+	@Test
+	public void testSingleServer() throws Exception {
+		logger.info("-- testSingleServer() --");
+		
+		HttpServletServer server = HttpServletServer.factory.build("echo", "localhost", 5678, "/", false, true);
+		server.addServletPackage("/*", this.getClass().getPackage().getName());
+		server.waitedStart(5000);
+		
+		assertTrue(HttpServletServer.factory.get(5678).isAlive());
+		
+		String echo = "hello";
+		URL url = new URL("http://localhost:5678/junit/echo/" + echo);
+		String response = response(url);
+		assertTrue(response.equals(echo));
+	
+		String responseSwagger =  null;
+		try {
+			URL urlSwagger = new URL("http://localhost:5678/swagger.json" + echo);
+			responseSwagger = response(urlSwagger);
+		} catch(IOException ioe) {
+			// Expected
+		}
+		
+		assertTrue(responseSwagger == null);
+		
+		assertTrue(HttpServletServer.factory.get(5678).isAlive());
+		assertTrue(HttpServletServer.factory.inventory().size() == 1);
+		
+		HttpServletServer.factory.destroy(5678);	
+		assertTrue(HttpServletServer.factory.inventory().size() == 0);
+	}
+	
+	@Test
+	public void testMultipleServers() throws Exception {
+		logger.info("-- testMultipleServers() --");
+		
+		HttpServletServer server1 = HttpServletServer.factory.build("echo-1", "localhost", 5678, "/", true, true);
+		server1.addServletPackage("/*", this.getClass().getPackage().getName());
+		server1.waitedStart(5000);
+		
+		HttpServletServer server2 = HttpServletServer.factory.build("echo-2", "localhost", 5679, "/", false, true);
+		server2.addServletPackage("/*", this.getClass().getPackage().getName());
+		server2.waitedStart(5000);
+		
+		assertTrue(HttpServletServer.factory.get(5678).isAlive());
+		assertTrue(HttpServletServer.factory.get(5679).isAlive());
+		
+		String echo = "hello";
+		
+		URL url1 = new URL("http://localhost:5678/junit/echo/" + echo);
+		String response1 = response(url1);
+		assertTrue(response1.equals(echo));
+		
+		URL urlSwagger = new URL("http://localhost:5678/swagger.json");
+		String responseSwagger = response(urlSwagger);	
+		assertTrue(responseSwagger != null);
+		
+		URL url2 = new URL("http://localhost:5679/junit/echo/" + echo);
+		String response2 = response(url2);
+		assertTrue(response2.equals(echo));
+		
+		String responseSwagger2 =  null;
+		try {
+			URL urlSwagger2 = new URL("http://localhost:5679/swagger.json");
+			responseSwagger2 = response(urlSwagger2);
+		} catch(IOException ioe) {
+			// Expected
+		}
+		assertTrue(responseSwagger2 == null);
+		
+		HttpServletServer.factory.destroy();		
+		assertTrue(HttpServletServer.factory.inventory().size() == 0);
+	}
+	
+	@Test
+	public void testMultiServicePackage() throws Exception {
+		logger.info("-- testMultiServicePackage() --");
+		
+		String randomName = UUID.randomUUID().toString();
+		
+		HttpServletServer server = HttpServletServer.factory.build(randomName, "localhost", 5678, "/", false, true);
+		server.addServletPackage("/*", this.getClass().getPackage().getName());
+		server.waitedStart(5000);
+		
+		assertTrue(HttpServletServer.factory.get(5678).isAlive());
+		
+		String echo = "hello";
+		URL urlService1 = new URL("http://localhost:5678/junit/echo/" + echo);
+		String responseService1 = response(urlService1);
+		assertTrue(responseService1.equals(echo));
+		
+		URL urlService2 = new URL("http://localhost:5678/junit/endpoints/http/servers");
+		String responseService2 = response(urlService2);
+		assertTrue(responseService2.contains(randomName));
+		
+		HttpServletServer.factory.destroy();		
+		assertTrue(HttpServletServer.factory.inventory().size() == 0);
+	}
+	
+	@Test
+	public void testServiceClass() throws Exception {
+		logger.info("-- testServiceClass() --");
+		String randomName = UUID.randomUUID().toString();
+		
+		HttpServletServer server = HttpServletServer.factory.build(randomName, "localhost", 5678, "/", false, true);
+		server.addServletClass("/*", RestEchoService.class.getCanonicalName());
+		server.waitedStart(5000);
+		
+		assertTrue(HttpServletServer.factory.get(5678).isAlive());
+		
+		String echo = "hello";
+		URL urlService1 = new URL("http://localhost:5678/junit/echo/" + echo);
+		String responseService1 = response(urlService1);
+		assertTrue(responseService1.equals(echo));
+		
+		HttpServletServer.factory.destroy();		
+		assertTrue(HttpServletServer.factory.inventory().size() == 0);
+	}
+	
+	@Test
+	public void testMultiServiceClass() throws Exception {
+		logger.info("-- testMultiServiceClass() --");
+		
+		String randomName = UUID.randomUUID().toString();
+		
+		HttpServletServer server = HttpServletServer.factory.build(randomName, "localhost", 5678, "/", false, true);
+		server.addServletClass("/*", RestEchoService.class.getCanonicalName());
+		server.addServletClass("/*", RestEndpoints.class.getCanonicalName());
+		server.waitedStart(5000);
+		
+		assertTrue(HttpServletServer.factory.get(5678).isAlive());
+		
+		String echo = "hello";
+		URL urlService1 = new URL("http://localhost:5678/junit/echo/" + echo);
+		String responseService1 = response(urlService1);
+		assertTrue(responseService1.equals(echo));
+		
+		URL urlService2 = new URL("http://localhost:5678/junit/endpoints/http/servers");
+		String responseService2 = response(urlService2);
+		assertTrue(responseService2.contains(randomName));
+		
+		HttpServletServer.factory.destroy();		
+		assertTrue(HttpServletServer.factory.inventory().size() == 0);
+	}
+
+	/**
+	 * @param url
+	 * @throws IOException
+	 */
+	protected String response(URL url) throws IOException {
+		BufferedReader ioReader = new BufferedReader(new InputStreamReader(url.openStream()));
+		String response = "";
+		String line;
+		while ((line = ioReader.readLine()) != null) {
+			response += line; 
+		}
+		ioReader.close();
+		return response;
+	}
+	
+	
+
+}
diff --git a/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java
new file mode 100644
index 00000000..65269038
--- /dev/null
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/NoopTopicTest.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.http.server.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.junit.Test;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.bus.NoopTopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * NOOP Endpoint Tests
+ */
+public class NoopTopicTest implements TopicListener {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(NoopTopicTest.class);
+	
+	private final String topicName = "junit-noop";
+	private final String outMessage = "blah";
+	private String inMessage = null;
+	
+	@Test
+	public void testNoopEndpoint() {
+		logger.info("-- testNoopEndpoint() --");
+		
+		Properties noopSinkProperties = new Properties();
+		noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, topicName);
+		
+		List<? extends TopicSink> noopTopics = 
+				TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
+		
+		TopicSink sink = NoopTopicSink.factory.get(topicName);
+		
+		assertTrue(noopTopics.size() == 1);	
+		assertTrue(noopTopics.size() == NoopTopicSink.factory.inventory().size());	
+		assertTrue(noopTopics.get(0) == sink);
+		assertTrue(sink == NoopTopicSink.factory.inventory().get(0));
+		
+		assertTrue(!sink.isAlive());
+		
+		boolean badState = false;
+		try{ 
+			sink.send(outMessage);
+		} catch(IllegalStateException e) {
+			badState = true;
+		}		
+		assertTrue(badState);
+		
+		sink.start();
+		assertTrue(sink.isAlive());
+		
+		sink.send(outMessage);
+		assertTrue(sink.getRecentEvents().length == 1);
+		assertTrue(sink.getRecentEvents()[0].equals(outMessage));
+		assertTrue(this.inMessage ==  null);
+		
+		sink.register(this);
+		sink.send(this.outMessage);
+		assertTrue(outMessage.equals(this.inMessage));
+		this.inMessage = null;
+		
+		sink.unregister(this);
+		sink.send(this.outMessage);
+		assertTrue(!outMessage.equals(this.inMessage));
+		
+		sink.stop();
+		try{ 
+			sink.send(outMessage);
+		} catch(IllegalStateException e) {
+			badState = true;
+		}		
+		assertTrue(badState);
+		
+		NoopTopicSink.factory.destroy(topicName);
+		assertTrue(NoopTopicSink.factory.inventory().size() == 0);			
+	}
+
+	@Override
+	public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
+		if (commType != CommInfrastructure.NOOP)
+			return;
+		
+		if (topic == null || !topic.equals(topicName))
+			return;
+		
+		this.inMessage = event;
+	}
+}
diff --git a/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java
new file mode 100644
index 00000000..3978caf2
--- /dev/null
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEchoService.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.http.server.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(value="echo")
+@Path("/junit/echo")
+public class RestEchoService {
+	
+    @GET
+    @Path("{word}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @ApiOperation(
+        	value="echoes back whatever received"
+    )
+    public String echo(@PathParam("word") String word) {   
+    	return word;
+    }
+
+}
diff --git a/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java
new file mode 100644
index 00000000..a21c9d3b
--- /dev/null
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestEndpoints.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.http.server.test;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.onap.policy.drools.http.server.HttpServletServer;
+
+@Path("/junit/endpoints")
+public class RestEndpoints {
+
+    @GET
+    @Path("http/servers")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String httpServers() {   
+    	List<HttpServletServer> servers = 
+    			HttpServletServer.factory.inventory();
+    	return servers.toString();
+    }
+    
+    
+}
diff --git a/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java
new file mode 100644
index 00000000..cb1405f6
--- /dev/null
+++ b/policy-endpoints/src/test/java/org/onap/policy/drools/http/server/test/RestMockHealthCheck.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-endpoints
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.http.server.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+@Path("/")
+public class RestMockHealthCheck {
+	
+    @GET
+    @Path("pap/test")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response papHealthCheck() {   
+		return Response.status(Status.OK).entity("All Alive").build();
+    }
+    
+    @GET
+    @Path("pdp/test")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Response pdpHealthCheck() {   
+		return Response.status(Status.INTERNAL_SERVER_ERROR).entity("At least some Dead").build();
+    }
+
+
+}
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java b/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java
deleted file mode 100644
index a7d309a1..00000000
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpClientTest.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.http.server.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Properties;
-
-import javax.ws.rs.core.Response;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HttpClientTest {
-	
-	private static Logger logger = LoggerFactory.getLogger(HttpClientTest.class);
-	
-	@BeforeClass
-	public static void setUp() {
-		logger.info("-- setup() --");
-		
-		/* echo server */
-		
-		HttpServletServer echoServerNoAuth = HttpServletServer.factory.build("echo", "localhost", 6666, "/", false, true);
-		echoServerNoAuth.addServletPackage("/*", HttpClientTest.class.getPackage().getName());
-		echoServerNoAuth.waitedStart(5000);
-		
-		/* no auth echo server */
-		
-		HttpServletServer echoServerAuth = HttpServletServer.factory.build("echo", "localhost", 6667, "/", false, true);
-		echoServerAuth.setBasicAuthentication("x", "y", null);
-		echoServerAuth.addServletPackage("/*", HttpClientTest.class.getPackage().getName());
-		echoServerAuth.waitedStart(5000);
-	}
-	
-	@AfterClass
-	public static void tearDown() {
-		logger.info("-- tearDown() --");
-		
-		HttpServletServer.factory.destroy();
-		HttpClient.factory.destroy();
-	}
-	
-	@Test
-	public void testHttpNoAuthClient() throws Exception {		
-		logger.info("-- testHttpNoAuthClient() --");
-
-		HttpClient client = HttpClient.factory.build("testHttpNoAuthClient", false, false, 
-				                                     "localhost", 6666, "junit/echo", 
-				                                     null, null, true);
-		Response response = client.get("hello");
-		String body = HttpClient.getBody(response, String.class);
-		
-		assertTrue(response.getStatus() == 200);
-		assertTrue(body.equals("hello"));
-	}
-	
-	@Test
-	public void testHttpAuthClient() throws Exception {		
-		logger.info("-- testHttpAuthClient() --");
-		
-		HttpClient client = HttpClient.factory.build("testHttpAuthClient",false, false, 
-				                                     "localhost", 6667, "junit/echo", 
-				                                     "x", "y", true);
-		Response response = client.get("hello");
-		String body = HttpClient.getBody(response, String.class);
-		
-		assertTrue(response.getStatus() == 200);
-		assertTrue(body.equals("hello"));
-	}
-	
-	@Test
-	public void testHttpAuthClient401() throws Exception {		
-		logger.info("-- testHttpAuthClient401() --");
-		
-		HttpClient client = HttpClient.factory.build("testHttpAuthClient401",false, false, 
-				                                     "localhost", 6667, "junit/echo", 
-				                                     null, null, true);
-		Response response = client.get("hello");
-		assertTrue(response.getStatus() == 401);
-	}
-    
-    @Test
-    public void testHttpAuthClientProps() throws Exception {
-    	logger.info("-- testHttpAuthClientProps() --");
-		
-		Properties httpProperties = new Properties();
-		
-		httpProperties.setProperty(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES, "PAP,PDP");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
-			 "localhost");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
-			 "7777");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
-			 "testpap");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
-			 "alpha123");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, 
-			RestMockHealthCheck.class.getName());
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
-			 "true");
-		
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
-			 "localhost");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
-			 "7778");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
-			 "testpdp");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
-			 "alpha123");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, 
-			 RestMockHealthCheck.class.getName());
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
-			 "true");
-		
-		httpProperties.setProperty(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES, "PAP,PDP");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
-			 "localhost");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
-			 "7777");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_URL_SUFFIX, 
-			 "pap/test");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX, 
-			 "false");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
-			 "testpap");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
-			 "alpha123");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PAP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
-			 "true");
-		
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_HOST_SUFFIX, 
-			 "localhost");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_PORT_SUFFIX, 
-			 "7778");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_URL_SUFFIX, 
-			 "pdp");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_HTTPS_SUFFIX, 
-			 "false");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX, 
-			 "testpdp");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_HTTP_AUTH_PASSWORD_SUFFIX, 
-			 "alpha123");
-		httpProperties.setProperty
-			(PolicyProperties.PROPERTY_HTTP_CLIENT_SERVICES + "." + "PDP" + PolicyProperties.PROPERTY_MANAGED_SUFFIX, 
-			 "true");
-		
-		ArrayList<HttpServletServer> servers = HttpServletServer.factory.build(httpProperties);
-		assertTrue(servers.size() == 2);
-		
-		ArrayList<HttpClient> clients = HttpClient.factory.build(httpProperties);
-		assertTrue(clients.size() == 2);
-		
-		for (HttpServletServer server: servers) {
-			server.waitedStart(5000);
-		}
-		
-		HttpClient clientPAP = HttpClient.factory.get("PAP");
-		Response response = clientPAP.get();
-		assertTrue(response.getStatus() == 200);
-
-		HttpClient clientPDP = HttpClient.factory.get("PDP");
-		Response response2 = clientPDP.get("test");
-		assertTrue(response2.getStatus() == 500);	
-    }
-
-
-}
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java b/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java
deleted file mode 100644
index 6be96320..00000000
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/HttpServerTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.server.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * HttpServletServer JUNIT tests
- */
-public class HttpServerTest {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(HttpServerTest.class);
-
-	@Test
-	public void testSingleServer() throws Exception {
-		logger.info("-- testSingleServer() --");
-		
-		HttpServletServer server = HttpServletServer.factory.build("echo", "localhost", 5678, "/", false, true);
-		server.addServletPackage("/*", this.getClass().getPackage().getName());
-		server.waitedStart(5000);
-		
-		assertTrue(HttpServletServer.factory.get(5678).isAlive());
-		
-		String echo = "hello";
-		URL url = new URL("http://localhost:5678/junit/echo/" + echo);
-		String response = response(url);
-		assertTrue(response.equals(echo));
-	
-		String responseSwagger =  null;
-		try {
-			URL urlSwagger = new URL("http://localhost:5678/swagger.json" + echo);
-			responseSwagger = response(urlSwagger);
-		} catch(IOException ioe) {
-			// Expected
-		}
-		
-		assertTrue(responseSwagger == null);
-		
-		assertTrue(HttpServletServer.factory.get(5678).isAlive());
-		assertTrue(HttpServletServer.factory.inventory().size() == 1);
-		
-		HttpServletServer.factory.destroy(5678);	
-		assertTrue(HttpServletServer.factory.inventory().size() == 0);
-	}
-	
-	@Test
-	public void testMultipleServers() throws Exception {
-		logger.info("-- testMultipleServers() --");
-		
-		HttpServletServer server1 = HttpServletServer.factory.build("echo-1", "localhost", 5678, "/", true, true);
-		server1.addServletPackage("/*", this.getClass().getPackage().getName());
-		server1.waitedStart(5000);
-		
-		HttpServletServer server2 = HttpServletServer.factory.build("echo-2", "localhost", 5679, "/", false, true);
-		server2.addServletPackage("/*", this.getClass().getPackage().getName());
-		server2.waitedStart(5000);
-		
-		assertTrue(HttpServletServer.factory.get(5678).isAlive());
-		assertTrue(HttpServletServer.factory.get(5679).isAlive());
-		
-		String echo = "hello";
-		
-		URL url1 = new URL("http://localhost:5678/junit/echo/" + echo);
-		String response1 = response(url1);
-		assertTrue(response1.equals(echo));
-		
-		URL urlSwagger = new URL("http://localhost:5678/swagger.json");
-		String responseSwagger = response(urlSwagger);	
-		assertTrue(responseSwagger != null);
-		
-		URL url2 = new URL("http://localhost:5679/junit/echo/" + echo);
-		String response2 = response(url2);
-		assertTrue(response2.equals(echo));
-		
-		String responseSwagger2 =  null;
-		try {
-			URL urlSwagger2 = new URL("http://localhost:5679/swagger.json");
-			responseSwagger2 = response(urlSwagger2);
-		} catch(IOException ioe) {
-			// Expected
-		}
-		assertTrue(responseSwagger2 == null);
-		
-		HttpServletServer.factory.destroy();		
-		assertTrue(HttpServletServer.factory.inventory().size() == 0);
-	}
-	
-	@Test
-	public void testMultiServicePackage() throws Exception {
-		logger.info("-- testMultiServicePackage() --");
-		
-		String randomName = UUID.randomUUID().toString();
-		
-		HttpServletServer server = HttpServletServer.factory.build(randomName, "localhost", 5678, "/", false, true);
-		server.addServletPackage("/*", this.getClass().getPackage().getName());
-		server.waitedStart(5000);
-		
-		assertTrue(HttpServletServer.factory.get(5678).isAlive());
-		
-		String echo = "hello";
-		URL urlService1 = new URL("http://localhost:5678/junit/echo/" + echo);
-		String responseService1 = response(urlService1);
-		assertTrue(responseService1.equals(echo));
-		
-		URL urlService2 = new URL("http://localhost:5678/junit/endpoints/http/servers");
-		String responseService2 = response(urlService2);
-		assertTrue(responseService2.contains(randomName));
-		
-		HttpServletServer.factory.destroy();		
-		assertTrue(HttpServletServer.factory.inventory().size() == 0);
-	}
-	
-	@Test
-	public void testServiceClass() throws Exception {
-		logger.info("-- testServiceClass() --");
-		String randomName = UUID.randomUUID().toString();
-		
-		HttpServletServer server = HttpServletServer.factory.build(randomName, "localhost", 5678, "/", false, true);
-		server.addServletClass("/*", RestEchoService.class.getCanonicalName());
-		server.waitedStart(5000);
-		
-		assertTrue(HttpServletServer.factory.get(5678).isAlive());
-		
-		String echo = "hello";
-		URL urlService1 = new URL("http://localhost:5678/junit/echo/" + echo);
-		String responseService1 = response(urlService1);
-		assertTrue(responseService1.equals(echo));
-		
-		HttpServletServer.factory.destroy();		
-		assertTrue(HttpServletServer.factory.inventory().size() == 0);
-	}
-	
-	@Test
-	public void testMultiServiceClass() throws Exception {
-		logger.info("-- testMultiServiceClass() --");
-		
-		String randomName = UUID.randomUUID().toString();
-		
-		HttpServletServer server = HttpServletServer.factory.build(randomName, "localhost", 5678, "/", false, true);
-		server.addServletClass("/*", RestEchoService.class.getCanonicalName());
-		server.addServletClass("/*", RestEndpoints.class.getCanonicalName());
-		server.waitedStart(5000);
-		
-		assertTrue(HttpServletServer.factory.get(5678).isAlive());
-		
-		String echo = "hello";
-		URL urlService1 = new URL("http://localhost:5678/junit/echo/" + echo);
-		String responseService1 = response(urlService1);
-		assertTrue(responseService1.equals(echo));
-		
-		URL urlService2 = new URL("http://localhost:5678/junit/endpoints/http/servers");
-		String responseService2 = response(urlService2);
-		assertTrue(responseService2.contains(randomName));
-		
-		HttpServletServer.factory.destroy();		
-		assertTrue(HttpServletServer.factory.inventory().size() == 0);
-	}
-
-	/**
-	 * @param url
-	 * @throws IOException
-	 */
-	protected String response(URL url) throws IOException {
-		BufferedReader ioReader = new BufferedReader(new InputStreamReader(url.openStream()));
-		String response = "";
-		String line;
-		while ((line = ioReader.readLine()) != null) {
-			response += line; 
-		}
-		ioReader.close();
-		return response;
-	}
-	
-	
-
-}
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java b/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java
deleted file mode 100644
index 924c2a2c..00000000
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/NoopTopicTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.http.server.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.bus.NoopTopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * NOOP Endpoint Tests
- */
-public class NoopTopicTest implements TopicListener {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(NoopTopicTest.class);
-	
-	private final String topicName = "junit-noop";
-	private final String outMessage = "blah";
-	private String inMessage = null;
-	
-	@Test
-	public void testNoopEndpoint() {
-		logger.info("-- testNoopEndpoint() --");
-		
-		Properties noopSinkProperties = new Properties();
-		noopSinkProperties.put(PolicyProperties.PROPERTY_NOOP_SINK_TOPICS, topicName);
-		
-		List<? extends TopicSink> noopTopics = 
-				TopicEndpoint.manager.addTopicSinks(noopSinkProperties);
-		
-		TopicSink sink = NoopTopicSink.factory.get(topicName);
-		
-		assertTrue(noopTopics.size() == 1);	
-		assertTrue(noopTopics.size() == NoopTopicSink.factory.inventory().size());	
-		assertTrue(noopTopics.get(0) == sink);
-		assertTrue(sink == NoopTopicSink.factory.inventory().get(0));
-		
-		assertTrue(!sink.isAlive());
-		
-		boolean badState = false;
-		try{ 
-			sink.send(outMessage);
-		} catch(IllegalStateException e) {
-			badState = true;
-		}		
-		assertTrue(badState);
-		
-		sink.start();
-		assertTrue(sink.isAlive());
-		
-		sink.send(outMessage);
-		assertTrue(sink.getRecentEvents().length == 1);
-		assertTrue(sink.getRecentEvents()[0].equals(outMessage));
-		assertTrue(this.inMessage ==  null);
-		
-		sink.register(this);
-		sink.send(this.outMessage);
-		assertTrue(outMessage.equals(this.inMessage));
-		this.inMessage = null;
-		
-		sink.unregister(this);
-		sink.send(this.outMessage);
-		assertTrue(!outMessage.equals(this.inMessage));
-		
-		sink.stop();
-		try{ 
-			sink.send(outMessage);
-		} catch(IllegalStateException e) {
-			badState = true;
-		}		
-		assertTrue(badState);
-		
-		NoopTopicSink.factory.destroy(topicName);
-		assertTrue(NoopTopicSink.factory.inventory().size() == 0);			
-	}
-
-	@Override
-	public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
-		if (commType != CommInfrastructure.NOOP)
-			return;
-		
-		if (topic == null || !topic.equals(topicName))
-			return;
-		
-		this.inMessage = event;
-	}
-}
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java b/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java
deleted file mode 100644
index c7e70069..00000000
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEchoService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.http.server.test;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@Api(value="echo")
-@Path("/junit/echo")
-public class RestEchoService {
-	
-    @GET
-    @Path("{word}")
-    @Produces(MediaType.TEXT_PLAIN)
-    @ApiOperation(
-        	value="echoes back whatever received"
-    )
-    public String echo(@PathParam("word") String word) {   
-    	return word;
-    }
-
-}
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java b/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java
deleted file mode 100644
index b944a1d6..00000000
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestEndpoints.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.http.server.test;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-
-@Path("/junit/endpoints")
-public class RestEndpoints {
-
-    @GET
-    @Path("http/servers")
-    @Produces(MediaType.TEXT_PLAIN)
-    public String httpServers() {   
-    	List<HttpServletServer> servers = 
-    			HttpServletServer.factory.inventory();
-    	return servers.toString();
-    }
-    
-    
-}
diff --git a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java b/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java
deleted file mode 100644
index 2d1d9279..00000000
--- a/policy-endpoints/src/test/java/org/openecomp/policy/drools/http/server/test/RestMockHealthCheck.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-endpoints
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.http.server.test;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-@Path("/")
-public class RestMockHealthCheck {
-	
-    @GET
-    @Path("pap/test")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response papHealthCheck() {   
-		return Response.status(Status.OK).entity("All Alive").build();
-    }
-    
-    @GET
-    @Path("pdp/test")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Response pdpHealthCheck() {   
-		return Response.status(Status.INTERNAL_SERVER_ERROR).entity("At least some Dead").build();
-    }
-
-
-}
diff --git a/policy-endpoints/src/test/resources/logback-test.xml b/policy-endpoints/src/test/resources/logback-test.xml
index 607a60d1..d93bc4a7 100644
--- a/policy-endpoints/src/test/resources/logback-test.xml
+++ b/policy-endpoints/src/test/resources/logback-test.xml
@@ -8,7 +8,7 @@
         </encoder>
     </appender>
     
-    <logger name="org.openecomp.policy.drools.http.server.test" level="INFO"/>
+    <logger name="org.onap.policy.drools.http.server.test" level="INFO"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>
diff --git a/policy-management/config/policy-engine.properties b/policy-management/config/policy-engine.properties
index 27bd7651..bf28bc80 100644
--- a/policy-management/config/policy-engine.properties
+++ b/policy-management/config/policy-engine.properties
@@ -22,9 +22,9 @@ http.server.services.CONFIG.host=0.0.0.0
 http.server.services.CONFIG.port=9696
 http.server.services.CONFIG.userName=x
 http.server.services.CONFIG.password=y
-http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful
-#http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful,org.openecomp.policy.drools.healthcheck
-#http.server.services.CONFIG.restClasses=org.openecomp.policy.drools.server.restful.RestManager,org.openecomp.policy.drools.healthcheck.RestHealthCheck
-#http.server.services.CONFIG.restClasses=org.openecomp.policy.drools.server.restful.RestManager
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
+#http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful,org.onap.policy.drools.healthcheck
+#http.server.services.CONFIG.restClasses=org.onap.policy.drools.server.restful.RestManager,org.onap.policy.drools.healthcheck.RestHealthCheck
+#http.server.services.CONFIG.restClasses=org.onap.policy.drools.server.restful.RestManager
 http.server.services.CONFIG.managed=false
 http.server.services.CONFIG.swagger=true
diff --git a/policy-management/pom.xml b/policy-management/pom.xml
index e7d83851..4e375d55 100644
--- a/policy-management/pom.xml
+++ b/policy-management/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
@@ -142,13 +142,13 @@
   <dependencies>
     
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     
     <dependency>
-      <groupId>org.openecomp.policy.drools-pdp</groupId>
+      <groupId>org.onap.policy.drools-pdp</groupId>
       <artifactId>policy-endpoints</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java
new file mode 100644
index 00000000..c4c61a8a
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsController.java
@@ -0,0 +1,218 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+
+/**
+ * Drools Controller is the abstractions that wraps the
+ * drools layer (policy-core)
+ */
+public interface DroolsController extends Startable, Lockable {	
+	
+	/**
+	 * No Group ID identifier
+	 */
+	public static final String NO_GROUP_ID = "NO-GROUP-ID";
+
+	/**
+	 * No Artifact ID identifier
+	 */
+	public static final String NO_ARTIFACT_ID = "NO-ARTIFACT-ID";
+	
+	/**
+	 * No version identifier
+	 */
+	public static final String NO_VERSION = "NO-VERSION";
+	
+	/**
+	 * get group id
+	 * @return group id
+	 */
+	public String getGroupId();
+	
+	/**
+	 * get artifact id
+	 * @return artifact id
+	 */	
+	public String getArtifactId();
+	
+	/**
+	 * get version
+	 * @return version
+	 */
+	public String getVersion();
+
+	/**
+	 * return the policy session names
+	 * 
+	 * @return policy session
+	 */
+	public List<String> getSessionNames();	
+	
+	/**
+	 * return the policy full session names
+	 * 
+	 * @return policy session
+	 */
+	public List<String> getCanonicalSessionNames();
+	
+	/**
+	 * offers an event to this controller for processing
+	 * 
+	 * @param topic topic associated with the event
+	 * @param event the event
+	 * 
+	 * @return true if the operation was successful
+	 */
+	public boolean offer(String topic, String event);
+	
+	/**
+	 * delivers "event" to "sink"
+	 * 
+	 * @param sink destination
+	 * @param event 
+	 * @return true if successful, false if a failure has occurred.
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted (ie. locked or stopped).
+	 * @throws UnsupportedOperationException when the engine cannot deliver due
+	 *         to the functionality missing (ie. communication infrastructure
+	 *         not supported.
+	 */
+	public boolean deliver(TopicSink sink, Object event)
+			throws IllegalArgumentException, IllegalStateException, 
+		           UnsupportedOperationException;
+	
+	/**
+	 * 
+	 * @return the most recent received events
+	 */
+	public Object[] getRecentSourceEvents();
+
+	/**
+	 * 
+	 * @return the most recent delivered events 
+	 */
+	public String[] getRecentSinkEvents();
+	
+	/**
+	 * @return the underlying policy container
+	 */
+	public PolicyContainer getContainer();
+	
+	/**
+	 * Supports this encoder?
+	 * 
+	 * @param encodedObject
+	 * @return
+	 */
+	public boolean ownsCoder(Class<? extends Object> coderClass, int modelHash) throws IllegalStateException;
+	
+	/**
+	 * fetches a class from the model
+	 * 
+	 * @param className the class to fetch
+	 * @return the actual class object, or null if not found
+	 */
+	public Class<?> fetchModelClass(String className) throws IllegalArgumentException;
+	
+	/**
+	 * is this controller Smart?
+	 */
+	public boolean isBrained();
+	
+	/**
+	 * update the new version of the maven jar rules file
+	 * 
+	 * @param newGroupId - new group id
+	 * @param newArtifactId - new artifact id
+	 * @param newVersion - new version
+	 * @param decoderConfigurations - decoder configurations
+	 * @param encoderConfigurations - encoder configurations
+	 * 
+	 * @throws Exception from within drools libraries
+	 * @throws LinkageError from within drools libraries
+	 * @throws ArgumentException bad parameter passed in
+	 */
+	public void updateToVersion(String newGroupId, String newArtifactId, String newVersion,
+			List<TopicCoderFilterConfiguration> decoderConfigurations,
+			List<TopicCoderFilterConfiguration> encoderConfigurations)
+	throws IllegalArgumentException, LinkageError, Exception;
+
+	/**
+	 * gets the classnames of facts as well as the current count
+	 * @param sessionName the session name
+	 * @return map of class to count
+	 */
+	public Map<String,Integer> factClassNames(String sessionName) throws IllegalArgumentException;	
+	
+	/**
+	 * gets the count of facts for a given session
+	 * @param sessionName the session name
+	 * @return the fact count 
+	 * @throws IllegalArgumentException
+	 */
+	public long factCount(String sessionName) throws IllegalArgumentException;
+	
+	/**
+	 * gets all the facts of a given class for a given session
+	 *  
+	 * @param sessionName the session identifier
+	 * @param className the class type
+	 * @param delete retract from drools the results of the query?
+	 * @return the list of facts returned by the query
+	 */
+	public List<Object> facts(String sessionName, String className, boolean delete);
+
+	/**
+	 * gets the facts associated with a query for a give session for a given queried entity
+	 * 
+	 * @param sessionName the session
+	 * @param queryName the query identifier
+	 * @param queriedEntity the queried entity
+	 * @param delete retract from drools the results of the query?
+	 * @param queryParams query parameters
+	 * @return list of facts returned by the query
+	 */
+	public List<Object> factQuery(String sessionName, String queryName, String queriedEntity, 
+			                      boolean delete, Object... queryParams);
+	
+	/**
+	 * halts and permanently releases all resources
+	 * @throws IllegalStateException
+	 */
+	public void halt() throws IllegalStateException;
+	
+	/**
+	 * Factory to track and manage drools controllers
+	 */
+	public static final DroolsControllerFactory factory = 
+									new IndexedDroolsControllerFactory();
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java
new file mode 100644
index 00000000..c7a63a03
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java
@@ -0,0 +1,555 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.controller.internal.MavenDroolsController;
+import org.onap.policy.drools.controller.internal.NullDroolsController;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
+import org.onap.policy.drools.utils.Pair;
+
+/**
+ * Drools Controller Factory to manage controller creation, destruction,
+ * and retrieval for management interfaces
+ */
+public interface DroolsControllerFactory {
+	
+	/**
+	 * Constructs a Drools Controller based on properties
+	 * 
+	 * @param properties properties containing initialization parameters
+	 * @param eventSources list of event sources
+	 * @param eventSinks list of event sinks
+	 * 
+	 * @return the instantiated Drools Controller
+	 * @throws IllegalArgumentException with invalid parameters
+	 * @throws LinkageError Failure to link rules and models in Drools Libraries
+	 * @throws Exception Exception from Drools Libraries
+	 */
+	public DroolsController build(Properties properties,
+								  List<? extends TopicSource> eventSources, 
+								  List<? extends TopicSink> eventSinks)
+			throws IllegalArgumentException, LinkageError, Exception;
+	
+	/**
+	 * Explicit construction of a Drools Controller
+	 * 
+	 * @param groupId maven group id of drools artifact
+	 * @param artifactId maven artifact id of drools artifact
+	 * @param version maven version id of drools artifact
+	 * @param decoderConfigurations list of decoder configurations
+	 * @param encoderConfigurations list of encoder configurations
+	 * 
+	 * @return the instantiated Drools Controller
+	 * @throws IllegalArgumentException with invalid parameters
+	 * @throws LinkageError Failure to link rules and models in Drools Libraries
+	 * @throws Exception Exception from Drools Libraries
+	 */
+	public DroolsController build(String groupId, 
+			 					  String artifactId, 
+			 					  String version,
+			 					  List<TopicCoderFilterConfiguration> decoderConfigurations,
+			 					  List<TopicCoderFilterConfiguration> encoderConfigurations)
+			throws IllegalArgumentException, LinkageError, Exception;
+	
+	/**
+	 * Releases the Drools Controller from operation
+	 * 
+	 * @param controller the Drools Controller to shut down
+	 */
+	public void shutdown(DroolsController controller);
+	
+	/**
+	 * Disables all Drools Controllers from operation
+	 */
+	public void shutdown();
+	
+	/**
+	 * Destroys and releases resources for a Drools Controller
+	 * 
+	 * @param controller the Drools Controller to destroy
+	 */
+	public void destroy(DroolsController controller);
+	
+	/**
+	 * Destroys all Drools Controllers
+	 */
+	public void destroy();
+	
+	/**
+	 * Gets the Drools Controller associated with the maven group 
+	 * and artifact id
+	 * 
+	 * @param groupId maven group id of drools artifact
+	 * @param artifactId maven artifact id of drools artifact
+	 * @param version maven version id of drools artifact
+	 * 
+	 * @return the Drools Controller
+	 * @throws IllegalArgumentException with invalid parameters
+	 */
+	public DroolsController get(String groupId, 
+							    String artifactId,
+								String version)
+			throws IllegalArgumentException;
+
+	/**
+	 * returns the current inventory of Drools Controllers
+	 * 
+	 * @return a list of Drools Controllers
+	 */
+	public List<DroolsController> inventory();
+}
+
+/* ---------------- implementation -----------------*/
+
+/**
+ * Factory of Drools Controllers indexed by the Maven coordinates 
+ */
+class IndexedDroolsControllerFactory implements DroolsControllerFactory {
+
+	/**
+	 * logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(MavenDroolsController.class);
+	
+	/**
+	 * Policy Controller Name Index
+	 */
+	protected HashMap<String, DroolsController> droolsControllers =
+									new HashMap<String, DroolsController>();
+	
+	/**
+	 * Null Drools Controller
+	 */
+	protected NullDroolsController nullDroolsController = new NullDroolsController();
+	
+	
+	public IndexedDroolsControllerFactory() {
+		
+		/* Add a NULL controller which will always be present in the hash */
+		
+		DroolsController controller = new NullDroolsController();
+		String controllerId = controller.getGroupId() + ":" + controller.getArtifactId();
+
+		synchronized(this) {
+			droolsControllers.put(controllerId, controller);
+		}	
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DroolsController build(Properties properties,
+								  List<? extends TopicSource> eventSources,
+								  List<? extends TopicSink> eventSinks) 
+			throws IllegalArgumentException, LinkageError, Exception {
+		
+		String groupId = properties.getProperty(PolicyProperties.RULES_GROUPID);
+		if (groupId == null || groupId.isEmpty())
+			groupId =  DroolsController.NO_GROUP_ID;	
+	
+		String artifactId = properties.getProperty(PolicyProperties.RULES_ARTIFACTID);
+		if (artifactId == null || artifactId.isEmpty())
+			artifactId =  DroolsController.NO_ARTIFACT_ID;
+		
+		String version = properties.getProperty(PolicyProperties.RULES_VERSION);
+		if (version == null || version.isEmpty())
+			version =  DroolsController.NO_VERSION;
+		
+		List<TopicCoderFilterConfiguration> 
+			topics2DecodedClasses2Filters = codersAndFilters(properties, eventSources);
+		
+		List<TopicCoderFilterConfiguration> 
+			topics2EncodedClasses2Filters = codersAndFilters(properties, eventSinks);
+		
+		return this.build(groupId, artifactId, version, 
+						  topics2DecodedClasses2Filters,
+				          topics2EncodedClasses2Filters);
+	}
+
+	/**
+	 * find out decoder classes and filters
+	 * 
+	 * @param properties properties with information about decoders
+	 * @param topicEntities topic sources
+	 * @return list of topics, each with associated decoder classes, each
+	 *         with a list of associated filters
+	 * @throws IllegalArgumentException invalid input data
+	 */
+	protected List<TopicCoderFilterConfiguration> codersAndFilters
+					(Properties properties, List<? extends Topic> topicEntities) 
+				throws IllegalArgumentException {
+		
+		String PROPERTY_TOPIC_ENTITY_PREFIX;
+		
+		List<TopicCoderFilterConfiguration>
+			topics2DecodedClasses2Filters =
+					new ArrayList<TopicCoderFilterConfiguration>();
+		
+		if (topicEntities.isEmpty())
+			return topics2DecodedClasses2Filters;
+				
+		for (Topic topic: topicEntities) {
+			
+			/* source or sink ? ueb or dmaap? */
+			boolean isSource = (topic instanceof TopicSource);
+			CommInfrastructure commInfra = topic.getTopicCommInfrastructure();
+			if (commInfra == CommInfrastructure.UEB) {
+				if (isSource) {
+					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + ".";
+				} else {
+					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_UEB_SINK_TOPICS + ".";
+				}
+			} else if (commInfra == CommInfrastructure.DMAAP) {
+				if (isSource) {
+					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + ".";
+				} else {
+					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + ".";
+				}
+			} else if (commInfra == CommInfrastructure.NOOP) {
+				if (!isSource)
+					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_NOOP_SINK_TOPICS + ".";
+				else
+					continue;
+			} else {
+				throw new IllegalArgumentException("Invalid Communication Infrastructure: " + commInfra);
+			}
+			
+			// 1. first the topic
+			
+			String aTopic = topic.getTopic();
+			
+			// 2.  check if there is a custom decoder for this topic that the user prefers to use
+			//     instead of the ones provided in the platform
+
+			String customGson = properties.getProperty
+					(PROPERTY_TOPIC_ENTITY_PREFIX + 
+					 aTopic + 
+					 PolicyProperties.PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_GSON_SUFFIX);
+			
+			CustomGsonCoder customGsonCoder = null;
+			if (customGson != null && !customGson.isEmpty()) {
+				try {
+					customGsonCoder =  new CustomGsonCoder(customGson);
+				} catch (IllegalArgumentException e) {
+					logger.warn("{}: cannot create custom-gson-coder {} because of {}", 
+							    this, customGson, e.getMessage(), e);
+				}
+			}
+			
+			String customJackson = properties.getProperty
+					(PROPERTY_TOPIC_ENTITY_PREFIX + 
+					 aTopic + 
+					 PolicyProperties.PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_JACKSON_SUFFIX);
+			
+			CustomJacksonCoder customJacksonCoder = null;
+			if (customJackson != null && !customJackson.isEmpty()) {
+				try {
+					customJacksonCoder =  new CustomJacksonCoder(customJackson);
+				} catch (IllegalArgumentException e) {
+					logger.warn("{}: cannot create custom-jackson-coder {} because of {}", 
+						        this, customJackson, e.getMessage(), e);
+				}
+			}
+			
+			// 3. second the list of classes associated with each topic
+			
+			String eventClasses = 
+					properties.getProperty(PROPERTY_TOPIC_ENTITY_PREFIX + aTopic + PolicyProperties.PROPERTY_TOPIC_EVENTS_SUFFIX);
+			
+			if (eventClasses == null || eventClasses.isEmpty()) {
+				// TODO warn
+				continue;
+			}
+			
+			List<PotentialCoderFilter> classes2Filters = new ArrayList<PotentialCoderFilter>();
+			
+			List<String> aTopicClasses = 
+					new ArrayList<String>(Arrays.asList(eventClasses.split("\\s*,\\s*")));
+			
+			for (String aClass: aTopicClasses) {
+				
+				
+				// 4. third, for each coder class, get the list of field filters
+				
+				String filter = properties.getProperty
+						(PROPERTY_TOPIC_ENTITY_PREFIX + 
+						 aTopic + 
+						 PolicyProperties.PROPERTY_TOPIC_EVENTS_SUFFIX + 
+						 "." + aClass + 
+						 PolicyProperties.PROPERTY_TOPIC_EVENTS_FILTER_SUFFIX);
+				
+				List<Pair<String,String>> filters = new ArrayList<Pair<String,String>>();
+				
+				if (filter == null || filter.isEmpty()) {
+					// 4. topic -> class -> with no filters
+					
+					JsonProtocolFilter protocolFilter = JsonProtocolFilter.fromRawFilters(filters);
+					PotentialCoderFilter class2Filters = 
+							new PotentialCoderFilter(aClass, protocolFilter);
+					classes2Filters.add(class2Filters);
+					continue;
+				}
+				
+				// There are filters associated with the applicability of
+				// this class for decoding.
+				List<String> listOfFilters = 
+						new ArrayList<String>(Arrays.asList(filter.split("\\s*,\\s*")));
+				
+				for (String nameValue: listOfFilters) {
+					String fieldName;
+					String regexValue;
+					
+					String[] nameValueSplit = nameValue.split("\\s*=\\s*");
+					if (nameValueSplit.length <= 0 || nameValueSplit.length > 2) {
+						// TODO warn
+						// skip
+						continue;
+					}
+					
+					if (nameValueSplit.length == 2) {
+						fieldName = nameValueSplit[0];
+						regexValue = nameValueSplit[1];
+					} else if (nameValueSplit.length == 1) {
+						fieldName = nameValueSplit[0];
+						regexValue = null;
+					} else {
+						// unreachable 
+						continue;
+					}
+					
+					filters.add(new Pair<String,String>(fieldName, regexValue));
+				}
+				
+				JsonProtocolFilter protocolFilter = JsonProtocolFilter.fromRawFilters(filters);
+				PotentialCoderFilter class2Filters = 
+						new PotentialCoderFilter(aClass, protocolFilter);
+				classes2Filters.add(class2Filters);
+			}
+			
+			TopicCoderFilterConfiguration topic2Classes2Filters =
+						new TopicCoderFilterConfiguration(aTopic,classes2Filters, customGsonCoder, customJacksonCoder);
+			topics2DecodedClasses2Filters.add(topic2Classes2Filters);
+		}
+		
+		return topics2DecodedClasses2Filters;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @param decoderConfiguration 
+	 */
+	@Override
+	public DroolsController build(String newGroupId, 
+			 					  String newArtifactId, 
+			                      String newVersion, 
+			                      List<TopicCoderFilterConfiguration> decoderConfigurations,
+			                      List<TopicCoderFilterConfiguration> encoderConfigurations)
+			throws IllegalArgumentException, LinkageError, Exception {
+		
+		if (newGroupId == null || newArtifactId == null || newVersion == null ||
+			newGroupId.isEmpty() || newArtifactId.isEmpty() || newVersion.isEmpty()) {
+				throw new IllegalArgumentException("Missing maven coordinates: " + 
+						                           newGroupId + ":" + newArtifactId + ":" + 
+						                           newVersion);
+		}
+		
+		String controllerId = newGroupId + ":" + newArtifactId;
+		DroolsController controllerCopy = null;
+		synchronized (this) {
+			/*
+			 * The Null Drools Controller for no maven coordinates is always here
+			 * so when no coordinates present, this is the return point
+			 * 
+			 * assert (controllerCopy instanceof NullDroolsController)
+			 */
+			if (droolsControllers.containsKey(controllerId)) {
+				controllerCopy = droolsControllers.get(controllerId);
+				if (controllerCopy.getVersion().equalsIgnoreCase(newVersion)) {
+					return controllerCopy;
+				}
+			}	
+		}
+		
+		if (controllerCopy != null) {
+			/* 
+			 * a controller keyed by group id + artifact id exists
+			 * but with different version => version upgrade/downgrade 
+			 */
+			
+			controllerCopy.updateToVersion(newGroupId, newArtifactId, newVersion, 
+					                       decoderConfigurations, encoderConfigurations);
+			
+			return controllerCopy;			
+		}
+		
+		/* new drools controller */
+		
+		DroolsController controller = new MavenDroolsController
+												(newGroupId, newArtifactId, newVersion, 
+											     decoderConfigurations,
+											     encoderConfigurations);
+		
+		synchronized(this) {
+			droolsControllers.put(controllerId, controller);
+		}
+
+		return controller;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(DroolsController controller) throws IllegalArgumentException {
+		unmanage(controller);
+		controller.halt();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy() {
+		List<DroolsController> controllers = this.inventory();
+		for (DroolsController controller: controllers) {
+			controller.halt();
+		}
+		
+		synchronized(this) {
+			this.droolsControllers.clear();
+		}
+	}
+
+	/**
+	 * unmanage the drools controller
+	 * 
+	 * @param controller
+	 * @return
+	 * @throws IllegalArgumentException
+	 */
+	protected void unmanage(DroolsController controller) throws IllegalArgumentException {
+		if (controller == null) {
+			throw new IllegalArgumentException("No controller provided");
+		}
+		
+		if (!controller.isBrained()) {	
+			logger.info("Drools Controller is NOT OPERATIONAL - nothing to destroy");
+			return;
+		}
+		
+		String controllerId = controller.getGroupId() + ":" + controller.getArtifactId();
+		synchronized(this) {
+			if (!this.droolsControllers.containsKey(controllerId)) {
+				return;
+			}
+			
+			droolsControllers.remove(controllerId);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown(DroolsController controller) throws IllegalArgumentException {
+		this.unmanage(controller);
+		controller.shutdown();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() {
+		List<DroolsController> controllers = this.inventory();
+		for (DroolsController controller: controllers) {
+			controller.shutdown();
+		}
+		
+		synchronized(this) {
+			this.droolsControllers.clear();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DroolsController get(String groupId, 
+			                    String artifactId, 
+			                    String version)
+			throws IllegalArgumentException, IllegalStateException {
+		
+		if (groupId == null || artifactId == null ||
+			groupId.isEmpty() || artifactId.isEmpty()) {
+			throw new IllegalArgumentException("Missing maven coordinates: " + 
+								               groupId + ":" + artifactId);
+		}
+		
+		String controllerId = groupId + ":" + artifactId;
+		
+		synchronized(this) {
+			if (this.droolsControllers.containsKey(controllerId)) {
+				return droolsControllers.get(controllerId);
+			} else {
+				throw new IllegalStateException("DroolController for " + 
+												controllerId + " not found");
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DroolsController> inventory() {
+		 List<DroolsController> controllers = 
+				 new ArrayList<DroolsController>(this.droolsControllers.values());
+		 return controllers;
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("IndexedDroolsControllerFactory [#droolsControllers=").append(droolsControllers.size())
+				.append("]");
+		return builder.toString();
+	}
+	
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
new file mode 100644
index 00000000..db62f782
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
@@ -0,0 +1,910 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.controller.internal;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.drools.core.ClassObjectFilter;
+import org.kie.api.definition.KiePackage;
+import org.kie.api.definition.rule.Query;
+import org.kie.api.runtime.KieSession;
+import org.kie.api.runtime.rule.FactHandle;
+import org.kie.api.runtime.rule.QueryResults;
+import org.kie.api.runtime.rule.QueryResultsRow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.core.PolicySession;
+import org.onap.policy.drools.core.jmx.PdpJmx;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
+import org.onap.policy.drools.utils.ReflectionUtil;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Maven-based Drools Controller that interacts with the 
+ * policy-core PolicyContainer and PolicySession to manage
+ * Drools containers instantiated using Maven.
+ */
+public class MavenDroolsController implements DroolsController {
+	
+	/**
+	 * logger 
+	 */
+	private static Logger  logger = LoggerFactory.getLogger(MavenDroolsController.class);
+	
+	/**
+	 * Policy Container, the access object to the policy-core layer
+	 */
+	@JsonIgnore
+	protected final PolicyContainer policyContainer;
+	
+	/**
+	 * alive status of this drools controller, 
+	 * reflects invocation of start()/stop() only
+	 */
+	protected volatile boolean alive = false;
+	
+	/**
+	 * locked status of this drools controller,
+	 * reflects if i/o drools related operations are permitted,
+	 * more specifically: offer() and deliver().
+	 * It does not affect the ability to start and stop 
+	 * underlying drools infrastructure
+	 */
+	protected volatile boolean locked = false;
+	
+	/**
+	 * list of topics, each with associated decoder classes, each
+	 * with a list of associated filters.
+	 */
+	protected List<TopicCoderFilterConfiguration> decoderConfigurations;
+	
+	/**
+	 * list of topics, each with associated encoder classes, each
+	 * with a list of associated filters.
+	 */
+	protected List<TopicCoderFilterConfiguration> encoderConfigurations;
+	
+	/**
+	 * recent source events processed
+	 */
+	protected final CircularFifoQueue<Object> recentSourceEvents = new CircularFifoQueue<Object>(10);
+	
+	/**
+	 * recent sink events processed
+	 */
+	protected final CircularFifoQueue<String> recentSinkEvents = new CircularFifoQueue<String>(10);
+	
+	/**
+	 * original Drools Model/Rules classloader hash
+	 */
+	protected int modelClassLoaderHash;
+
+	/**
+	 * Expanded version of the constructor 
+	 * 
+	 * @param groupId maven group id
+	 * @param artifactId maven artifact id
+	 * @param version maven version
+	 * @param decoderConfiguration list of topic -> decoders -> filters mapping
+	 * @param encoderConfiguration list of topic -> encoders -> filters mapping
+	 * 
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 */
+	public MavenDroolsController(String groupId, 
+								 String artifactId, 
+								 String version,
+								 List<TopicCoderFilterConfiguration> decoderConfigurations,
+								 List<TopicCoderFilterConfiguration> encoderConfigurations) 
+		   throws IllegalArgumentException {
+		
+		if (logger.isInfoEnabled())
+			logger.info("DROOLS CONTROLLER: instantiation " +  this + 
+					    " -> {" + groupId + ":" + artifactId + ":" + version + "}");
+		
+		if (groupId == null || artifactId == null || version == null ||
+			groupId.isEmpty() || artifactId.isEmpty() || version.isEmpty()) {
+			throw new IllegalArgumentException("Missing maven coordinates: " + 
+					                           groupId + ":" + artifactId + ":" + 
+					                           version);
+		}
+		
+		this.policyContainer= new PolicyContainer(groupId, artifactId, version);
+		this.init(decoderConfigurations, encoderConfigurations);
+		
+		if (logger.isInfoEnabled())
+			logger.info("DROOLS CONTROLLER: instantiation completed " +  this);
+	}
+	
+	/**
+	 * init encoding/decoding configuration
+	 * @param decoderConfiguration list of topic -> decoders -> filters mapping
+	 * @param encoderConfiguration list of topic -> encoders -> filters mapping
+	 */
+	protected void init(List<TopicCoderFilterConfiguration> decoderConfigurations,
+			            List<TopicCoderFilterConfiguration> encoderConfigurations) {
+		
+		this.decoderConfigurations = decoderConfigurations;
+		this.encoderConfigurations = encoderConfigurations;
+		
+		this.initCoders(decoderConfigurations, true);
+		this.initCoders(encoderConfigurations, false);
+		
+		this.modelClassLoaderHash = this.policyContainer.getClassLoader().hashCode();		
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateToVersion(String newGroupId, String newArtifactId, String newVersion,
+			                    List<TopicCoderFilterConfiguration> decoderConfigurations,
+			                    List<TopicCoderFilterConfiguration> encoderConfigurations) 
+		throws IllegalArgumentException, LinkageError, Exception {
+		
+		if (logger.isInfoEnabled())
+			logger.info("UPDATE-TO-VERSION: " +  this + " -> {" + newGroupId + ":" + newArtifactId + ":" + newVersion + "}");
+		
+		if (newGroupId == null || newArtifactId == null || newVersion == null ||
+			newGroupId.isEmpty() || newArtifactId.isEmpty() || newVersion.isEmpty()) {
+				throw new IllegalArgumentException("Missing maven coordinates: " + 
+						                           newGroupId + ":" + newArtifactId + ":" + 
+						                           newVersion);
+		}
+		
+		if (newGroupId.equalsIgnoreCase(DroolsController.NO_GROUP_ID) || 
+			newArtifactId.equalsIgnoreCase(DroolsController.NO_ARTIFACT_ID) || 
+			newVersion.equalsIgnoreCase(DroolsController.NO_VERSION)) {
+				throw new IllegalArgumentException("BRAINLESS maven coordinates provided: " + 
+						                           newGroupId + ":" + newArtifactId + ":" + 
+						                           newVersion);
+		}
+		
+		if (newGroupId.equalsIgnoreCase(this.getGroupId()) && 
+			newArtifactId.equalsIgnoreCase(this.getArtifactId()) &&
+			newVersion.equalsIgnoreCase(this.getVersion())) {
+				logger.warn("Al in the right version: " + newGroupId + ":" + 
+			                newArtifactId + ":" +  newVersion + " vs. " + this);
+				return;
+		}
+		
+		if (!newGroupId.equalsIgnoreCase(this.getGroupId()) || 
+			!newArtifactId.equalsIgnoreCase(this.getArtifactId())) {
+				throw new IllegalArgumentException("Group ID and Artifact ID maven coordinates must be identical for the upgrade: " + 
+							                       newGroupId + ":" + newArtifactId + ":" + 
+							                       newVersion + " vs. " + this);
+		}
+
+		/* upgrade */
+		String messages = this.policyContainer.updateToVersion(newVersion);
+		if (logger.isWarnEnabled())
+			logger.warn(this + "UPGRADE results: " + messages);
+		
+		/*
+		 * If all sucessful (can load new container), now we can remove all coders from previous sessions
+		 */
+		this.removeCoders();
+		
+		/*
+		 * add the new coders
+		 */
+		this.init(decoderConfigurations, encoderConfigurations);
+		
+		if (logger.isInfoEnabled())
+			logger.info("UPDATE-TO-VERSION: completed " +  this);
+	}
+
+	/**
+	 * initialize decoders for all the topics supported by this controller
+	 * Note this is critical to be done after the Policy Container is
+	 * instantiated to be able to fetch the corresponding classes.
+	 * 
+	 * @param decoderConfiguration list of topic -> decoders -> filters mapping
+	 */
+	protected void initCoders(List<TopicCoderFilterConfiguration> coderConfigurations, 
+			                  boolean decoder) 
+	          throws IllegalArgumentException {
+		
+		if (logger.isInfoEnabled())
+			logger.info("INIT-CODERS: " +  this);
+		
+		if (coderConfigurations == null) {
+			return;
+		}
+			
+
+		for (TopicCoderFilterConfiguration coderConfig: coderConfigurations) {
+			String topic = coderConfig.getTopic();
+			
+			CustomGsonCoder customGsonCoder = coderConfig.getCustomGsonCoder();
+			if (coderConfig.getCustomGsonCoder() != null && 
+				coderConfig.getCustomGsonCoder().getClassContainer() != null &&
+				!coderConfig.getCustomGsonCoder().getClassContainer().isEmpty()) {
+					
+				String customGsonCoderClass = coderConfig.getCustomGsonCoder().getClassContainer();
+				if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(),
+						                   customGsonCoderClass)) {
+					logger.error(customGsonCoderClass + " cannot be retrieved");
+					throw new IllegalArgumentException(customGsonCoderClass + " cannot be retrieved");
+				} else {
+					if (logger.isInfoEnabled())
+						logger.info("CLASS FETCHED " + customGsonCoderClass);
+				}
+			}
+			
+			CustomJacksonCoder customJacksonCoder = coderConfig.getCustomJacksonCoder();
+			if (coderConfig.getCustomJacksonCoder() != null && 
+				coderConfig.getCustomJacksonCoder().getClassContainer() != null &&
+				!coderConfig.getCustomJacksonCoder().getClassContainer().isEmpty()) {
+				
+				String customJacksonCoderClass = coderConfig.getCustomJacksonCoder().getClassContainer();
+				if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(),
+						                   customJacksonCoderClass)) {
+					logger.error(customJacksonCoderClass + " cannot be retrieved");
+					throw new IllegalArgumentException(customJacksonCoderClass + " cannot be retrieved");
+				} else {
+					if (logger.isInfoEnabled())
+						logger.info("CLASS FETCHED " + customJacksonCoderClass);
+				}
+			}	
+			
+			List<PotentialCoderFilter> coderFilters = coderConfig.getCoderFilters();
+			if (coderFilters == null || coderFilters.isEmpty()) {
+				continue;
+			}
+			
+			for (PotentialCoderFilter coderFilter : coderFilters) {
+				String potentialCodedClass = coderFilter.getCodedClass();
+				JsonProtocolFilter protocolFilter = coderFilter.getFilter();
+				
+				if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(), 
+						                   potentialCodedClass)) {
+					logger.error(potentialCodedClass + " cannot be retrieved");
+					throw new IllegalArgumentException(potentialCodedClass + " cannot be retrieved");
+				} else {
+					if (logger.isInfoEnabled())
+						logger.info("CLASS FETCHED " + potentialCodedClass);
+				}			
+				
+				if (decoder)
+					EventProtocolCoder.manager.addDecoder(this.getGroupId(), this.getArtifactId(), 
+							                              topic, potentialCodedClass, protocolFilter,
+							                              customGsonCoder,
+							                              customJacksonCoder,
+							                              this.policyContainer.getClassLoader().hashCode());
+				else
+					EventProtocolCoder.manager.addEncoder(this.getGroupId(), this.getArtifactId(), 
+                                                          topic, potentialCodedClass, protocolFilter,
+							                              customGsonCoder,
+							                              customJacksonCoder,
+							                              this.policyContainer.getClassLoader().hashCode());
+			}
+		}
+	}
+	
+
+	/**
+	 * remove decoders.
+	 */
+	protected void removeDecoders() 
+	          throws IllegalArgumentException {
+		if (logger.isInfoEnabled())
+			logger.info("REMOVE-DECODERS: " +  this);
+		
+		if (this.decoderConfigurations == null) {
+			return;
+		}
+			
+
+		for (TopicCoderFilterConfiguration coderConfig: decoderConfigurations) {
+			String topic = coderConfig.getTopic();								
+			EventProtocolCoder.manager.removeDecoders
+						(this.getGroupId(), this.getArtifactId(), topic);
+		}
+	}
+	
+	/**
+	 * remove decoders.
+	 */
+	protected void removeEncoders() 
+	          throws IllegalArgumentException {
+		
+		if (logger.isInfoEnabled())
+			logger.info("REMOVE-ENCODERS: " +  this);
+		
+		if (this.encoderConfigurations == null)
+			return;
+			
+
+		for (TopicCoderFilterConfiguration coderConfig: encoderConfigurations) {
+			String topic = coderConfig.getTopic();								
+			EventProtocolCoder.manager.removeEncoders
+						(this.getGroupId(), this.getArtifactId(), topic);
+		}
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean ownsCoder(Class<? extends Object> coderClass, int modelHash) throws IllegalStateException {
+		if (!ReflectionUtil.isClass
+				(this.policyContainer.getClassLoader(), coderClass.getCanonicalName())) {
+			logger.error(this + coderClass.getCanonicalName() + " cannot be retrieved. ");
+			return false;
+		}
+		
+		if (modelHash == this.modelClassLoaderHash) {
+			if (logger.isInfoEnabled())
+				logger.info(coderClass.getCanonicalName() + 
+						    this + " class loader matches original drools controller rules classloader " +
+			                coderClass.getClassLoader());
+			return true;
+		} else {
+			if (logger.isWarnEnabled())
+				logger.warn(this + coderClass.getCanonicalName() + " class loaders don't match  " +
+	                        coderClass.getClassLoader() + " vs " + 
+						    this.policyContainer.getClassLoader());
+			return false;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() {
+		
+		if (logger.isInfoEnabled())
+			logger.info("START: " + this);
+		
+		synchronized (this) {			
+			if (this.alive)
+				return true;
+			
+			this.alive = true;
+		}
+		
+		return this.policyContainer.start();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() {
+		
+		logger.info("STOP: " + this);
+		
+		synchronized (this) {
+			if (!this.alive)
+				return true;
+			
+			this.alive = false;
+		}
+		
+		return this.policyContainer.stop();
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {		
+		logger.info("{}: SHUTDOWN", this);
+		
+		try {
+			this.stop();
+			this.removeCoders();
+		} catch (Exception e) {
+			logger.error("{} SHUTDOWN FAILED because of {}", this, e.getMessage(), e);
+		} finally {
+			this.policyContainer.shutdown();
+		}
+
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void halt() throws IllegalStateException {
+		logger.info("{}: HALT", this);
+		
+		try {
+			this.stop();
+			this.removeCoders();
+		} catch (Exception e) {
+			logger.error("{} HALT FAILED because of {}", this, e.getMessage(), e);
+		} finally {
+			this.policyContainer.destroy();
+		}	
+	}
+	
+	/**
+	 * removes this drools controllers and encoders and decoders from operation
+	 */
+	protected void removeCoders() {
+		logger.info("{}: REMOVE-CODERS", this);
+		
+		try {
+			this.removeDecoders();
+		} catch (IllegalArgumentException e) {
+			logger.error("{} REMOVE-DECODERS FAILED because of {}", this, e.getMessage(), e);
+		}
+		
+		try {
+			this.removeEncoders();
+		} catch (IllegalArgumentException e) {
+			logger.error("{} REMOVE-ENCODERS FAILED because of {}", this, e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isAlive() {
+		return this.alive;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean offer(String topic, String event) {
+		logger.debug("{}: OFFER: {} <- {}", this, topic, event);
+		
+		if (this.locked)
+			return true;
+		
+		if (!this.alive)
+			return true;
+		
+		// 0. Check if the policy container has any sessions
+		
+		if (this.policyContainer.getPolicySessions().size() <= 0) {
+			// no sessions
+			return true;
+		}
+		
+		// 1. Now, check if this topic has a decoder:
+		
+		if (!EventProtocolCoder.manager.isDecodingSupported(this.getGroupId(), 
+				                                              this.getArtifactId(), 
+				                                              topic)) {
+			
+			logger.warn("{}: DECODING-UNSUPPORTED {}:{}:{}", this, 
+					    topic, this.getGroupId(), this.getArtifactId());
+			return true;
+		}
+		
+		// 2. Decode
+		
+		Object anEvent;
+		try {
+			anEvent = EventProtocolCoder.manager.decode(this.getGroupId(), 
+					                                      this.getArtifactId(), 
+					                                      topic, 
+					                                      event);
+		} catch (UnsupportedOperationException uoe) {
+			logger.debug("{}: DECODE FAILED: {} <- {} because of {}", this, topic, 
+					     event, uoe.getMessage(), uoe);
+			return true;
+		} catch (Exception e) {
+			logger.warn("{}: DECODE FAILED: {} <- {} because of {}", this, topic, 
+				        event, e.getMessage(), e);
+			return true;
+		}
+		
+		synchronized(this.recentSourceEvents) {
+			this.recentSourceEvents.add(anEvent);
+		}
+		
+		// increment event count for Nagios monitoring
+		PdpJmx.getInstance().updateOccured();  
+		
+		// Broadcast
+		
+		if (logger.isInfoEnabled())
+			logger.info(this + "BROADCAST-INJECT of " + event + " FROM " + topic + " INTO " + this.policyContainer.getName());		
+		
+		if (!this.policyContainer.insertAll(anEvent))
+			logger.warn(this + "Failed to inject into PolicyContainer " + this.getSessionNames());
+		
+		return true;
+	}	
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(TopicSink sink, Object event) 
+			throws IllegalArgumentException, 
+			       IllegalStateException, 
+		           UnsupportedOperationException {
+		
+		if (logger.isInfoEnabled())
+			logger.info(this + "DELIVER: " +  event + " FROM " + this + " TO " + sink);
+		
+		if (sink == null)
+			throw new IllegalArgumentException
+						(this +  " invalid sink");
+		
+		if (event == null)
+			throw new IllegalArgumentException
+						(this +  " invalid event");
+		
+		if (this.locked)
+			throw new IllegalStateException
+							(this +  " is locked");
+		
+		if (!this.alive)
+			throw new IllegalStateException
+							(this +  " is stopped");
+		
+		String json =
+				EventProtocolCoder.manager.encode(sink.getTopic(), event, this);
+		
+		synchronized(this.recentSinkEvents) {
+			this.recentSinkEvents.add(json);
+		}
+		
+		return sink.send(json);
+		
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getVersion() {
+		return this.policyContainer.getVersion();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getArtifactId() {
+		return this.policyContainer.getArtifactId();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getGroupId() {
+		return this.policyContainer.getGroupId();
+	}
+
+	/**
+	 * @return the modelClassLoaderHash
+	 */
+	public int getModelClassLoaderHash() {
+		return modelClassLoaderHash;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean lock() {
+		logger.info("LOCK: " +  this);
+		
+		this.locked = true;
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean unlock() {
+		logger.info("UNLOCK: " +  this);
+		
+		this.locked = false;
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLocked() {
+		return this.locked;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	public PolicyContainer getContainer() {
+		return this.policyContainer;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonProperty("sessions")
+	@Override
+	public List<String> getSessionNames() {
+		return getSessionNames(true);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonProperty("sessionCoordinates")
+	@Override
+	public List<String> getCanonicalSessionNames() {
+		return getSessionNames(false);
+	}
+	
+	/**
+	 * get session names
+	 * @param abbreviated true for the short form, otherwise the long form
+	 * @return session names
+	 */
+	protected List<String> getSessionNames(boolean abbreviated) {
+		List<String> sessionNames = new ArrayList<String>();
+		try {
+			for (PolicySession session: this.policyContainer.getPolicySessions()) {
+				if (abbreviated)
+					sessionNames.add(session.getName());
+				else
+					sessionNames.add(session.getFullName());
+			}
+		} catch (Exception e) {
+			logger.warn("Can't retrieve CORE sessions: " + e.getMessage(), e);
+			sessionNames.add(e.getMessage());
+		}
+		return sessionNames;
+	}
+	
+	/**
+	 * provides the underlying core layer container sessions
+	 * 
+	 * @return the attached Policy Container
+	 */
+	protected List<PolicySession> getSessions() {
+		List<PolicySession> sessions = new ArrayList<PolicySession>();
+		sessions.addAll(this.policyContainer.getPolicySessions());
+		return sessions;
+	}
+	
+	/**
+	 * provides the underlying core layer container session with name sessionName
+	 * 
+	 * @param sessionName session name
+	 * @return the attached Policy Container
+	 * @throws IllegalArgumentException when an invalid session name is provided
+	 * @throws IllegalStateException when the drools controller is in an invalid state
+	 */
+	protected PolicySession getSession(String sessionName) {
+		if (sessionName == null || sessionName.isEmpty())
+			throw new IllegalArgumentException("A Session Name must be provided");
+		
+		List<PolicySession> sessions = this.getSessions();
+		for (PolicySession session : sessions) {
+			if (sessionName.equals(session.getName()) || sessionName.equals(session.getName()))
+				return session;				
+		}
+		
+		throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String,Integer> factClassNames(String sessionName) throws IllegalArgumentException {		
+		if (sessionName == null || sessionName.isEmpty())
+			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
+		
+		// List<String> classNames = new ArrayList<>();
+		Map<String,Integer> classNames = new HashMap<>();
+		
+		PolicySession session = getSession(sessionName);
+		KieSession kieSession = session.getKieSession();
+
+		Collection<FactHandle> facts = session.getKieSession().getFactHandles();
+		for (FactHandle fact : facts) {
+			try {
+				String className = kieSession.getObject(fact).getClass().getName();
+				if (classNames.containsKey(className))
+					classNames.put(className, classNames.get(className) + 1);
+				else
+					classNames.put(className, 1);
+			} catch (Exception e) {
+				if (logger.isInfoEnabled())
+					logger.info("Object cannot be retrieved from fact: " + fact);
+			}			
+		}	
+		
+		return classNames;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public long factCount(String sessionName) throws IllegalArgumentException {		
+		if (sessionName == null || sessionName.isEmpty())
+			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
+		
+		PolicySession session = getSession(sessionName);
+		return session.getKieSession().getFactCount();	
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<Object> facts(String sessionName, String className, boolean delete) {		
+		if (sessionName == null || sessionName.isEmpty())
+			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
+		
+		if (className == null || className.isEmpty())
+			throw new IllegalArgumentException("Invalid Class Name: " + className);
+		
+		Class<?> factClass = 
+				ReflectionUtil.fetchClass(this.policyContainer.getClassLoader(), className);
+		if (factClass == null)
+			throw new IllegalArgumentException("Class cannot be fetched in model's classloader: " + className);
+		
+		PolicySession session = getSession(sessionName);
+		KieSession kieSession = session.getKieSession();
+		
+		List<Object> factObjects = new ArrayList<>();
+		
+		Collection<FactHandle> factHandles = kieSession.getFactHandles(new ClassObjectFilter(factClass));
+		for (FactHandle factHandle : factHandles) {
+			try {
+				factObjects.add(kieSession.getObject(factHandle));
+				if (delete)
+					kieSession.delete(factHandle);					
+			} catch (Exception e) {
+				if (logger.isInfoEnabled())
+					logger.info("Object cannot be retrieved from fact: " + factHandle);
+			}
+		}		
+		
+		return factObjects;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<Object> factQuery(String sessionName, String queryName, String queriedEntity, boolean delete, Object... queryParams) {		
+		if (sessionName == null || sessionName.isEmpty())
+			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
+		
+		if (queryName == null || queryName.isEmpty())
+			throw new IllegalArgumentException("Invalid Query Name: " + queryName);
+		
+		if (queriedEntity == null || queriedEntity.isEmpty())
+			throw new IllegalArgumentException("Invalid Queried Entity: " + queriedEntity);
+		
+		PolicySession session = getSession(sessionName);
+		KieSession kieSession = session.getKieSession();
+		
+		boolean found = false;
+		for (KiePackage kiePackage : kieSession.getKieBase().getKiePackages()) {
+			for (Query q : kiePackage.getQueries()) {
+				if (q.getName() != null && q.getName().equals(queryName)) {
+					found = true;
+					break;
+				}
+			}
+		}
+		if (!found)
+			throw new IllegalArgumentException("Invalid Query Name: " + queryName);
+        
+		List<Object> factObjects = new ArrayList<>();
+		
+		QueryResults queryResults = kieSession.getQueryResults(queryName, queryParams);
+		for (QueryResultsRow row : queryResults) {
+			try {
+				factObjects.add(row.get(queriedEntity));
+				if (delete)
+					kieSession.delete(row.getFactHandle(queriedEntity));
+			} catch (Exception e) {
+				if (logger.isInfoEnabled())
+					logger.info("Object cannot be retrieved from fact: " + row);
+			}
+		}
+		
+		return factObjects;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Class<?> fetchModelClass(String className) throws IllegalStateException {
+		Class<?> modelClass = 
+			ReflectionUtil.fetchClass(this.policyContainer.getClassLoader(), className);
+		return modelClass;
+	}
+
+	/**
+	 * @return the recentSourceEvents
+	 */
+	@Override
+	public Object[] getRecentSourceEvents() {
+		synchronized(this.recentSourceEvents) {
+			Object[] events = new Object[recentSourceEvents.size()];
+			return recentSourceEvents.toArray(events);
+		}
+	}
+
+	/**
+	 * @return the recentSinkEvents
+	 */
+	@Override
+	public String[] getRecentSinkEvents() {
+		synchronized(this.recentSinkEvents) {
+			String[] events = new String[recentSinkEvents.size()];
+			return recentSinkEvents.toArray(events);
+		}
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isBrained() {
+		return true;
+	}
+	
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("MavenDroolsController [policyContainer=")
+		       .append((policyContainer != null) ? policyContainer.getName() : "NULL").append(":")
+		       .append(", alive=")
+			   .append(alive).append(", locked=")
+			   .append(", modelClassLoaderHash=").append(modelClassLoaderHash).append("]");
+		return builder.toString();
+	}
+
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java
new file mode 100644
index 00000000..3fef6fa9
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java
@@ -0,0 +1,262 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.controller.internal;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
+
+/**
+ * no-op Drools Controller
+ */
+public class NullDroolsController implements DroolsController {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() throws IllegalStateException {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		return;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void halt() throws IllegalStateException {
+		return;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isAlive() {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean lock() {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean unlock() {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLocked() {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getGroupId() {
+		return NO_GROUP_ID;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getArtifactId() {
+		return NO_ARTIFACT_ID;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getVersion() {
+		return NO_VERSION;
+	}	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<String> getSessionNames() {
+		return new ArrayList<String>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<String> getCanonicalSessionNames() {
+		return new ArrayList<String>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean offer(String topic, String event) {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(TopicSink sink, Object event)
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
+		throw new IllegalStateException(this.getClass().getCanonicalName() + " invoked");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object[] getRecentSourceEvents() {
+		return new String[0];
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyContainer getContainer() {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String[] getRecentSinkEvents() {
+		return new String[0];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean ownsCoder(Class<? extends Object> coderClass, int modelHash) throws IllegalStateException {
+		throw new IllegalStateException(this.getClass().getCanonicalName() + " invoked");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Class<?> fetchModelClass(String className) throws IllegalArgumentException {
+		throw new IllegalArgumentException(this.getClass().getCanonicalName() + " invoked");
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isBrained() {
+		return false;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("NullDroolsController []");
+		return builder.toString();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void updateToVersion(String newGroupId, String newArtifactId, String newVersion,
+			List<TopicCoderFilterConfiguration> decoderConfigurations,
+			List<TopicCoderFilterConfiguration> encoderConfigurations)
+			throws IllegalArgumentException, LinkageError, Exception {
+		throw new IllegalArgumentException(this.getClass().getCanonicalName() + " invoked");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Map<String, Integer> factClassNames(String sessionName) 
+		   throws IllegalArgumentException {
+		return new HashMap<String,Integer>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public long factCount(String sessionName) throws IllegalArgumentException {
+		return 0;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<Object> facts(String sessionName, String className, boolean delete) {
+		return new ArrayList<Object>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<Object> factQuery(String sessionName, String queryName, 
+			                      String queriedEntity, 
+			                      boolean delete, Object... queryParams) {
+		return new ArrayList<Object>();
+	}
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java
new file mode 100644
index 00000000..9d166f58
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyControllerFeatureAPI.java
@@ -0,0 +1,222 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.features;
+
+import java.util.Properties;
+
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
+
+public interface PolicyControllerFeatureAPI extends OrderedService {
+
+	  /**
+	   * called before creating a controller with name 'name' and 
+	   * properties 'properties'
+	   * 
+	   * @param name name of the the controller
+	   * @param properties configuration properties
+	   * 
+	   * @return a policy controller.   A take over of the creation operation
+	   * is performed by returning a non-null policy controller.   
+	   * 'null' indicates that no take over has taken place, and processing should
+	   * continue to the next feature provider.
+	   */
+	  public default PolicyController beforeCreate(String name, Properties properties) {return null;}
+
+	  /**
+	   * called after creating a controller with name 'name'
+	   * 
+	   * @param controller controller
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterCreate(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller is started.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeStart(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept after the Policy Controller is started.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterStart(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller is stopped.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean beforeStop(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept after the Policy Controller is stopped
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.d.
+	   */
+	  public default boolean afterStop(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeLock(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept after the Policy Controller is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean afterLock(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeUnlock(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept after the Policy Controller is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterUnlock(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller is shut down
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean beforeShutdown(PolicyController controller) {return false;}
+	  
+	  /**
+	   * called after the Policy Controller is shut down
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterShutdown(PolicyController controller) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller is halted
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean beforeHalt(PolicyController controller) {return false;}
+	  
+	  /**
+	   * called after the Policy Controller is halted
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterHalt(PolicyController controller) {return false;}
+	  
+	  
+	  /**
+	   * intercept before the Policy Controller is offered an event
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeOffer(PolicyController controller,
+			                             CommInfrastructure protocol,
+			                             String topic,
+			                             String event) {return false;}
+
+	  /**
+	   * called after the Policy Controller processes an event offer
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterOffer(PolicyController controller,
+                                        CommInfrastructure protocol,
+                                        String topic,
+                                        String event, 
+                                        boolean success) {return false;}
+	  
+	  /**
+	   * intercept before the Policy Controller delivers (posts) an event
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeDeliver(PolicyController controller,
+							               CommInfrastructure protocol,
+							               String topic,
+							               Object event) {return false;}
+
+	  /**
+	   * called after the Policy Controller delivers (posts) an event
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterDeliver(PolicyController controller,
+							              CommInfrastructure protocol,
+							              String topic,
+							              Object event, 
+							              boolean success) {return false;}
+
+	  
+	  /**
+	   * Feature providers implementing this interface
+	   */
+	  public static final OrderedServiceImpl<PolicyControllerFeatureAPI> providers = 
+			  						new OrderedServiceImpl<PolicyControllerFeatureAPI>(PolicyControllerFeatureAPI.class);
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java
new file mode 100644
index 00000000..eb65c706
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureAPI.java
@@ -0,0 +1,202 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-engine
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.features;
+
+import java.util.Properties;
+
+import org.onap.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.utils.OrderedService;
+import org.onap.policy.drools.utils.OrderedServiceImpl;
+
+/**
+ * Policy Engine Feature API.
+ * Provides Interception Points during the Policy Engine lifecycle.
+ */
+public interface PolicyEngineFeatureAPI extends OrderedService {
+	
+	  /**
+	   * intercept before the Policy Engine is commanded to boot.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeBoot(PolicyEngine engine, String cliArgs[]) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine is booted.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterBoot(PolicyEngine engine) {return false;};
+	
+	  /**
+	   * intercept before the Policy Engine is configured.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeConfigure(PolicyEngine engine, Properties properties) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine is configured.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterConfigure(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept before the Policy Engine goes active.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeActivate(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine goes active.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterActivate(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept before the Policy Engine goes standby.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeDeactivate(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine goes standby.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterDeactivate(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept before the Policy Engine is started.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeStart(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine is started.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterStart(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept before the Policy Engine is stopped.
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean beforeStop(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine is stopped
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.d.
+	   */
+	  public default boolean afterStop(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept before the Policy Engine is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeLock(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean afterLock(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept before the Policy Engine is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean beforeUnlock(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept after the Policy Engine is locked
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterUnlock(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * intercept the Policy Engine is shut down
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise..
+	   */
+	  public default boolean beforeShutdown(PolicyEngine engine){return false;};
+	  
+	  /**
+	   * called after the Policy Engine is shut down
+	   * 
+	   * @return true if this feature intercepts and takes ownership
+	   * of the operation preventing the invocation of 
+	   * lower priority features.   False, otherwise.
+	   */
+	  public default boolean afterShutdown(PolicyEngine engine) {return false;};
+	  
+	  /**
+	   * Feature providers implementing this interface
+	   */
+	  public static final OrderedServiceImpl<PolicyEngineFeatureAPI> providers = 
+			  						new OrderedServiceImpl<>(PolicyEngineFeatureAPI.class);
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java b/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java
new file mode 100644
index 00000000..52aac744
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistence.java
@@ -0,0 +1,248 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.persistence;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Properties;
+
+import org.onap.policy.drools.utils.PropertyUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface SystemPersistence {
+	
+	/**
+	 * configuration directory
+	 */
+	public static String CONFIG_DIR_NAME = "config";
+	
+	/**
+	 * policy controllers suffix
+	 */
+	public final static String CONTROLLER_SUFFIX_IDENTIFIER = "-controller";
+		
+	/**
+	 * policy controller properties file suffix
+	 */
+	public final static String PROPERTIES_FILE_CONTROLLER_SUFFIX = 
+							CONTROLLER_SUFFIX_IDENTIFIER + ".properties"; 
+	
+	/**
+	 * policy engine properties file name
+	 */
+	public final static String PROPERTIES_FILE_ENGINE = "policy-engine.properties";
+	
+	
+	/**
+	 * backs up a controller configuration.
+	 * 
+	 * @param controllerName the controller name
+	 * @return true if the configuration is backed up
+	 */
+	public boolean backupController(String controllerName);
+	
+	/**
+	 * persists controller configuration
+	 * 
+	 * @param controllerName the controller name
+	 * @param configuration object containing the configuration
+	 * @return true if storage is succesful, false otherwise
+	 * @throws IllegalArgumentException if the configuration cannot be handled by the persistence manager
+	 */
+	public boolean storeController(String controllerName, Object configuration)
+		throws IllegalArgumentException;
+	
+	/**
+	 * delete controller configuration
+	 * 
+	 * @param controllerName the controller name
+	 * @return true if storage is succesful, false otherwise
+	 */
+	public boolean deleteController(String controllerName);
+	
+	/**
+	 * get controller properties
+	 * 
+	 * @param controllerName controller name
+	 * @return properties for this controller
+	 * @throws IllegalArgumentException if the controller name does not lead to a properties configuration
+	 */
+	public Properties getControllerProperties(String controllerName)
+			throws IllegalArgumentException;
+	
+	/**
+	 * get properties by name
+	 * 
+	 * @param name 
+	 * @return properties 
+	 * @throws IllegalArgumentException if the name does not lead to a properties configuration
+	 */
+	public Properties getProperties(String name) throws IllegalArgumentException;
+	
+	/**
+	 * Persistence Manager.   For now it is a file-based properties management,
+	 * In the future, it will probably be DB based, so manager implementation
+	 * will change.
+	 */
+	public static final SystemPersistence manager = new SystemPropertiesPersistence();
+}
+
+/** 
+ * Properties based Persistence
+ */
+class SystemPropertiesPersistence implements SystemPersistence {
+	
+	/**
+	 * logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(SystemPropertiesPersistence.class);
+	
+	/**
+	 * backs up the properties-based controller configuration
+	 * @param controllerName the controller name
+	 * @return true if the configuration is backed up in disk or back up does not apply, false otherwise.
+	 */
+	@Override
+	public boolean backupController(String controllerName) {
+	   	Path controllerPropertiesPath = 
+	   			Paths.get(CONFIG_DIR_NAME, controllerName + PROPERTIES_FILE_CONTROLLER_SUFFIX);
+	   	
+		if (Files.exists(controllerPropertiesPath)) {
+			try {
+				logger.warn("There is an existing configuration file at " + 
+			                controllerPropertiesPath.toString() +
+						    " with contents: " + Files.readAllBytes(controllerPropertiesPath));
+				Path controllerPropertiesBakPath = 
+						Paths.get(CONFIG_DIR_NAME, controllerName + 
+                                  PROPERTIES_FILE_CONTROLLER_SUFFIX + ".bak");
+				Files.copy(controllerPropertiesPath, 
+						   controllerPropertiesBakPath, StandardCopyOption.REPLACE_EXISTING);
+			} catch (Exception e) {
+				logger.warn("{}: cannot be backed up", controllerName, e);
+	    		return false;
+			}
+		} 
+		
+		return true;
+	}
+	
+	/**
+	 * persists properties-based controller configuration and makes a backup if necessary
+	 * @param controllerName the controller name
+	 * @return true if the properties has been stored in disk, false otherwise
+	 */
+	@Override
+	public boolean storeController(String controllerName, Object configuration) {
+	   	if (!(configuration instanceof Properties)) {
+	   		throw new IllegalArgumentException("configuration must be of type properties to be handled by this manager");
+	   	}
+	   	
+	   	Properties properties = (Properties) configuration;
+	   	
+		Path controllerPropertiesPath = 
+	   			Paths.get(CONFIG_DIR_NAME, controllerName + PROPERTIES_FILE_CONTROLLER_SUFFIX);
+    	if (Files.exists(controllerPropertiesPath)) {
+    		try {
+				Properties oldProperties = PropertyUtil.getProperties(controllerPropertiesPath.toFile());
+				if (oldProperties.equals(properties)) {
+					logger.info("A properties file with the same contents already exists for controller " + 
+				                controllerName + 
+				                ". No action is taken");
+					return true;
+				} else {
+					this.backupController(controllerName);
+				}
+			} catch (Exception e) {
+				logger.info("{}: no existing Properties", controllerName);
+				// continue
+			}
+    	}
+	  	
+		try {
+	    	File controllerPropertiesFile = controllerPropertiesPath.toFile();
+	    	FileWriter writer = new FileWriter(controllerPropertiesFile);
+	    	properties.store(writer, "Machine created Policy Controller Configuration");
+		} catch (Exception e) {
+			logger.warn("{}: cannot be STORED", controllerName, e);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * deletes properties-based controller configuration
+	 * @param controllerName the controller name
+	 * @return true if the properties has been deleted from disk, false otherwise
+	 */
+	@Override
+	public boolean deleteController(String controllerName) {
+		
+	   	Path controllerPropertiesPath = 
+	   			Paths.get(CONFIG_DIR_NAME, 
+	   					  controllerName + PROPERTIES_FILE_CONTROLLER_SUFFIX);
+
+	   	if (Files.exists(controllerPropertiesPath)) {
+			try {
+				Path controllerPropertiesBakPath = 
+						Paths.get(CONFIG_DIR_NAME, controllerName + 
+                                  PROPERTIES_FILE_CONTROLLER_SUFFIX + ".bak");
+				Files.move(controllerPropertiesPath, 
+						   controllerPropertiesBakPath, 
+						   StandardCopyOption.REPLACE_EXISTING);
+			} catch (Exception e) {
+				logger.warn("{}: cannot be DELETED", controllerName, e);
+				return false;
+			}
+		} 
+	   	
+	   	return true;
+	}
+
+	@Override
+	public Properties getControllerProperties(String controllerName) throws IllegalArgumentException {
+	   	return this.getProperties(controllerName + CONTROLLER_SUFFIX_IDENTIFIER);
+	}
+	
+	@Override
+	public Properties getProperties(String name) throws IllegalArgumentException {
+	   	Path propertiesPath = 
+	   			Paths.get(CONFIG_DIR_NAME, name + ".properties");
+	   	
+	   	if (!Files.exists(propertiesPath)) {
+			throw new IllegalArgumentException("properties for " + name + " are not persisted.");
+	   	}
+
+		try {
+			return PropertyUtil.getProperties(propertiesPath.toFile());
+		} catch (Exception e) {
+			logger.warn("{}: can't read properties @ {}", name, propertiesPath);
+			throw new IllegalArgumentException("can't read properties for " + 
+			                                   name + " @ " + 
+					                           propertiesPath);
+		}
+	}
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java
new file mode 100644
index 00000000..762f4476
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java
@@ -0,0 +1,1393 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.coders;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.onap.policy.drools.utils.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Coder (Encoder/Decoder) of Events.
+ */
+public interface EventProtocolCoder {
+	
+	public static class CoderFilters {
+
+		/**
+		 * coder class 
+		 */
+		protected String factClass;
+		
+		/**
+		 * filters to apply to the selection of the decodedClass;
+		 */
+		protected JsonProtocolFilter filter;
+
+		/**
+		 * classloader hash
+		 */
+		protected int modelClassLoaderHash;
+
+		
+		/**
+		 * constructor
+		 * 
+		 * @param codedClass coder class
+		 * @param filter filters to apply
+		 */
+		public CoderFilters(String codedClass, JsonProtocolFilter filter, int modelClassLoaderHash) {
+			this.factClass = codedClass;
+			this.filter = filter;
+			this.modelClassLoaderHash = modelClassLoaderHash;
+		}
+
+		/**
+		 * @return the codedClass
+		 */
+		public String getCodedClass() {
+			return factClass;
+		}
+
+		/**
+		 * @param codedClass the decodedClass to set
+		 */
+		public void setCodedClass(String codedClass) {
+			this.factClass = codedClass;
+		}
+		
+		/**
+		 * @return the filter
+		 */
+		public synchronized JsonProtocolFilter getFilter() {
+			return filter;
+		}
+
+		/**
+		 * @param filter the filter to set
+		 */
+		public synchronized void setFilter(JsonProtocolFilter filter) {
+			this.filter = filter;
+		}
+
+		public int getModelClassLoaderHash() {
+			return modelClassLoaderHash;
+		}
+
+		public void setFromClassLoaderHash(int fromClassLoaderHash) {
+			this.modelClassLoaderHash = fromClassLoaderHash;
+		}
+
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("CoderFilters [factClass=").append(factClass).append(", filter=").append(filter)
+					.append(", modelClassLoaderHash=").append(modelClassLoaderHash).append("]");
+			return builder.toString();
+		}
+
+	}
+	
+	/**
+	 * Adds a Decoder class to decode the protocol over this topic
+	 *  
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic 
+	 * @param eventClass the event class
+	 * @param protocolFilter filters to selectively choose a particular decoder
+	 * when there are multiples
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public void addDecoder(String groupId, String artifactId, 
+			               String topic, 
+			               String eventClass, 
+			               JsonProtocolFilter protocolFilter, 
+			               CustomGsonCoder customGsonCoder,
+			               CustomJacksonCoder customJacksonCoder,
+			               int modelClassLoaderHash)
+		throws IllegalArgumentException;
+
+	/**
+	 * removes all decoders associated with the controller id
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic of the controller
+	 * 
+	 * @throws IllegalArgumentException if invalid arguments have been provided
+	 */
+	void removeEncoders(String groupId, String artifactId, String topic) throws IllegalArgumentException;
+	
+	/**
+	 * removes decoders associated with the controller id and topic
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic
+	 * 
+	 * @throws IllegalArgumentException if invalid arguments have been provided
+	 */
+	public void removeDecoders(String groupId, String artifactId, String topic) throws IllegalArgumentException;
+	
+	/**
+	 * Given a controller id and a topic, it gives back its filters
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic
+	 * 
+	 * return list of decoders
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId, String topic)
+		throws IllegalArgumentException;	
+	
+
+	/**
+	 * Given a controller id and a topic, it gives back the decoding configuration
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic
+	 * 
+	 * return decoding toolset
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public ProtocolCoderToolset getDecoders(String groupId, String artifactId, String topic) 
+		   throws IllegalArgumentException;
+	
+	/**
+	 * Given a controller id and a topic, it gives back all the decoding configurations
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic
+	 * 
+	 * return decoding toolset
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public List<ProtocolCoderToolset> getDecoders(String groupId, String artifactId)
+		   throws IllegalArgumentException;
+	
+	
+	/**
+	 * gets all decoders associated with the group and artifact ids
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * 
+	 * @throws IllegalArgumentException if invalid arguments have been provided
+	 */
+	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId) throws IllegalArgumentException;
+	
+
+	/**
+	 * Given a controller id and a topic, it gives back the classes that implements the encoding
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic
+	 * 
+	 * return list of decoders
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId, String topic) 
+			throws IllegalArgumentException;
+	
+	/**
+	 * gets all encoders associated with the group and artifact ids
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * 
+	 * @throws IllegalArgumentException if invalid arguments have been provided
+	 */
+	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId) throws IllegalArgumentException;
+	
+	/**
+	 * Given a controller id, a topic, and a classname, it gives back the classes that implements the decoding
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic
+	 * @param classname classname
+	 * 
+	 * return list of decoders
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */	
+	public CoderFilters getDecoderFilters(String groupId, String artifactId, String topic, String classname)
+		throws IllegalArgumentException;	
+	
+	/**
+	 * is there a decoder supported for the controller id and topic
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic protocol
+	 * @return true if supported
+	 */
+	public boolean isDecodingSupported(String groupId, String artifactId, String topic);
+	
+	/**
+	 * Adds a Encoder class to encode the protocol over this topic
+	 *  
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic 
+	 * @param eventClass the event class
+	 * @param protocolFilter filters to selectively choose a particular decoder
+	 * when there are multiples
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public void addEncoder(String groupId, String artifactId, String topic, 
+						   String eventClass, 
+			               JsonProtocolFilter protocolFilter,
+			               CustomGsonCoder customGsonCoder,
+			               CustomJacksonCoder customJacksonCoder,
+			               int modelClassLoaderHash)
+		throws IllegalArgumentException;
+	
+	/**
+	 * is there an encoder supported for the controller id and topic
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic protocol
+	 * @return true if supported
+	 */
+	public boolean isEncodingSupported(String groupId, String artifactId, String topic);
+	
+	/**
+	 * get encoder based on coordinates and classname
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic protocol
+	 * @param json event string
+	 * @return
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 */
+	public CoderFilters getEncoderFilters(String groupId, String artifactId, String topic, String classname)
+			throws IllegalArgumentException;
+	
+	/**
+	 * get encoder based on topic and encoded class
+	 * 
+	 * @param topic topic
+	 * @param encodedClass encoded class
+	 * @return
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 */
+	public List<CoderFilters> getReverseEncoderFilters(String topic, String encodedClass)
+			throws IllegalArgumentException;
+	
+	/**
+	 * gets the identifier of the creator of the encoder
+	 * 
+	 * @param topic topic
+	 * @param encodedClass encoded class
+	 * @return a drools controller
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 */
+	public DroolsController getDroolsController(String topic, Object encodedClass)
+			throws IllegalArgumentException;
+	
+	/**
+	 * gets the identifier of the creator of the encoder
+	 * 
+	 * @param topic topic
+	 * @param encodedClass encoded class
+	 * @return list of drools controllers
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 */
+	public List<DroolsController> getDroolsControllers(String topic, Object encodedClass)
+			throws IllegalArgumentException;
+	
+	/**
+	 * decode topic's stringified event (json) to corresponding Event Object.
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic protocol
+	 * @param json event string
+	 * @return
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 * @throws UnsupportedOperationException if the operation is not supported
+	 * @throws IllegalStateException if the system is in an illegal state
+	 */
+	public Object decode(String groupId, String artifactId, String topic, String json) 
+			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException;
+
+	/**
+	 * encodes topic's stringified event (json) to corresponding Event Object.
+	 * 
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic protocol
+	 * @param event Object
+	 * 
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 */
+	public String encode(String groupId, String artifactId, String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException;
+	
+	/**
+	 * encodes topic's stringified event (json) to corresponding Event Object.
+	 * 
+	 * @param topic topic
+	 * @param event event object
+	 * 
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 * @throws UnsupportedOperationException operation cannot be performed
+	 */
+	public String encode(String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException;
+	
+	/**
+	 * encodes topic's stringified event (json) to corresponding Event Object.
+	 * 
+	 * @param topic topic
+	 * @param event event object
+	 * @param droolsController 
+	 * 
+	 * @throws IllegalArgumentException invalid arguments passed in
+	 * @throws UnsupportedOperationException operation cannot be performed
+	 */
+	public String encode(String topic, Object event, DroolsController droolsController) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException;
+	
+	/**
+	 * singleton reference to the global event protocol coder
+	 */
+	public static EventProtocolCoder manager = new MultiplexorEventProtocolCoder();
+}
+
+/**
+ * Protocol Coder that does its best attempt to decode/encode, selecting the best
+ * class and best fitted json parsing tools.
+ */
+class MultiplexorEventProtocolCoder implements EventProtocolCoder {
+	/**
+	 * Logger 
+	 */
+	private static Logger logger = LoggerFactory.getLogger(MultiplexorEventProtocolCoder.class);
+	
+	/**
+	 * Decoders
+	 */
+	protected EventProtocolDecoder decoders = new EventProtocolDecoder();
+	
+	/**
+	 * Encoders
+	 */
+	protected EventProtocolEncoder encoders = new EventProtocolEncoder();
+	
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addDecoder(String groupId, String artifactId, String topic, 
+			               String eventClass, 
+			               JsonProtocolFilter protocolFilter,
+			               CustomGsonCoder customGsonCoder,
+			               CustomJacksonCoder customJacksonCoder,
+			               int modelClassLoaderHash) 
+		   throws IllegalArgumentException {
+		logger.info("{}: add-decoder {}:{}:{}:{}:{}:{}:{}:{}", this, 
+				    groupId, artifactId, topic, eventClass,
+				    protocolFilter, customGsonCoder, customJacksonCoder,
+				    modelClassLoaderHash);
+		this.decoders.add(groupId, artifactId, topic, eventClass, protocolFilter, 
+				         customGsonCoder, customJacksonCoder, modelClassLoaderHash);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void addEncoder(String groupId, String artifactId, String topic, 
+			               String eventClass, 
+			               JsonProtocolFilter protocolFilter,
+			               CustomGsonCoder customGsonCoder,
+			               CustomJacksonCoder customJacksonCoder,
+			               int modelClassLoaderHash) 
+		   throws IllegalArgumentException {
+		logger.info("{}: add-decoder {}:{}:{}:{}:{}:{}:{}:{}", this, 
+			        groupId, artifactId, topic, eventClass,
+			        protocolFilter, customGsonCoder, customJacksonCoder,
+			        modelClassLoaderHash);
+		this.encoders.add(groupId, artifactId, topic, eventClass, protocolFilter, 
+		                  customGsonCoder, customJacksonCoder, modelClassLoaderHash);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeDecoders(String groupId, String artifactId, String topic) 
+		   throws IllegalArgumentException {
+		logger.info("{}: remove-decoder {}:{}:{}", this, groupId, artifactId, topic);	
+		this.decoders.remove(groupId, artifactId, topic);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removeEncoders(String groupId, String artifactId, String topic) 
+		   throws IllegalArgumentException {
+		logger.info("{}: remove-encoder {}:{}:{}", this, groupId, artifactId, topic);
+		this.encoders.remove(groupId, artifactId, topic);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isDecodingSupported(String groupId, String artifactId, String topic) {	
+		return this.decoders.isCodingSupported(groupId, artifactId, topic);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isEncodingSupported(String groupId, String artifactId, String topic) {
+		return this.encoders.isCodingSupported(groupId, artifactId, topic);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object decode(String groupId, String artifactId, String topic, String json) 
+			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
+		logger.debug("{}: decode {}:{}:{}:{}", this, groupId, artifactId, topic, json);
+		return this.decoders.decode(groupId, artifactId, topic, json);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String encode(String groupId, String artifactId, String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
+		logger.debug("{}: encode {}:{}:{}:{}", this, groupId, artifactId, topic, event);
+		return this.encoders.encode(groupId, artifactId, topic, event);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String encode(String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
+		logger.debug("{}: encode {}:{}", this, topic, event);
+		return this.encoders.encode(topic, event);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String encode(String topic, Object event, DroolsController droolsController) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
+		logger.debug("{}: encode {}:{}:{}", this, topic, event, droolsController);
+		return this.encoders.encode(topic, event, droolsController);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId, String topic) 
+			throws IllegalArgumentException {		
+		return this.decoders.getFilters(groupId, artifactId, topic);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public ProtocolCoderToolset getDecoders(String groupId, String artifactId, String topic) 
+			throws IllegalArgumentException {		
+		Pair<ProtocolCoderToolset,ProtocolCoderToolset> decoderToolsets = this.decoders.getCoders(groupId, artifactId, topic);
+		if (decoderToolsets == null)
+			throw new IllegalArgumentException("Decoders not found for " + groupId + ":" + artifactId + ":" + topic);
+		
+		return decoderToolsets.first();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId, String topic) 
+			throws IllegalArgumentException {		
+		return this.encoders.getFilters(groupId, artifactId, topic);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CoderFilters getDecoderFilters(String groupId, String artifactId, String topic, String classname)
+			throws IllegalArgumentException {		
+		return this.decoders.getFilters(groupId, artifactId, topic, classname);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public CoderFilters getEncoderFilters(String groupId, String artifactId, String topic, String classname)
+			throws IllegalArgumentException {	
+		return this.encoders.getFilters(groupId, artifactId, topic, classname);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<CoderFilters> getReverseEncoderFilters(String topic, String encodedClass) throws IllegalArgumentException {
+		return this.encoders.getReverseFilters(topic, encodedClass);
+	}
+
+	/**
+	 * get all deocders by maven coordinates and topic
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * 
+	 * @return list of decoders
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	@Override
+	public List<ProtocolCoderToolset> getDecoders(String groupId, String artifactId) 
+			throws IllegalArgumentException {
+
+		List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> decoderToolsets = this.decoders.getCoders(groupId, artifactId);
+		if (decoderToolsets == null)
+			throw new IllegalArgumentException("Decoders not found for " + groupId + ":" + artifactId);
+		
+		List<ProtocolCoderToolset> parser1CoderToolset = new ArrayList<>();
+		for (Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderToolsetPair : decoderToolsets) {
+			parser1CoderToolset.add(coderToolsetPair.first());
+		}
+		
+		return parser1CoderToolset;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId) throws IllegalArgumentException {
+		return this.decoders.getFilters(groupId, artifactId);
+		
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId) throws IllegalArgumentException {
+		return this.encoders.getFilters(groupId, artifactId);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DroolsController getDroolsController(String topic, Object encodedClass) throws IllegalArgumentException {
+		return this.encoders.getDroolsController(topic, encodedClass);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<DroolsController> getDroolsControllers(String topic, Object encodedClass) throws IllegalArgumentException {
+		return this.encoders.getDroolsControllers(topic, encodedClass);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("MultiplexorEventProtocolCoder [decoders=").append(decoders).append(", encoders=")
+				.append(encoders).append("]");
+		return builder.toString();
+	}
+}
+
+/**
+ * This protocol Coder that does its best attempt to decode/encode, selecting the best
+ * class and best fitted json parsing tools.
+ */
+abstract class GenericEventProtocolCoder  {
+	private static Logger  logger = LoggerFactory.getLogger(GenericEventProtocolCoder.class);	
+	
+	/**
+	 * Mapping topic:controller-id -> <protocol-decoder-toolset-pair> 
+	 * where protocol-coder-toolset-pair contains both a jackson-protocol-coder-toolset
+	 * and a gson-protocol-coder-toolset.   The first value of the pair will the 
+	 * protocol coder toolset most likely to be successful with the encoding or decoding,
+	 * and consequently the second value will be the less likely.
+	 */
+	protected final HashMap<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>> coders = 
+			new HashMap<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
+	
+	/**
+	 * Mapping topic + classname -> Protocol Set 
+	 */
+	protected final HashMap<String, List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>> reverseCoders = 
+			new HashMap<String, List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>>();
+	
+	protected boolean multipleToolsetRetries = false;
+	
+	GenericEventProtocolCoder(boolean multipleToolsetRetries) {
+		this.multipleToolsetRetries = multipleToolsetRetries;
+	}
+	
+	/**
+	 * Index a new coder
+	 *  
+	 * @param groupId of the controller
+	 * @param artifactId of the controller
+	 * @param topic the topic 
+	 * @param eventClass the event class
+	 * @param protocolFilter filters to selectively choose a particular decoder
+	 * when there are multiples
+	 * 
+	 * @throw IllegalArgumentException if an invalid parameter is passed
+	 */
+	public void add(String groupId, String artifactId, 
+			        String topic, 
+			        String eventClass, 
+			        JsonProtocolFilter protocolFilter, 
+			        CustomGsonCoder customGsonCoder, 
+			        CustomJacksonCoder customJacksonCoder,
+			        int modelClassLoaderHash)
+		   throws IllegalArgumentException {
+		if (groupId == null || groupId.isEmpty()) {			
+			throw new IllegalArgumentException("Invalid group id");
+		}
+		
+		if (artifactId == null || artifactId.isEmpty())
+			throw new IllegalArgumentException("Invalid artifact id");
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		if (eventClass == null) {
+			throw new IllegalArgumentException("Invalid Event Class");
+		}
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		String reverseKey = this.reverseCodersKey(topic, eventClass);
+		
+		synchronized(this) {
+			if (coders.containsKey(key)) {				
+				Pair<ProtocolCoderToolset, ProtocolCoderToolset> toolsets = coders.get(key);
+				
+				logger.info("{}: adding coders for existing {}: ", this, key, toolsets.first());
+				
+				toolsets.first().addCoder(eventClass, protocolFilter, modelClassLoaderHash);
+				toolsets.second().addCoder(eventClass, protocolFilter, modelClassLoaderHash);
+				
+				if (!reverseCoders.containsKey(reverseKey)) {
+					logger.info("{}: adding new reverse coders (multiple classes case) for {}:{}: {}",
+							    this, reverseKey, key, toolsets.first());
+					
+					List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> reverseMappings =
+							new ArrayList<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
+					reverseMappings.add(toolsets);
+					reverseCoders.put(reverseKey, reverseMappings);
+				}
+				return;
+			}
+		
+			GsonProtocolCoderToolset gsonCoderTools = 
+										new GsonProtocolCoderToolset
+														(topic, key, 
+														 groupId, artifactId, 
+														 eventClass, protocolFilter,
+														 customGsonCoder,
+														 modelClassLoaderHash);
+			
+			JacksonProtocolCoderToolset jacksonCoderTools = 
+										new JacksonProtocolCoderToolset
+														(topic, key, 
+														 groupId, artifactId, 
+														 eventClass, protocolFilter,
+														 customJacksonCoder,
+														 modelClassLoaderHash);
+			
+			// Use Gson as the first priority encoding/decoding toolset, and Jackson
+			// as second.  This is because it has been observed that they can diverge
+			// somewhat in the encoding/decoding data types, which can produce json
+			// that may result incompatible with what some network elements are 
+			// expecting.   As decoding takes place, this element will reconfigure
+			// itself to set the jackson one as the favoured one first, if errors
+			// are detected in the gson encoding
+			
+			Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = 
+					new Pair<ProtocolCoderToolset,ProtocolCoderToolset>(gsonCoderTools, 
+							                                            jacksonCoderTools);
+			
+			logger.info("{}: adding coders for new {}: {}", this, key, coderTools.first());
+			
+			coders.put(key, coderTools);
+			
+			if (reverseCoders.containsKey(reverseKey)) {
+				// There is another controller (different group id/artifact id/topic)
+				// that shares the class and the topic.
+				
+				List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> toolsets = 
+															reverseCoders.get(reverseKey);
+				boolean present = false;
+				for (Pair<ProtocolCoderToolset,ProtocolCoderToolset> parserSet: toolsets) {
+					// just doublecheck
+					present = parserSet.first().getControllerId().equals(key);
+					if (present) {
+						/* anomaly */
+						logger.error("{}: unexpected toolset reverse mapping found for {}:{}: {}", 
+								     this, reverseKey, key, parserSet.first());
+					}
+				}
+				
+				if (present) {
+					return;
+				} else {
+					logger.info("{}: adding coder set for {}: {} ", this, 
+							    reverseKey, coderTools.getFirst());
+					toolsets.add(coderTools);
+				}
+			} else {
+				List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> toolsets =
+					new ArrayList<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
+				toolsets.add(coderTools);
+				
+				logger.info("{}: adding toolset for reverse key {}: {}", this, reverseKey, toolsets);
+				reverseCoders.put(reverseKey, toolsets);
+			}
+			
+		}
+	}
+
+	/**
+	 * produces key for indexing toolset entries
+	 * 
+	 * @param group group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @return index key
+	 */
+	protected String codersKey(String groupId, String artifactId, String topic) {
+		return groupId + ":" + artifactId + ":" + topic;
+	}
+	
+	/**
+	 * produces a key for the reverse index
+	 * 
+	 * @param topic topic 
+	 * @param eventClass coded class
+	 * @return reverse index key
+	 */
+	protected String reverseCodersKey(String topic, String eventClass) {
+		return topic + ":" + eventClass;
+	}
+	
+	/**
+	 * remove coder 
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	public void remove(String groupId, String artifactId, String topic) 
+		   throws IllegalArgumentException {
+		
+		if (groupId == null || groupId.isEmpty())
+			throw new IllegalArgumentException("Invalid group id");
+		
+		if (artifactId == null || artifactId.isEmpty())
+			throw new IllegalArgumentException("Invalid artifact id");
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		
+		synchronized(this) {
+			if (coders.containsKey(key)) {
+				Pair<ProtocolCoderToolset, ProtocolCoderToolset> p = coders.remove(key);
+				
+				logger.info("{}: removed toolset for {}: {}", this, key, p.getFirst());
+				
+				for (CoderFilters codeFilter : p.first().getCoders()) {
+					String className = codeFilter.getCodedClass();
+					String reverseKey = this.reverseCodersKey(topic, className);
+					if (this.reverseCoders.containsKey(reverseKey) ) {
+						List<Pair<ProtocolCoderToolset, ProtocolCoderToolset>> toolsets = 
+																this.reverseCoders.get(reverseKey);
+						Iterator<Pair<ProtocolCoderToolset, ProtocolCoderToolset>> toolsetsIter = 
+																				toolsets.iterator();
+						while (toolsetsIter.hasNext()) {
+							Pair<ProtocolCoderToolset, ProtocolCoderToolset> toolset = toolsetsIter.next();
+							if (toolset.first().getControllerId().equals(key)) {
+								logger.info("{}: removed coder from toolset for {} from reverse mapping {}: ", 
+										    this, reverseKey);
+								toolsetsIter.remove();
+							}
+						}
+						
+						if (this.reverseCoders.get(reverseKey).isEmpty()) {
+							logger.info("{}: removing reverse mapping for {}: ", this, reverseKey);						
+							this.reverseCoders.remove(reverseKey);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * does it support coding?
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @return true if its is codable
+	 */
+	public boolean isCodingSupported(String groupId, String artifactId, String topic) {
+		
+		if (groupId == null || groupId.isEmpty())
+			throw new IllegalArgumentException("Invalid group id");
+		
+		if (artifactId == null || artifactId.isEmpty())
+			throw new IllegalArgumentException("Invalid artifact id");
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		synchronized(this) {
+			return (coders.containsKey(key));
+		}
+	}
+	
+	/**
+	 * decode a json string into an Object
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @param json json string to convert to object
+	 * @return the decoded object
+	 * @throws IllegalArgumentException if invalid argument is provided
+	 * @throws UnsupportedOperationException if the operation cannot be performed
+	 */
+	public Object decode(String groupId, String artifactId, String topic, String json) 
+			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
+		
+		if (!isCodingSupported(groupId, artifactId, topic))
+			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic) + " for encoding");
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
+		try {
+			Object event = coderTools.first().decode(json);
+			if (event != null)
+				return event;
+		} catch (Exception e) {
+			logger.debug("{}, cannot decode {}", this, json, e);
+		}
+		
+		if (multipleToolsetRetries) {
+			// try the less favored toolset
+			try {
+				Object event = coderTools.second().decode(json);
+				if (event != null) {
+					// change the priority of the toolset
+					synchronized(this) {
+						ProtocolCoderToolset first = coderTools.first();
+						ProtocolCoderToolset second = coderTools.second();
+						coderTools.first(second);
+						coderTools.second(first);
+					}
+					
+					return event;
+				}
+			} catch (Exception e) {
+				throw new UnsupportedOperationException(e);
+			}
+		} 
+		
+		throw new UnsupportedOperationException("Cannot decode neither with gson or jackson");
+	}
+
+	/**
+	 * encode an object into a json string
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @param event object to convert to string
+	 * @return the json string
+	 * @throws IllegalArgumentException if invalid argument is provided
+	 * @throws UnsupportedOperationException if the operation cannot be performed
+	 */
+	public String encode(String groupId, String artifactId, String topic, Object event) 
+			throws IllegalArgumentException, UnsupportedOperationException {
+		
+		if (!isCodingSupported(groupId, artifactId, topic))
+			throw new IllegalArgumentException
+				("Unsupported:" + codersKey(groupId, artifactId, topic));
+		
+		if (event == null)
+			throw new IllegalArgumentException("Unsupported topic:" + topic);
+		
+		// reuse the decoder set, since there must be affinity in the model
+		String key = this.codersKey(groupId, artifactId, topic);
+		return this.encodeInternal(key, event);
+	}
+	
+	/**
+	 * encode an object into a json string
+	 * 
+	 * @param key identifier
+	 * @param event object to convert to string
+	 * @return the json string
+	 * @throws IllegalArgumentException if invalid argument is provided
+	 * @throws UnsupportedOperationException if the operation cannot be performed
+	 */
+	protected String encodeInternal(String key, Object event) 
+			throws IllegalArgumentException, UnsupportedOperationException {
+		
+		logger.debug("{}: encode for {}: {}", this, key, event);
+		
+		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
+		try {
+			String json = coderTools.first().encode(event);
+			if (json != null && !json.isEmpty())
+				return json;
+		} catch (Exception e) {
+			logger.warn("{}: cannot encode (first) for {}: {}", this, key, event, e);
+		}
+		
+		if (multipleToolsetRetries) {
+			// try the less favored toolset
+			try {
+				String json = coderTools.second().encode(event);
+				if (json != null) {
+					// change the priority of the toolset
+					synchronized(this) {
+						ProtocolCoderToolset first = coderTools.first();
+						ProtocolCoderToolset second = coderTools.second();
+						coderTools.first(second);
+						coderTools.second(first);
+					}
+					
+					return json;
+				}
+			} catch (Exception e) {
+				logger.error("{}: cannot encode (second) for {}: {}", this, key, event, e);
+				throw new UnsupportedOperationException(e);
+			}
+		}
+		
+		throw new UnsupportedOperationException("Cannot decode neither with gson or jackson");
+	}
+	
+	/**
+	 * encode an object into a json string
+	 * 
+	 * @param topic topic
+	 * @param event object to convert to string
+	 * @return the json string
+	 * @throws IllegalArgumentException if invalid argument is provided
+	 * @throws UnsupportedOperationException if the operation cannot be performed
+	 */
+	public String encode(String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
+		
+		if (event == null)
+			throw new IllegalArgumentException("Invalid encoded class");
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid topic");
+		
+		List<DroolsController> droolsControllers = droolsCreators(topic, event);
+		
+		if (droolsControllers.isEmpty())	
+			throw new IllegalArgumentException("no drools controller has been found");
+		
+		if (droolsControllers.size() > 1) {
+			logger.warn("{}: multiple drools-controller {} for {}:{} ", this, topic,
+						droolsControllers, event.getClass().getCanonicalName());		
+			// continue
+		}
+		
+		String key = codersKey(droolsControllers.get(0).getGroupId(), droolsControllers.get(0).getArtifactId(), topic);
+		return this.encodeInternal(key, event);
+	}
+	
+	/**
+	 * encode an object into a json string
+	 * 
+	 * @param topic topic
+	 * @param encodedClass object to convert to string
+	 * @return the json string
+	 * @throws IllegalArgumentException if invalid argument is provided
+	 * @throws UnsupportedOperationException if the operation cannot be performed
+	 */
+	public String encode(String topic, Object encodedClass, DroolsController droolsController) 
+			throws IllegalArgumentException, IllegalArgumentException, UnsupportedOperationException {
+		
+		if (encodedClass == null)
+			throw new IllegalArgumentException("Invalid encoded class");
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid topic");
+		
+		String key = codersKey(droolsController.getGroupId(), droolsController.getArtifactId(), topic);
+		return this.encodeInternal(key, encodedClass);
+	}
+
+	/**
+	 * @param topic
+	 * @param encodedClass
+	 * @param reverseKey
+	 * @return
+	 * @throws IllegalStateException
+	 * @throws IllegalArgumentException
+	 */
+	protected List<DroolsController> droolsCreators(String topic, Object encodedClass)
+			throws IllegalStateException, IllegalArgumentException {
+		
+		List<DroolsController> droolsControllers = new ArrayList<DroolsController>();
+		
+		String reverseKey = this.reverseCodersKey(topic, encodedClass.getClass().getCanonicalName());
+		if (!this.reverseCoders.containsKey(reverseKey)) {
+			logger.warn("{}: no reverse mapping for {}", this, reverseKey);
+			return droolsControllers;
+		}
+		
+		List<Pair<ProtocolCoderToolset, ProtocolCoderToolset>> 
+					toolsets = this.reverseCoders.get(reverseKey);
+		
+		// There must be multiple toolset pairs associated with <topic,classname> reverseKey
+		// case 2 different controllers use the same models and register the same encoder for
+		// the same topic.  This is assumed not to occur often but for the purpose of encoding
+		// but there should be no side-effects.  Ownership is crosscheck against classname and 
+		// classloader reference.
+		
+		if (toolsets == null || toolsets.isEmpty())
+			throw new IllegalStateException("No Encoders toolsets available for topic "+ topic +
+					                        " encoder " + encodedClass.getClass().getCanonicalName());
+		
+		for (Pair<ProtocolCoderToolset, ProtocolCoderToolset> encoderSet : toolsets) {
+			// figure out the right toolset
+			String groupId = encoderSet.first().getGroupId();
+			String artifactId = encoderSet.first().getArtifactId();
+			List<CoderFilters> coders = encoderSet.first().getCoders();
+			for (CoderFilters coder : coders) {
+				if (coder.getCodedClass().equals(encodedClass.getClass().getCanonicalName())) {
+					DroolsController droolsController = 
+							DroolsController.factory.get(groupId, artifactId, "");
+					if (droolsController.ownsCoder(encodedClass.getClass(), coder.getModelClassLoaderHash())) {
+						droolsControllers.add(droolsController);
+					}
+				}
+			}
+		}
+		
+		if (droolsControllers.isEmpty())
+			throw new IllegalStateException("No Encoders toolsets available for "+ topic +
+		                                    ":" + encodedClass.getClass().getCanonicalName());
+		
+		return droolsControllers;
+	}
+
+
+	/**
+	 * get all filters by maven coordinates and topic
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @return list of coders
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	public List<CoderFilters> getFilters(String groupId, String artifactId, String topic) 
+			throws IllegalArgumentException {
+		
+		if (!isCodingSupported(groupId, artifactId, topic))
+			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic));
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
+		return coderTools.first().getCoders();
+	}
+	
+	/**
+	 * get all coders by maven coordinates and topic
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @return list of coders
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	public Pair<ProtocolCoderToolset,ProtocolCoderToolset> getCoders(String groupId, String artifactId, String topic) 
+			throws IllegalArgumentException {
+		
+		if (!isCodingSupported(groupId, artifactId, topic))
+			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic));
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
+		return coderTools;
+	}
+	
+	/**
+	 * get all coders by maven coordinates and topic
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @return list of coders
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	public List<CoderFilters> getFilters(String groupId, String artifactId) 
+			throws IllegalArgumentException {
+		
+		if (groupId == null || groupId.isEmpty())
+			throw new IllegalArgumentException("Invalid group id");
+		
+		if (artifactId == null || artifactId.isEmpty())
+			throw new IllegalArgumentException("Invalid artifact id");
+		
+		String key = this.codersKey(groupId, artifactId, "");
+		
+		List<CoderFilters> codersFilters = new ArrayList<CoderFilters>();
+		for (Map.Entry<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>> entry : coders.entrySet()) {
+			if (entry.getKey().startsWith(key)) {
+				codersFilters.addAll(entry.getValue().first().getCoders());
+			}
+		}
+		
+		return codersFilters;
+	}
+	
+	/**
+	 * get all coders by maven coordinates and topic
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @return list of coders
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	public List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> getCoders(String groupId, String artifactId) 
+			throws IllegalArgumentException {
+		
+		if (groupId == null || groupId.isEmpty())
+			throw new IllegalArgumentException("Invalid group id");
+		
+		if (artifactId == null || artifactId.isEmpty())
+			throw new IllegalArgumentException("Invalid artifact id");
+		
+		String key = this.codersKey(groupId, artifactId, "");
+		
+		List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> coderToolset = new ArrayList<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
+		for (Map.Entry<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>> entry : coders.entrySet()) {
+			if (entry.getKey().startsWith(key)) {
+				coderToolset.add(entry.getValue());
+			}
+		}
+		
+		return coderToolset;
+	}
+
+
+	/**
+	 * get all filters by maven coordinates, topic, and classname
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @param topic topic
+	 * @param classname
+	 * @return list of coders
+	 * @throws IllegalArgumentException if invalid input
+	 */
+	public CoderFilters getFilters(String groupId, String artifactId, String topic, String classname)
+			throws IllegalArgumentException {
+		
+		if (!isCodingSupported(groupId, artifactId, topic))
+			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic));
+		
+		if (classname == null || classname.isEmpty())
+			throw new IllegalArgumentException("classname must be provided");
+		
+		String key = this.codersKey(groupId, artifactId, topic);
+		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
+		return coderTools.first().getCoder(classname);
+	}
+	
+	/**
+	 * get coded based on class and topic
+	 * 
+	 * @param topic
+	 * @param codedClass
+	 * @return
+	 * @throws IllegalArgumentException
+	 */
+	public List<CoderFilters> getReverseFilters(String topic, String codedClass)
+			throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Unsupported");
+		
+		if (codedClass == null)
+			throw new IllegalArgumentException("class must be provided");
+		
+		String key = this.reverseCodersKey(topic, codedClass);
+		List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> toolsets = this.reverseCoders.get(key);
+		if (toolsets == null)
+			throw new IllegalArgumentException("No Coder found for " + key);
+		
+		
+		List<CoderFilters> coders = new ArrayList<CoderFilters>();
+		for (Pair<ProtocolCoderToolset,ProtocolCoderToolset> toolset: toolsets) {
+			coders.addAll(toolset.first().getCoders());
+		}
+		
+		return coders;
+	}
+	
+	/**
+	 * returns group and artifact id of the creator of the encoder
+	 * 
+	 * @param topic
+	 * @param fact
+	 * @return
+	 * @throws IllegalArgumentException
+	 */
+	DroolsController getDroolsController(String topic, Object fact)
+			throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Unsupported");
+		
+		if (fact == null)
+			throw new IllegalArgumentException("class must be provided");
+		
+		List<DroolsController> droolsControllers = droolsCreators(topic, fact);
+		
+		if (droolsControllers.isEmpty())	
+			throw new IllegalArgumentException("Invalid Topic: " + topic);
+		
+		if (droolsControllers.size() > 1) {
+			logger.warn("{}: multiple drools-controller {} for {}:{} ", this,
+				        droolsControllers, topic, fact.getClass().getCanonicalName());
+			// continue
+		}
+		return droolsControllers.get(0);
+	}
+	
+	/**
+	 * returns group and artifact id of the creator of the encoder
+	 * 
+	 * @param topic
+	 * @param fact
+	 * @return
+	 * @throws IllegalArgumentException
+	 */
+	List<DroolsController> getDroolsControllers(String topic, Object fact)
+			throws IllegalArgumentException {
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Unsupported");
+		
+		if (fact == null)
+			throw new IllegalArgumentException("class must be provided");
+		
+		List<DroolsController> droolsControllers = droolsCreators(topic, fact);
+		if (droolsControllers.size() > 1) {
+			// unexpected
+			logger.warn("{}: multiple drools-controller {} for {}:{} ", this,
+					    droolsControllers, topic, fact.getClass().getCanonicalName());		
+			// continue
+		}
+		return droolsControllers;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("GenericEventProtocolCoder [coders=").append(coders.keySet()).append(", reverseCoders=")
+				.append(reverseCoders.keySet()).append("]");
+		return builder.toString();
+	}
+}
+
+class EventProtocolDecoder extends GenericEventProtocolCoder {
+
+	public EventProtocolDecoder(){super(false);}
+	
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("EventProtocolDecoder [toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+	
+}
+	
+class EventProtocolEncoder extends GenericEventProtocolCoder {
+	
+	public EventProtocolEncoder(){super(false);}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("EventProtocolEncoder [toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+}
\ No newline at end of file
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java
new file mode 100644
index 00000000..6afeb26a
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/JsonProtocolFilter.java
@@ -0,0 +1,308 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.coders;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.onap.policy.drools.utils.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+/**
+ * JSON Protocol Filter.  Evaluates an JSON string and evaluates if it
+ * passes its filters.
+ */
+public class JsonProtocolFilter {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(JsonProtocolFilter.class);
+	
+	/**
+	 * Helper class to collect Filter information
+	 */
+	public static class FilterRule {
+		/**
+		 * Field name
+		 */
+		protected String name;
+		
+		/**
+		 * Field Value regex
+		 */
+		protected String regex;
+		
+		/**
+		 * Filter Constructor
+		 * 
+		 * @param name field name
+		 * @param regex field regex value
+		 */
+		public FilterRule(String name, String regex) {
+			this.name = name;
+			this.regex = regex;
+		}
+
+		/**
+		 * Default constructor (for serialization only)
+		 */
+		public FilterRule() {
+			super();
+		}
+
+		/**
+		 * gets name
+		 * 
+		 * @return
+		 */
+		public String getName() {
+			return name;
+		}
+
+		/**
+		 * gets regex
+		 * 
+		 * @return
+		 */
+		public String getRegex() {
+			return regex;
+		}
+
+		/**
+		 * sets field name
+		 * @param name field name
+		 */
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		/**
+		 * sets regex name
+		 * @param regex
+		 */
+		public void setRegex(String regex) {
+			this.regex = regex;
+		}
+
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("Filter [name=").append(name).append(", regex=").append(regex).append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * all the filters to be applied
+	 */
+	protected List<FilterRule> rules = new ArrayList<FilterRule>();
+	
+	/**
+	 * 
+	 * @param rawFilters raw filter initialization
+	 * 
+	 * @throws IllegalArgumentException an invalid input has been provided
+	 */
+	public static JsonProtocolFilter fromRawFilters(List<Pair<String, String>> rawFilters) 
+		throws IllegalArgumentException {
+		
+		if (rawFilters == null) {
+			throw new IllegalArgumentException("No raw filters provided");
+		}
+		
+		List<FilterRule> filters = new ArrayList<FilterRule>();
+		for (Pair<String, String> filterPair: rawFilters) {
+			if  (filterPair.first() == null || filterPair.first().isEmpty()) {
+				continue;
+			}
+			
+			filters.add(new FilterRule(filterPair.first(), filterPair.second()));
+		}
+		return new JsonProtocolFilter(filters);
+	}
+	
+	/**
+	 * Create a Protocol Filter
+	 * 
+	 * @throws IllegalArgumentException an invalid input has been provided
+	 */
+	public JsonProtocolFilter() throws IllegalArgumentException {}
+	
+	/**
+	 * 
+	 * @param rawFilters raw filter initialization
+	 * 
+	 * @throws IllegalArgumentException an invalid input has been provided
+	 */
+	public JsonProtocolFilter(List<FilterRule> filters) throws IllegalArgumentException {
+		this.rules = filters;
+	}
+
+	/**
+	 * are there any filters?
+	 * 
+	 * @return true if there are filters, false otherwise
+	 */
+	public boolean isRules() {
+		return !this.rules.isEmpty();
+	}
+
+	/**
+	 * accept a JSON string as conformant it if passes all filters
+	 * 
+	 * @param json json is a JSON object
+	 * @return true if json string is conformant
+	 * 
+	 * @throws IllegalArgumentException an invalid input has been provided
+	 */
+	public synchronized boolean accept(JsonElement json) throws IllegalArgumentException {
+		if (json == null) {
+			throw new IllegalArgumentException("no JSON provided");
+		}
+		
+		if (rules.isEmpty()) {
+			return true;
+		}
+		
+		try {
+			if (!json.isJsonObject()) {
+				return false;
+			}
+			
+			JsonObject event = json.getAsJsonObject();
+			for (FilterRule filter: rules) {
+				if (filter.regex == null || 
+					filter.regex.isEmpty() ||  
+					filter.regex.equals(".*")) {
+					
+					// Only check for presence
+					if (!event.has(filter.name)) {
+						return false;
+					}
+				} else {
+					JsonElement field = event.get(filter.name);
+					if (field == null) {
+						return false;
+					}
+					
+					String fieldValue = field.getAsString();
+					if (!fieldValue.matches(filter.regex)) {
+						return false;
+					}
+				}
+			}
+			return true;
+		} catch (Exception e) {
+			throw new IllegalArgumentException(e);
+		}
+	}
+	
+	/**
+	 * accept a JSON string as conformant it if passes all filters
+	 * 
+	 * @param json json string
+	 * @return true if json string is conformant
+	 * 
+	 * @throws IllegalArgumentException an invalid input has been provided
+	 */
+	public synchronized boolean accept(String json) throws IllegalArgumentException {
+		if (json == null || json.isEmpty()) {
+			throw new IllegalArgumentException("no JSON provided");
+		}
+		
+		if (rules.isEmpty()) {
+			return true;
+		}
+		
+		try {
+			JsonElement element = new JsonParser().parse(json);
+			if (element == null || !element.isJsonObject()) {
+				return false;
+			}
+			
+			return this.accept(element.getAsJsonObject());
+		} catch (IllegalArgumentException ile) {
+			throw ile;
+		} catch (Exception e) {
+			logger.info("{}: cannot accept {} because of {}", 
+					    this, json, e.getMessage(), e);
+			throw new IllegalArgumentException(e);			
+		}
+	}
+
+	public List<FilterRule> getRules() {
+		return rules;
+	}
+
+	public synchronized void setRules(List<FilterRule> rulesFilters) {
+		this.rules = rulesFilters;
+	}
+	
+	public synchronized void deleteRules(String name) {
+		for (FilterRule rule : new ArrayList<>(this.rules)) {
+		    if (rule.name.equals(name)) {
+		    	this.rules.remove(rule);
+		    }
+		}
+	}
+	
+	public List<FilterRule> getRules(String name) {
+		ArrayList<FilterRule> temp = new ArrayList<>();
+		for (FilterRule rule : new ArrayList<>(this.rules)) {
+		    if (rule.name.equals(name)) {
+		    	temp.add(rule);
+		    }
+		}
+		return temp;
+	}
+	
+	public synchronized void deleteRule(String name, String regex) {
+		for (FilterRule rule : new ArrayList<>(this.rules)) {
+		    if (rule.name.equals(name) && rule.regex.equals(regex)) {
+		    	this.rules.remove(rule);
+		    }
+		}
+	}
+	
+	public synchronized void addRule(String name, String regex) {
+		for (FilterRule rule : new ArrayList<>(this.rules)) {
+		    if (rule.name.equals(name) && rule.regex.equals(regex)) {
+		    	return;
+		    }
+		}
+		
+		this.rules.add(new FilterRule(name,regex));
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("JsonProtocolFilter [rules=").append(rules).append("]");
+		return builder.toString();
+	}
+
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
new file mode 100644
index 00000000..8e7dec0b
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/ProtocolCoderToolset.java
@@ -0,0 +1,683 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.coders;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.time.Instant;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
+import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+/**
+ * Protocol Coding/Decoding Toolset
+ */
+public abstract class ProtocolCoderToolset {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(ProtocolCoderToolset.class);
+	
+	/**
+	 * topic
+	 */
+	protected final String topic;
+	
+	/**
+	 * controller id
+	 */
+	protected final String controllerId;
+	
+	/**
+	 * group id
+	 */
+	protected final String groupId;
+	
+	/**
+	 * artifact id
+	 */
+	protected final String artifactId;
+	
+	/**
+	 * Protocols and associated Filters
+	 */
+	protected final List<CoderFilters> coders = new ArrayList<CoderFilters>();
+	
+	/**
+	 * Tree model (instead of class model) generic parsing to be able to inspect elements
+	 */
+	protected JsonParser filteringParser = new JsonParser();
+
+	/**
+	 * custom coder
+	 */
+	protected CustomCoder customCoder;
+	
+	/**
+	 * Constructor
+	 * 
+	 * @param topic the topic
+	 * @param controllerId the controller id
+	 * @param codedClass the decoded class
+	 * @param filters list of filters that apply to the
+	 * selection of this decodedClass in case of multiplicity
+	 * @throws IllegalArgumentException if invalid data has been passed in
+	 */
+	public ProtocolCoderToolset(String topic, 
+								String controllerId, 
+			                    String groupId,
+			                    String artifactId,
+			                    String codedClass, 
+			                    JsonProtocolFilter filters, 
+						        CustomCoder customCoder,
+						        int modelClassLoaderHash)
+		throws IllegalArgumentException {
+		
+		if (topic == null || controllerId == null || 
+			groupId == null || artifactId == null ||
+			codedClass == null || filters == null ||
+			topic.isEmpty() || controllerId.isEmpty()) {
+			// TODO
+			throw new IllegalArgumentException("Invalid input");
+		}
+		
+		this.topic = topic;
+		this.controllerId = controllerId;
+		this.groupId = groupId;
+		this.artifactId = artifactId;
+		this.coders.add(new CoderFilters(codedClass, filters, modelClassLoaderHash));
+		this.customCoder = customCoder;
+	}
+	
+	/**
+	 * gets the coder + filters associated with this class name
+	 * 
+	 * @param classname class name
+	 * @return the decoder filters or null if not found
+	 */
+	public CoderFilters getCoder(String classname) {
+		for (CoderFilters decoder: this.coders) {
+			if (decoder.factClass.equals(classname)) {
+				return decoder;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * get all coder filters in use
+	 * 
+	 * @return coder filters
+	 */
+	public List<CoderFilters> getCoders() {
+		return this.coders;
+	}
+
+	/**
+	 * add coder or replace it exists
+	 * 
+	 * @param eventClass decoder
+	 * @param filter filter
+	 */
+	public void addCoder(String eventClass, JsonProtocolFilter filter, int modelClassLoaderHash) {
+		synchronized(this) {
+			for (CoderFilters coder: this.coders) {
+				if (coder.factClass.equals(eventClass)) {
+					// this is a better check than checking pointers, just
+					// in case classloader is different and this is just an update
+					coder.factClass = eventClass;
+					coder.filter = filter;
+					coder.modelClassLoaderHash = modelClassLoaderHash;
+					return;
+				}
+			}
+		}
+		
+		this.coders.add(new CoderFilters(eventClass, filter, modelClassLoaderHash));
+	}
+	
+	/**
+	 * remove coder
+	 * 
+	 * @param eventClass decoder
+	 * @param filter filter
+	 */
+	public void removeCoders(String eventClass) {
+		synchronized(this) {
+			Iterator<CoderFilters> codersIt = this.coders.iterator();
+			while (codersIt.hasNext()) {
+				CoderFilters coder = codersIt.next();
+				if (coder.factClass.equals(eventClass)) {
+					codersIt.remove();
+				}
+			}
+		}
+	}
+
+	/**
+	 * gets the topic
+	 * 
+	 * @return the topic
+	 */
+	public String getTopic() {return topic;}
+	
+	/**
+	 * gets the controller id
+	 * 
+	 * @return the controller id
+	 */
+	public String getControllerId() {return controllerId;}
+
+	/**
+	 * @return the groupId
+	 */
+	public String getGroupId() {
+		return groupId;
+	}
+
+	/**
+	 * @return the artifactId
+	 */
+	public String getArtifactId() {
+		return artifactId;
+	}
+
+	/**
+	 * @return the customCoder
+	 */
+	public CustomCoder getCustomCoder() {
+		return customCoder;
+	}
+
+	/**
+	 * @param customCoder the customCoder to set
+	 */
+	public void setCustomCoder(CustomCoder customCoder) {
+		this.customCoder = customCoder;
+	}
+
+	/**
+	 * performs filtering on a json string
+	 * 
+	 * @param json json string
+	 * @return the decoder that passes the filter, otherwise null
+	 * @throws UnsupportedOperationException can't filter
+	 * @throws IllegalArgumentException invalid input
+	 */
+	protected CoderFilters filter(String json) 
+			throws UnsupportedOperationException, IllegalArgumentException, IllegalStateException {
+		
+
+		// 1. Get list of decoding classes for this controller Id and topic
+		// 2. If there are no classes, return error
+		// 3. Otherwise, from the available classes for decoding, pick the first one that
+		//    passes the filters	
+		
+		// Don't parse if it is not necessary
+		
+		if (this.coders.isEmpty()) {
+			// TODO this is an error
+			throw new IllegalStateException("No coders available");
+		}
+		
+		if (this.coders.size() == 1) {
+			JsonProtocolFilter filter = this.coders.get(0).getFilter();
+			if (!filter.isRules()) {
+				return this.coders.get(0);
+			}
+		}
+		
+		JsonElement event;
+		try {
+			event = this.filteringParser.parse(json);
+		} catch (Exception e) {
+			throw new UnsupportedOperationException(e);
+		}
+		
+		for (CoderFilters decoder: this.coders) {
+			try {
+				boolean accepted = decoder.getFilter().accept(event);
+				if (accepted) {
+					return decoder;
+				} 
+			} catch (Exception e) {
+				logger.info("{}: unexpected failure accepting {} because of {}", 
+						    this, event, e.getMessage(), e);
+				// continue
+			}
+		}
+		
+		return null;
+	}
+
+	/**
+	 * Decode json into a POJO object
+	 * @param json json string
+	 * 
+	 * @return a POJO object for the json string
+	 * @throws IllegalArgumentException if an invalid parameter has been received
+	 * @throws UnsupportedOperationException if parsing into POJO is not possible
+	 */
+	public abstract Object decode(String json) 
+			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException;
+	
+	/**
+	 * Encodes a POJO object into a JSON String
+	 * 
+	 * @param event JSON POJO event to be converted to String
+	 * @return JSON string version of POJO object
+	 * @throws IllegalArgumentException if an invalid parameter has been received
+	 * @throws UnsupportedOperationException if parsing into POJO is not possible
+	 */
+	public abstract String encode(Object event) 
+			throws IllegalArgumentException, UnsupportedOperationException;
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("ProtocolCoderToolset [topic=").append(topic).append(", controllerId=").append(controllerId)
+				.append(", groupId=").append(groupId).append(", artifactId=").append(artifactId).append(", coders=")
+				.append(coders).append(", filteringParser=").append(filteringParser).append(", customCoder=")
+				.append(customCoder).append("]");
+		return builder.toString();
+	}
+}
+
+/**
+ * Tools used for encoding/decoding using Jackson
+ */
+class JacksonProtocolCoderToolset extends ProtocolCoderToolset {
+	private static Logger  logger = LoggerFactory.getLogger(JacksonProtocolCoderToolset.class);	
+	/**
+	 * decoder
+	 */
+	@JsonIgnore
+	protected final ObjectMapper decoder = new ObjectMapper();
+	
+	/**
+	 * encoder
+	 */
+	@JsonIgnore
+	protected final ObjectMapper encoder = new ObjectMapper();
+	
+	/**
+	 * Toolset to encode/decode tools associated with a topic
+	 * 
+	 * @param topic topic
+	 * @param decodedClass decoded class of an event
+	 * @param filter 
+	 */
+	public JacksonProtocolCoderToolset(String topic, String controllerId, 
+									   String groupId, String artifactId,
+			                           String decodedClass, 
+			                           JsonProtocolFilter filter,
+			                           CustomJacksonCoder customJacksonCoder,
+			                           int modelClassLoaderHash) {
+		super(topic, controllerId, groupId, artifactId, decodedClass, filter, customJacksonCoder, modelClassLoaderHash);
+		decoder.registerModule(new JavaTimeModule());
+		decoder.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
+				          false);
+	}
+	
+	/**
+	 * gets the Jackson decoder
+	 * 
+	 * @return the Jackson decoder
+	 */
+	@JsonIgnore
+	protected ObjectMapper getDecoder() {return decoder;}
+	
+	/**
+	 * gets the Jackson encoder
+	 * 
+	 * @return the Jackson encoder
+	 */
+	@JsonIgnore
+	protected ObjectMapper getEncoder() {return encoder;}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object decode(String json) 
+			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
+
+		// 0. Use custom coder if available
+		
+		if (this.customCoder != null) {
+			throw new UnsupportedOperationException
+					("Jackon Custom Decoder is not supported at this time");
+		}
+		
+		DroolsController droolsController = 
+				DroolsController.factory.get(groupId, artifactId, "");
+		if (droolsController == null) {
+			logger.warn("{}: no drools-controller to process {}", this, json);
+			throw new IllegalStateException("no drools-controller to process event");
+		}
+		
+		CoderFilters decoderFilter = filter(json);
+		if (decoderFilter == null) {
+			logger.debug("{}: no decoder to process {}", this, json);
+			throw new UnsupportedOperationException("no decoder to process event");
+		}
+		
+		Class<?> decoderClass;
+		try {
+			decoderClass = 
+					droolsController.fetchModelClass(decoderFilter.getCodedClass());
+			if (decoderClass ==  null) {
+				logger.warn("{}: cannot fetch application class {}", this, decoderFilter.getCodedClass());
+				throw new IllegalStateException("cannot fetch application class " +  decoderFilter.getCodedClass());				
+			}
+		} catch (Exception e) {
+			logger.warn("{}: cannot fetch application class {} because of {}", this, 
+					    decoderFilter.getCodedClass(), e.getMessage());
+			throw new UnsupportedOperationException("cannot fetch application class " +  decoderFilter.getCodedClass(), e);
+		}
+		
+
+		try {
+			Object fact = this.decoder.readValue(json, decoderClass);
+			return fact;
+		} catch (Exception e) {
+			logger.warn("{} cannot decode {} into {} because of {}",
+					    this, json, decoderClass.getName(), e.getMessage(), e);
+			throw new UnsupportedOperationException("cannont decode into " + decoderFilter.getCodedClass(), e);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String encode(Object event) 
+			throws IllegalArgumentException, UnsupportedOperationException {
+		
+		// 0. Use custom coder if available
+		
+		if (this.customCoder != null) {
+			throw new UnsupportedOperationException
+					("Jackon Custom Encoder is not supported at this time");
+		}
+		
+		try {
+			String encodedEvent = this.encoder.writeValueAsString(event);
+			return encodedEvent;			
+		} catch (JsonProcessingException e) {
+			logger.error("{} cannot encode {} because of {}", this, event, e.getMessage(), e);
+			throw new UnsupportedOperationException("event cannot be encoded");
+		}
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("JacksonProtocolCoderToolset [toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+
+}
+
+/**
+ * Tools used for encoding/decoding using Jackson
+ */
+class GsonProtocolCoderToolset extends ProtocolCoderToolset {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger  logger = LoggerFactory.getLogger(GsonProtocolCoderToolset.class);
+	
+	/**
+	 * Formatter for JSON encoding/decoding
+	 */
+	@JsonIgnore
+	public static DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
+	
+	@JsonIgnore
+	public static DateTimeFormatter zuluFormat = DateTimeFormatter.ISO_INSTANT;
+	
+	/**
+	 * Adapter for ZonedDateTime
+	 */
+
+	public static class GsonUTCAdapter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
+
+		public ZonedDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context)
+				throws JsonParseException {
+			try {
+				return ZonedDateTime.parse(element.getAsString(), format);
+			} catch (Exception e) {
+				logger.info("GsonUTCAdapter: cannot parse {} because of {}", 
+						    element, e.getMessage(), e);
+			}
+			return null;
+		}
+
+		public JsonElement serialize(ZonedDateTime datetime, Type type, JsonSerializationContext context) {
+			return new JsonPrimitive(datetime.format(format));
+		}	
+	}
+	
+	public static class GsonInstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
+
+		@Override
+		public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+				throws JsonParseException {
+			return Instant.ofEpochMilli(json.getAsLong());
+		}
+
+		@Override
+		public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
+			return new JsonPrimitive(src.toEpochMilli());
+		}
+		
+	}
+
+	
+	/**
+	 * decoder
+	 */
+	@JsonIgnore
+	protected final Gson decoder = new GsonBuilder().disableHtmlEscaping().
+													 registerTypeAdapter(ZonedDateTime.class, new GsonUTCAdapter()).
+													 create();
+	
+	/**
+	 * encoder
+	 */
+	@JsonIgnore
+	protected final Gson encoder = new GsonBuilder().disableHtmlEscaping().
+													 registerTypeAdapter(ZonedDateTime.class, new GsonUTCAdapter()).
+													 create();
+	
+	/**
+	 * Toolset to encode/decode tools associated with a topic
+	 * 
+	 * @param topic topic
+	 * @param decodedClass decoded class of an event
+	 * @param filter 
+	 */
+	public GsonProtocolCoderToolset(String topic, String controllerId, 
+					   				String groupId, String artifactId,
+					   				String decodedClass, 
+					   				JsonProtocolFilter filter,
+							        CustomGsonCoder customGsonCoder,
+							        int modelClassLoaderHash) {
+		super(topic, controllerId, groupId, artifactId, decodedClass, filter, customGsonCoder, modelClassLoaderHash);
+	}
+	
+	/**
+	 * gets the Gson decoder
+	 * 
+	 * @return the Gson decoder
+	 */
+	@JsonIgnore
+	protected Gson getDecoder() {return decoder;}
+	
+	/**
+	 * gets the Gson encoder
+	 * 
+	 * @return the Gson encoder
+	 */
+	@JsonIgnore
+	protected Gson getEncoder() {return encoder;}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object decode(String json) 
+			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
+	
+		DroolsController droolsController = 
+				DroolsController.factory.get(groupId, artifactId, "");
+		if (droolsController == null) {
+			logger.warn("{}: no drools-controller to process {}", this, json);
+			throw new IllegalStateException("no drools-controller to process event");
+		}
+		
+		CoderFilters decoderFilter = filter(json);
+		if (decoderFilter == null) {
+			logger.debug("{}: no decoder to process {}", this, json);
+			throw new UnsupportedOperationException("no decoder to process event");
+		}
+		
+		Class<?> decoderClass;
+		try {
+			decoderClass = 
+					droolsController.fetchModelClass(decoderFilter.getCodedClass());
+			if (decoderClass ==  null) {
+				logger.warn("{}: cannot fetch application class {}", this, decoderFilter.getCodedClass());
+				throw new IllegalStateException("cannot fetch application class " +  decoderFilter.getCodedClass());				
+			}
+		} catch (Exception e) {
+			logger.warn("{}: cannot fetch application class {} because of {}", this, 
+				    decoderFilter.getCodedClass(), e.getMessage());
+			throw new UnsupportedOperationException("cannot fetch application class " +  decoderFilter.getCodedClass(), e);
+		}
+		
+		if (this.customCoder != null) {
+			try {
+				Class<?> gsonClassContainer = 
+						droolsController.fetchModelClass(this.customCoder.getClassContainer());
+				Field gsonField = gsonClassContainer.getField(this.customCoder.staticCoderField);
+				Object gsonObject = gsonField.get(null);
+				Method fromJsonMethod = gsonObject.getClass().
+						                     getDeclaredMethod
+						                     	("fromJson", new Class[]{String.class, Class.class});
+				Object fact = fromJsonMethod.invoke(gsonObject, json, decoderClass);
+				return fact;
+			} catch (Exception e) {
+				logger.warn("{}: cannot fetch application class {} because of {}", this, 
+					        decoderFilter.getCodedClass(), e.getMessage());
+				throw new UnsupportedOperationException("cannot fetch application class " +  decoderFilter.getCodedClass(), e);
+			}			
+		} else {
+			try {
+				Object fact = this.decoder.fromJson(json, decoderClass);
+				return fact;
+			} catch (Exception e) {
+				logger.warn("{} cannot decode {} into {} because of {}",
+					    this, json, decoderClass.getName(), e.getMessage(), e);
+				throw new UnsupportedOperationException("cannont decode into " + decoderFilter.getCodedClass(), e);
+			}			
+		}
+	}
+
+
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String encode(Object event) 
+			throws IllegalArgumentException, UnsupportedOperationException {	
+		
+		DroolsController droolsController = 
+				DroolsController.factory.get(groupId, artifactId, null);
+		if (droolsController == null) {
+			logger.info("{}: no drools-controller to process {} (continue)", this, event);
+			throw new IllegalStateException("custom-coder but no drools-controller");
+		}
+		
+		if (this.customCoder != null) {
+			try {
+				Class<?> gsonClassContainer = 
+						droolsController.fetchModelClass(this.customCoder.getClassContainer());
+				Field gsonField = gsonClassContainer.getField(this.customCoder.staticCoderField);
+				Object gsonObject = gsonField.get(null);
+				Method toJsonMethod = gsonObject.getClass().
+						                     getDeclaredMethod
+						                     	("toJson", new Class[]{Object.class});
+				String encodedJson = (String) toJsonMethod.invoke(gsonObject, event);
+				return encodedJson;
+			} catch (Exception e) {
+				logger.warn("{} cannot custom-encode {} because of {}", this, event, e.getMessage(), e);
+				throw new UnsupportedOperationException("event cannot be encoded", e);
+			}			
+		} else {
+			try {
+				String encodedEvent = this.encoder.toJson(event);
+				return encodedEvent;			
+			} catch (Exception e) {
+				logger.warn("{} cannot encode {} because of {}", this, event, e.getMessage(), e);
+				throw new UnsupportedOperationException("event cannot be encoded", e);
+			}		
+		}
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("GsonProtocolCoderToolset [toString()=").append(super.toString()).append("]");
+		return builder.toString();
+	}
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
new file mode 100644
index 00000000..93737267
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
@@ -0,0 +1,309 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.coders;
+
+import java.util.List;
+
+public class TopicCoderFilterConfiguration {
+
+	/**
+	 * Custom coder, contains class and static field to access parser that the controller
+	 * desires to use instead of the framework provided parser
+	 */
+	public static abstract class CustomCoder {
+		protected String className;
+		protected String staticCoderField;
+		
+		/**
+		 * create custom coder from raw string in the following format
+		 * (typically embedded in a property file):
+		 * 
+		 * Note this is to support decoding/encoding of partial structures that are
+		 * only known by the model.
+		 * 
+		 * @param rawCustomCoder with format: <class-containing-custom-coder>,<static-coder-field>
+		 */
+		public CustomCoder(String rawCustomCoder) throws IllegalArgumentException {			
+			if (rawCustomCoder != null && !rawCustomCoder.isEmpty()) {
+				
+				this.className = rawCustomCoder.substring(0,rawCustomCoder.indexOf(","));
+				if (this.className == null || this.className.isEmpty()) {
+					throw new IllegalArgumentException("No classname to create CustomCoder cannot be created");
+				}
+				
+				this.staticCoderField = rawCustomCoder.substring(rawCustomCoder.indexOf(",")+1);
+				if (this.staticCoderField == null || this.staticCoderField.isEmpty()) {
+					throw new IllegalArgumentException
+						("No staticCoderField to create CustomCoder cannot be created for class " +
+						 className);
+				}
+
+			}
+		}
+		/**
+		 * @param classContainer
+		 * @param staticCoderField
+		 */
+		public CustomCoder(String className, String staticCoderField) throws IllegalArgumentException {
+			if (className == null || className.isEmpty()) {
+				throw new IllegalArgumentException("No classname to create CustomCoder cannot be created");
+			}
+			
+			if (staticCoderField == null || staticCoderField.isEmpty()) {
+				throw new IllegalArgumentException
+					("No staticCoderField to create CustomCoder cannot be created for class " +
+					 className);
+			}
+			
+			this.className = className;
+			this.staticCoderField = staticCoderField;
+		}
+
+		/**
+		 * @return the className
+		 */
+		public String getClassContainer() {
+			return className;
+		}
+
+		/**
+		 * @param className the className to set
+		 */
+		public void setClassContainer(String className) {
+			this.className = className;
+		}
+
+		/**
+		 * @return the staticCoderField
+		 */
+		public String getStaticCoderField() {
+			return staticCoderField;
+		}
+
+		/**
+		 * @param staticCoderField the staticGson to set
+		 */
+		public void setStaticCoderField(String staticCoderField) {
+			this.staticCoderField = staticCoderField;
+		}
+
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("CustomCoder [className=").append(className).append(", staticCoderField=")
+					.append(staticCoderField).append("]");
+			return builder.toString();
+		}
+	}
+	
+	public static class CustomGsonCoder extends CustomCoder {
+	
+		public CustomGsonCoder(String className, String staticCoderField) {
+				super(className, staticCoderField);
+		}
+
+		public CustomGsonCoder(String customGson) throws IllegalArgumentException {
+			super(customGson);
+		}
+
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("CustomGsonCoder [toString()=").append(super.toString()).append("]");
+			return builder.toString();
+		}
+
+	}
+	
+	public static class CustomJacksonCoder extends CustomCoder {
+		
+		public CustomJacksonCoder(String className, String staticCoderField) {
+				super(className, staticCoderField);
+		}
+		
+		public CustomJacksonCoder(String customJackson) throws IllegalArgumentException {
+			super(customJackson);
+		}
+		
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("CustomJacksonCoder [toString()=").append(super.toString()).append("]");
+			return builder.toString();
+		}
+
+	}
+
+	/**
+	 * Coder/Decoder class and Filter container.   The decoder class is potential,
+	 * in order to be operational needs to be fetched from an available
+	 * class loader.
+	 *
+	 */
+	public static class PotentialCoderFilter {
+
+		/**
+		 * decoder class (pending from being able to be fetched and found 
+		 * in some class loader)
+		 */
+		protected String codedClass;
+		
+		/**
+		 * filters to apply to the selection of the decodedClass;
+		 */
+		protected JsonProtocolFilter filter;
+		
+		/**
+		 * constructor
+		 * 
+		 * @param codedClass decoder class
+		 * @param filter filters to apply
+		 */
+		public PotentialCoderFilter(String codedClass, JsonProtocolFilter filter) {
+			this.codedClass = codedClass;
+			this.filter = filter;
+		}
+
+		/**
+		 * @return the decodedClass
+		 */
+		public String getCodedClass() {
+			return codedClass;
+		}
+
+		/**
+		 * @param decodedClass the decodedClass to set
+		 */
+		public void setCodedClass(String decodedClass) {
+			this.codedClass = decodedClass;
+		}
+
+		/**
+		 * @return the filter
+		 */
+		public JsonProtocolFilter getFilter() {
+			return filter;
+		}
+
+		/**
+		 * @param filter the filter to set
+		 */
+		public void setFilter(JsonProtocolFilter filter) {
+			this.filter = filter;
+		}
+
+		@Override
+		public String toString() {
+			StringBuilder builder = new StringBuilder();
+			builder.append("PotentialCoderFilter [codedClass=").append(codedClass).append(", filter=").append(filter)
+					.append("]");
+			return builder.toString();
+		}
+	}
+	
+	/**
+	 * the source topic
+	 */
+	protected final String topic;
+	
+	/**
+	 * List of decoder -> filters
+	 */
+	protected final List<PotentialCoderFilter> coderFilters;
+	
+	/**
+	 * custom gson coder that this controller prefers to use instead of the framework ones
+	 */
+	protected CustomGsonCoder customGsonCoder;
+	
+	/**
+	 * custom jackson coder that this controller prefers to use instead of the framework ones
+	 */
+	protected CustomJacksonCoder customJacksonCoder;
+
+	/**
+	 * Constructor 
+	 * 
+	 * @param decoderFilters list of decoders and associated filters
+	 * @param topic the topic
+	 */
+	public TopicCoderFilterConfiguration(String topic, List<PotentialCoderFilter> decoderFilters,
+                                         CustomGsonCoder customGsonCoder, 
+                                         CustomJacksonCoder customJacksonCoder) {
+		this.coderFilters = decoderFilters;
+		this.topic = topic;
+		this.customGsonCoder = customGsonCoder;
+		this.customJacksonCoder = customJacksonCoder;
+	}
+
+	/**
+	 * @return the topic
+	 */
+	public String getTopic() {
+		return topic;
+	}
+
+	/**
+	 * @return the decoderFilters
+	 */
+	public List<PotentialCoderFilter> getCoderFilters() {
+		return coderFilters;
+	}
+	
+	/**
+	 * @return the customGsonCoder
+	 */
+	public CustomGsonCoder getCustomGsonCoder() {
+		return customGsonCoder;
+	}
+
+	/**
+	 * @param customGsonCoder the customGsonCoder to set
+	 */
+	public void setCustomGsonCoder(CustomGsonCoder customGsonCoder) {
+		this.customGsonCoder = customGsonCoder;
+	}
+
+	/**
+	 * @return the customJacksonCoder
+	 */
+	public CustomJacksonCoder getCustomJacksonCoder() {
+		return customJacksonCoder;
+	}
+
+	/**
+	 * @param customJacksonCoder the customJacksonCoder to set
+	 */
+	public void setCustomJacksonCoder(CustomJacksonCoder customJacksonCoder) {
+		this.customJacksonCoder = customJacksonCoder;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("TopicCoderFilterConfiguration [topic=").append(topic).append(", coderFilters=")
+				.append(coderFilters).append(", customGsonCoder=").append(customGsonCoder)
+				.append(", customJacksonCoder=").append(customJacksonCoder).append("]");
+		return builder.toString();
+	}
+
+
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java
new file mode 100644
index 00000000..ded7a52c
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/ControllerConfiguration.java
@@ -0,0 +1,280 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * Drools Related Information
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ControllerConfiguration {
+
+	public static final String CONFIG_CONTROLLER_OPERATION_CREATE = "create";
+	public static final String CONFIG_CONTROLLER_OPERATION_UPDATE = "update";
+	public static final String CONFIG_CONTROLLER_OPERATION_LOCK = "lock";
+	public static final String CONFIG_CONTROLLER_OPERATION_UNLOCK = "unlock";
+	
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("name")
+    private String name;
+    /**
+     * Set of operations that can be applied to a controller: create, lock
+     * (Required)
+     * 
+     */
+    @JsonProperty("operation")
+    private String operation;
+    /**
+     * Maven Related Information
+     * 
+     */
+    @JsonProperty("drools")
+    private DroolsConfiguration drools;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    protected final static Object NOT_FOUND_VALUE = new Object();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public ControllerConfiguration() {
+    }
+
+    /**
+     * 
+     * @param name
+     * @param drools
+     * @param operation
+     */
+    public ControllerConfiguration(String name, String operation, DroolsConfiguration drools) {
+        this.name = name;
+        this.operation = operation;
+        this.drools = drools;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     * @return
+     *     The name
+     */
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     * @param name
+     *     The name
+     */
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ControllerConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Set of operations that can be applied to a controller: create, lock
+     * (Required)
+     * 
+     * @return
+     *     The operation
+     */
+    @JsonProperty("operation")
+    public String getOperation() {
+        return operation;
+    }
+
+    /**
+     * Set of operations that can be applied to a controller: create, lock
+     * (Required)
+     * 
+     * @param operation
+     *     The operation
+     */
+    @JsonProperty("operation")
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public ControllerConfiguration withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    /**
+     * Maven Related Information
+     * 
+     * @return
+     *     The drools
+     */
+    @JsonProperty("drools")
+    public DroolsConfiguration getDrools() {
+        return drools;
+    }
+
+    /**
+     * Maven Related Information
+     * 
+     * @param drools
+     *     The drools
+     */
+    @JsonProperty("drools")
+    public void setDrools(DroolsConfiguration drools) {
+        this.drools = drools;
+    }
+
+    public ControllerConfiguration withDrools(DroolsConfiguration drools) {
+        this.drools = drools;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public ControllerConfiguration withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+    protected boolean declaredProperty(String name, Object value) {
+        switch (name) {
+            case "name":
+                if (value instanceof String) {
+                    setName(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"name\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            case "operation":
+                if (value instanceof String) {
+                    setOperation(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"operation\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            case "drools":
+                if (value instanceof DroolsConfiguration) {
+                    setDrools(((DroolsConfiguration) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"drools\" is of type \"org.onap.policy.drools.protocol.configuration.Drools\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
+        switch (name) {
+            case "name":
+                return getName();
+            case "operation":
+                return getOperation();
+            case "drools":
+                return getDrools();
+            default:
+                return notFoundValue;
+        }
+    }
+
+    @SuppressWarnings({
+        "unchecked"
+    })
+    public<T >T get(String name) {
+        Object value = declaredPropertyOrNotFound(name, ControllerConfiguration.NOT_FOUND_VALUE);
+        if (ControllerConfiguration.NOT_FOUND_VALUE!= value) {
+            return ((T) value);
+        } else {
+            return ((T) getAdditionalProperties().get(name));
+        }
+    }
+
+    public void set(String name, Object value) {
+        if (!declaredProperty(name, value)) {
+            getAdditionalProperties().put(name, ((Object) value));
+        }
+    }
+
+    public ControllerConfiguration with(String name, Object value) {
+        if (!declaredProperty(name, value)) {
+            getAdditionalProperties().put(name, ((Object) value));
+        }
+        return this;
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(name).append(operation).append(drools).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof ControllerConfiguration) == false) {
+            return false;
+        }
+        ControllerConfiguration rhs = ((ControllerConfiguration) other);
+        return new EqualsBuilder().append(name, rhs.name).append(operation, rhs.operation).append(drools, rhs.drools).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java
new file mode 100644
index 00000000..5f32d7a4
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/DroolsConfiguration.java
@@ -0,0 +1,278 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * Maven Related Information
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DroolsConfiguration {
+
+    /**
+     * Maven Artifact ID
+     * (Required)
+     * 
+     */
+    @JsonProperty("artifactId")
+    private String artifactId;
+    /**
+     * Maven Group ID
+     * (Required)
+     * 
+     */
+    @JsonProperty("groupId")
+    private String groupId;
+    /**
+     * Maven Version
+     * (Required)
+     * 
+     */
+    @JsonProperty("version")
+    private String version;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    protected final static Object NOT_FOUND_VALUE = new Object();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public DroolsConfiguration() {
+    }
+
+    /**
+     * 
+     * @param groupId
+     * @param artifactId
+     * @param version
+     */
+    public DroolsConfiguration(String artifactId, String groupId, String version) {
+        this.artifactId = artifactId;
+        this.groupId = groupId;
+        this.version = version;
+    }
+
+    /**
+     * Maven Artifact ID
+     * (Required)
+     * 
+     * @return
+     *     The artifactId
+     */
+    @JsonProperty("artifactId")
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    /**
+     * Maven Artifact ID
+     * (Required)
+     * 
+     * @param artifactId
+     *     The artifactId
+     */
+    @JsonProperty("artifactId")
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    public DroolsConfiguration withArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+        return this;
+    }
+
+    /**
+     * Maven Group ID
+     * (Required)
+     * 
+     * @return
+     *     The groupId
+     */
+    @JsonProperty("groupId")
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * Maven Group ID
+     * (Required)
+     * 
+     * @param groupId
+     *     The groupId
+     */
+    @JsonProperty("groupId")
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public DroolsConfiguration withGroupId(String groupId) {
+        this.groupId = groupId;
+        return this;
+    }
+
+    /**
+     * Maven Version
+     * (Required)
+     * 
+     * @return
+     *     The version
+     */
+    @JsonProperty("version")
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Maven Version
+     * (Required)
+     * 
+     * @param version
+     *     The version
+     */
+    @JsonProperty("version")
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public DroolsConfiguration withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public DroolsConfiguration withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+    protected boolean declaredProperty(String name, Object value) {
+        switch (name) {
+            case "artifactId":
+                if (value instanceof String) {
+                    setArtifactId(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"artifactId\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            case "groupId":
+                if (value instanceof String) {
+                    setGroupId(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"groupId\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            case "version":
+                if (value instanceof String) {
+                    setVersion(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"version\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
+        switch (name) {
+            case "artifactId":
+                return getArtifactId();
+            case "groupId":
+                return getGroupId();
+            case "version":
+                return getVersion();
+            default:
+                return notFoundValue;
+        }
+    }
+
+    @SuppressWarnings({
+        "unchecked"
+    })
+    public<T >T get(String name) {
+        Object value = declaredPropertyOrNotFound(name, DroolsConfiguration.NOT_FOUND_VALUE);
+        if (DroolsConfiguration.NOT_FOUND_VALUE!= value) {
+            return ((T) value);
+        } else {
+            return ((T) getAdditionalProperties().get(name));
+        }
+    }
+
+    public void set(String name, Object value) {
+        if (!declaredProperty(name, value)) {
+            getAdditionalProperties().put(name, ((Object) value));
+        }
+    }
+
+    public DroolsConfiguration with(String name, Object value) {
+        if (!declaredProperty(name, value)) {
+            getAdditionalProperties().put(name, ((Object) value));
+        }
+        return this;
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(artifactId).append(groupId).append(version).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof DroolsConfiguration) == false) {
+            return false;
+        }
+        DroolsConfiguration rhs = ((DroolsConfiguration) other);
+        return new EqualsBuilder().append(artifactId, rhs.artifactId).append(groupId, rhs.groupId).append(version, rhs.version).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
new file mode 100644
index 00000000..d7295fd4
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
@@ -0,0 +1,283 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.protocol.configuration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+
+/**
+ * ENGINE-CONFIGURATION
+ * <p>
+ * 
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PdpdConfiguration {
+	
+	/**
+	 * Controller Entity ID
+	 */
+	public static final String CONFIG_ENTITY_CONTROLLER = "controller";
+
+    /**
+     * Unique Transaction ID.   This is an UUID.
+     * (Required)
+     * 
+     */
+    @JsonProperty("requestID")
+    private String requestID;
+    /**
+     * Set of entities on which configuration can be performed: controller
+     * (Required)
+     * 
+     */
+    @JsonProperty("entity")
+    private String entity;
+    /**
+     * Controller Information, only applicable when the entity is set to controller
+     * 
+     */
+    @JsonProperty("controllers")
+    private List<ControllerConfiguration> controllers = new ArrayList<ControllerConfiguration>();
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    protected final static Object NOT_FOUND_VALUE = new Object();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public PdpdConfiguration() {
+    }
+
+    /**
+     * 
+     * @param controller
+     * @param requestID
+     * @param entity
+     */
+    public PdpdConfiguration(String requestID, String entity, List<ControllerConfiguration> controllers) {
+        this.requestID = requestID;
+        this.entity = entity;
+        this.controllers = controllers;
+    }
+
+    /**
+     * Unique Transaction ID.   This is an UUID.
+     * (Required)
+     * 
+     * @return
+     *     The requestID
+     */
+    @JsonProperty("requestID")
+    public String getRequestID() {
+        return requestID;
+    }
+
+    /**
+     * Unique Transaction ID.   This is an UUID.
+     * (Required)
+     * 
+     * @param requestID
+     *     The requestID
+     */
+    @JsonProperty("requestID")
+    public void setRequestID(String requestID) {
+        this.requestID = requestID;
+    }
+
+    public PdpdConfiguration withRequestID(String requestID) {
+        this.requestID = requestID;
+        return this;
+    }
+
+    /**
+     * Set of entities on which configuration can be performed: controller
+     * (Required)
+     * 
+     * @return
+     *     The entity
+     */
+    @JsonProperty("entity")
+    public String getEntity() {
+        return entity;
+    }
+
+    /**
+     * Set of entities on which configuration can be performed: controller
+     * (Required)
+     * 
+     * @param entity
+     *     The entity
+     */
+    @JsonProperty("entity")
+    public void setEntity(String entity) {
+        this.entity = entity;
+    }
+
+    public PdpdConfiguration withEntity(String entity) {
+        this.entity = entity;
+        return this;
+    }
+
+    /**
+     * Controller Information, only applicable when the entity is set to controller
+     * 
+     * @return
+     *     The controller
+     */
+    @JsonProperty("controller")
+    public List<ControllerConfiguration> getControllers() {
+        return controllers;
+    }
+
+    /**
+     * Controller Information, only applicable when the entity is set to controller
+     * 
+     * @param controller
+     *     The controller
+     */
+    @JsonProperty("controller")
+    public void setControllers(List<ControllerConfiguration> controllers) {
+        this.controllers = controllers;
+    }
+
+    public PdpdConfiguration withController(List<ControllerConfiguration> controllers) {
+        this.controllers = controllers;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public PdpdConfiguration withAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+	protected boolean declaredProperty(String name, Object value) {
+        switch (name) {
+            case "requestID":
+                if (value instanceof String) {
+                    setRequestID(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"requestID\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            case "entity":
+                if (value instanceof String) {
+                    setEntity(((String) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"entity\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            case "controllers":
+                if (value instanceof List) {
+                    setControllers(((List<ControllerConfiguration> ) value));
+                } else {
+                    throw new IllegalArgumentException(("property \"controllers\" is of type \"java.util.List<org.onap.policy.drools.protocol.configuration.Controller>\", but got "+ value.getClass().toString()));
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
+        switch (name) {
+            case "requestID":
+                return getRequestID();
+            case "entity":
+                return getEntity();
+            case "controllers":
+                return getControllers();
+            default:
+                return notFoundValue;
+        }
+    }
+
+    @SuppressWarnings({
+        "unchecked"
+    })
+    public<T >T get(String name) {
+        Object value = declaredPropertyOrNotFound(name, PdpdConfiguration.NOT_FOUND_VALUE);
+        if (PdpdConfiguration.NOT_FOUND_VALUE!= value) {
+            return ((T) value);
+        } else {
+            return ((T) getAdditionalProperties().get(name));
+        }
+    }
+
+    public void set(String name, Object value) {
+        if (!declaredProperty(name, value)) {
+            getAdditionalProperties().put(name, ((Object) value));
+        }
+    }
+
+    public PdpdConfiguration with(String name, Object value) {
+        if (!declaredProperty(name, value)) {
+            getAdditionalProperties().put(name, ((Object) value));
+        }
+        return this;
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(requestID).append(entity).append(controllers).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof PdpdConfiguration) == false) {
+            return false;
+        }
+        PdpdConfiguration rhs = ((PdpdConfiguration) other);
+        return new EqualsBuilder().append(requestID, rhs.requestID).append(entity, rhs.entity).append(controllers, rhs.controllers).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java
new file mode 100644
index 00000000..4f5e33e7
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java
@@ -0,0 +1,2335 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.server.restful;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSink;
+import org.onap.policy.drools.event.comm.bus.DmaapTopicSource;
+import org.onap.policy.drools.event.comm.bus.UebTopicSink;
+import org.onap.policy.drools.event.comm.bus.UebTopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
+import org.onap.policy.drools.protocol.coders.JsonProtocolFilter.FilterRule;
+import org.onap.policy.drools.protocol.coders.ProtocolCoderToolset;
+import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;
+import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.LoggerContext;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
+
+
+/**
+ * Telemetry JAX-RS Interface to the PDP-D
+ */
+
+@Path("/policy/pdp")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Api
+@SwaggerDefinition(
+    info = @Info(
+        description = "PDP-D Telemetry Services",
+        version = "v1.0",
+        title = "PDP-D Telemetry"
+    ),
+    consumes = {MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN},
+    produces = {MediaType.APPLICATION_JSON},
+    schemes = {SwaggerDefinition.Scheme.HTTP},
+    tags = {
+        @Tag(name = "pdp-d-telemetry", description = "Drools PDP Telemetry Operations")
+    }
+)
+public class RestManager {
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(RestManager.class);  
+	
+    @GET
+    @Path("engine")
+    @ApiOperation(
+    	value="Retrieves the Engine Operational Status", 
+    	notes="Top-level abstraction.  Provides a global view of resources",
+    	response=PolicyEngine.class
+    )
+    public Response engine() {    	
+    	return Response.status(Response.Status.OK).entity(PolicyEngine.manager).build();
+    }
+    
+    @DELETE
+    @Path("engine")
+    @ApiOperation(
+        	value="Shuts down the Engine", 
+        	notes="Deleting the engine, the top-level abstraction, equivalenty shuts it down",
+        	response=PolicyEngine.class
+    )
+    public Response engineShutdown() { 
+    	try {
+			PolicyEngine.manager.shutdown();
+		} catch (IllegalStateException e) {
+			logger.error("{}: cannot shutdown {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
+    		return Response.status(Response.Status.BAD_REQUEST).
+			        entity(PolicyEngine.manager).
+			        build();
+		}
+    	
+		return Response.status(Response.Status.OK).
+		                entity(PolicyEngine.manager).
+		                build();
+    }
+    
+    @GET
+    @Path("engine/features")
+    @ApiOperation(
+        	value="Engine Features", 
+        	notes="Provides the list of loaded features using the PolicyEngineFeatureAPI",
+        	responseContainer="List"
+    )
+    public Response engineFeatures() {
+        return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getFeatures()).build();
+    }
+    
+    @GET
+    @Path("engine/features/inventory")
+    @ApiOperation(
+        	value="Engine Detailed Feature Inventory", 
+        	notes="Provides detailed list of loaded features using the PolicyEngineFeatureAPI",
+        	responseContainer="List",
+        	response=PolicyEngineFeatureAPI.class
+    )
+    public Response engineFeaturesInventory() {
+        return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getFeatureProviders()).build();
+    } 
+    
+    @GET
+    @Path("engine/features/{featureName}")
+    @ApiOperation(
+        	value="Engine Feature", 
+        	notes="Provides Details for a given feature Engine Provider",
+        	response=PolicyEngineFeatureAPI.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message = "The feature cannot be found")
+    })
+    public Response engineFeature(@ApiParam(value="Feature Name", required=true)  
+                                  @PathParam("featureName") String featureName) {
+    	try {
+	    	return Response.status(Response.Status.OK).
+			        entity(PolicyEngine.manager.getFeatureProvider(featureName)).build();
+    	} catch(IllegalArgumentException iae) {
+    		return Response.status(Response.Status.NOT_FOUND).
+                    entity(new Error(iae.getMessage())).build();
+    	}
+    }
+    
+    @GET
+    @Path("engine/inputs")
+    @ApiOperation(
+        	value="Engine Input Ports", 
+        	notes="List of input ports",
+        	responseContainer="List"
+    )
+    public Response engineInputs() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Inputs.values())).
+                        build();
+    }
+    
+    @POST
+    @Path("engine/inputs/configuration")
+    @ApiOperation(
+        	value="Engine Input Configuration Requests", 
+        	notes="Feeds a configuration request input into the Engine"
+    )
+    @ApiResponses(value={
+    	@ApiResponse(code=406, message = "The configuration request cannot be honored") 
+    })
+    public Response engineUpdate(
+    		@ApiParam(value="Configuration to apply", required=true) PdpdConfiguration configuration) {
+    	PolicyController controller = null;
+    	boolean success = true;
+		try {
+			success = PolicyEngine.manager.configure(configuration);
+		} catch (Exception e) {
+			success = false;
+			logger.info("{}: cannot configure {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
+		}
+    	
+		if (!success)
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                    entity(new Error("cannot perform operation")).build();
+		else
+			return Response.status(Response.Status.OK).entity(controller).build();
+    }
+    
+    @GET
+    @Path("engine/properties")
+    @ApiOperation(
+        	value="Engine Configuration Properties", 
+        	notes="Used for booststrapping the engine",
+        	response=Properties.class
+    )
+    public Response engineProperties() {
+        return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getProperties()).build();
+    }
+    
+    @GET
+    @Path("engine/switches")
+    @ApiOperation(
+        	value="Engine Control Switches", 
+        	notes="List of the Engine Control Switches",
+        	responseContainer="List"
+    )
+    public Response engineSwitches() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Switches.values())).
+                        build();
+    }
+    
+    @PUT
+    @Path("engine/switches/activation")
+    @ApiOperation(
+        	value="Switches on the Engine Activation Switch", 
+        	notes="Turns on Activation Switch on the Engine. This order entails that the engine " +
+        	      "and controllers are unlocked and started",
+        	response=PolicyEngine.class
+    )
+    public Response engineActivation() {
+    	boolean success = true;
+		try {
+			PolicyEngine.manager.activate();
+		} catch (Exception e) {
+			success = false;
+			logger.info("{}: cannot activate {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
+		}
+    	
+		if (!success)
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                    entity(new Error("cannot perform operation")).build();
+		else
+			return Response.status(Response.Status.OK).entity(PolicyEngine.manager).build();
+    }
+    
+    @DELETE
+    @Path("engine/switches/activation")
+    @ApiOperation(
+        	value="Switches off Engine Activation Switch", 
+        	notes="Turns off the Activation Switch on the Engine. This order entails that the engine " +
+        	      "and controllers are locked (with the exception of those resources defined as unmanaged)",
+        	response=PolicyEngine.class
+    )
+    public Response engineDeactivation() {
+    	boolean success = true;
+		try {
+			PolicyEngine.manager.deactivate();
+		} catch (Exception e) {
+			success = false;
+			logger.info("{}: cannot deactivate {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
+		}
+    	
+		if (!success)
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                    entity(new Error("cannot perform operation")).build();
+		else
+			return Response.status(Response.Status.OK).entity(PolicyEngine.manager).build();
+    }  
+    
+    @PUT
+    @Path("engine/switches/lock")
+    @ApiOperation(
+        	value="Switches on the Engine Lock Control", 
+        	notes="This switch locks all the engine resources as a whole, except those that are defined unmanaged",
+          	response=PolicyEngine.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response engineLock() {
+    	boolean success = PolicyEngine.manager.lock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(PolicyEngine.manager).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("cannot perform operation")).
+    				        build();
+    }
+    
+    @DELETE
+    @Path("engine/switches/lock")
+    @ApiOperation(
+        	value="Switches off the Lock control", 
+        	notes="This switch locks all the engine resources as a whole, except those that are defined unmanaged",
+          	response=PolicyEngine.class
+    )  
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response engineUnlock() {
+    	boolean success = PolicyEngine.manager.unlock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(PolicyEngine.manager).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("cannot perform operation")).
+    				        build();
+    }
+    
+    @GET
+    @Path("engine/controllers")
+    @ApiOperation(
+        	value="Lists the Policy Controllers Names", 
+        	notes="Unique Policy Controller Identifiers",
+        	responseContainer="List"
+    )
+    public Response controllers() {
+		return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getPolicyControllerIds()).build();
+    }
+    
+    @GET
+    @Path("engine/controllers/inventory")
+    @ApiOperation(
+        	value="Lists the Policy Controllers", 
+        	notes="Detailed list of Policy Controllers",
+        	responseContainer="List",
+        	response=PolicyController.class
+    )
+    public Response controllerInventory() {
+		return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getPolicyControllers()).build();
+    }
+    
+    @POST
+    @Path("engine/controllers")
+    @ApiOperation(
+        	value="Creates and starts a new Policy Controller", 
+        	notes="Controller creation based on properties",
+          	response=PolicyController.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=400, message = "Invalid configuration information has been provided"),
+        @ApiResponse(code=304, message = "The controller already exists"),
+        @ApiResponse(code=406, message = "The administrative state of the system prevents it " +
+                                         "from processing this request"),
+        @ApiResponse(code=206, message = "The controller has been created " +
+                                          "but cannot be started"),
+        @ApiResponse(code=201, message = "The controller has been succesfully created and started")
+    })
+    public Response controllerAdd(@ApiParam(value="Configuration Properties to apply", required = true) 
+                                  Properties config) {
+    	if (config == null)
+    		return Response.status(Response.Status.BAD_REQUEST).
+    				        entity(new Error("A configuration must be provided")).
+    				        build();
+    	
+    	String controllerName = config.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME);
+    	if (controllerName == null || controllerName.isEmpty())
+    		return Response.status(Response.Status.BAD_REQUEST).
+    				        entity(new Error
+    				        			("Configuration must have an entry for " + 
+    				                     PolicyProperties.PROPERTY_CONTROLLER_NAME)).
+    				        build();
+    	
+    	PolicyController controller;
+		try {
+			controller = PolicyController.factory.get(controllerName);
+			if (controller != null)
+				return Response.status(Response.Status.NOT_MODIFIED).
+						        entity(controller).
+						        build();
+		} catch (IllegalArgumentException e) {
+			// This is OK
+		} catch (IllegalStateException e) {
+			logger.info("{}: cannot get policy-controller because of {}", this, e.getMessage(), e);
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not found")).build();
+		}
+    	
+    	try {
+			controller = PolicyEngine.manager.createPolicyController
+					(config.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME), config);
+		} catch (IllegalArgumentException | IllegalStateException e) {
+			logger.warn("{}: cannot create policy-controller because of {}", this, e.getMessage(), e);
+    		return Response.status(Response.Status.BAD_REQUEST).
+							        entity(new Error(e.getMessage())).
+							        build();
+		}
+    	
+    	try {
+			boolean success = controller.start();
+			if (!success) {
+				logger.info("{}: cannot start {}", this, controller);
+				return Response.status(Response.Status.PARTIAL_CONTENT).
+                                       entity(new Error(controllerName + " can't be started")).build();
+			}
+		} catch (IllegalStateException e) {
+			logger.info("{}: cannot start {} because of {}", this, controller, e.getMessage(), e);;
+			return Response.status(Response.Status.PARTIAL_CONTENT).
+                                   entity(controller).build();
+		}
+    	
+		return Response.status(Response.Status.CREATED).
+                entity(controller).
+                build();
+    }  
+    
+    @GET
+    @Path("engine/controllers/features")
+    @ApiOperation(
+        	value="Lists of Feature Providers Identifiers", 
+        	notes="Unique Policy Controller Identifiers",
+        	responseContainer="List"
+    )
+    public Response controllerFeatures() {
+		return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getFeatures()).build();
+    }
+    
+    @GET
+    @Path("engine/controllers/features/inventory")
+    @ApiOperation(
+        	value="Detailed Controllers Feature Inventory", 
+        	notes="Provides detailed list of loaded features using the PolicyControllerFeatureAPI",
+        	responseContainer="List",
+        	response=PolicyControllerFeatureAPI.class
+    )    
+    public Response controllerFeaturesInventory() {
+		return Response.status(Response.Status.OK).
+				        entity(PolicyController.factory.getFeatureProviders()).
+                        build();
+    }
+    
+    @GET
+    @Path("engine/controllers/features/{featureName}")
+    @ApiOperation(
+        	value="Controller Feature", 
+        	notes="Provides Details for a given Policy Controller feature provider",
+        	response=PolicyControllerFeatureAPI.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message = "The feature cannot be found")
+    })    
+    public Response controllerFeature(@ApiParam(value="Feature Name", required=true) 
+                                      @PathParam("featureName") String featureName) {
+    	try {
+	    	return Response.status(Response.Status.OK).
+			                entity(PolicyController.factory.getFeatureProvider(featureName)).
+			                build();
+    	} catch(IllegalArgumentException iae) {
+    		return Response.status(Response.Status.NOT_FOUND).
+                    entity(new Error(iae.getMessage())).build();
+    	}
+    }
+
+    @GET
+    @Path("engine/controllers/{controller}")
+    @ApiOperation(
+        	value="Retrieves a Policy Controller", 
+        	notes="A Policy Controller is a concrete drools application abstraction.  " +
+        	      "It aggregates networking, drools, and other resources," + 
+        	      "as provides operational controls over drools applications",
+        	response=PolicyController.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                                 "this request to be fulfilled")
+    }) 
+    public Response controller(@ApiParam(value="Policy Controller Name", required=true) 
+                               @PathParam("controller") String controllerName) {
+		try {
+    		return Response.status(Response.Status.OK).
+    				        entity(PolicyController.factory.get(controllerName)).
+    				        build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @DELETE
+    @Path("engine/controllers/{controller}")
+    @ApiOperation(
+        	value="Deletes a Policy Controller", 
+        	notes="A Policy Controller is a concrete drools application abstraction.  " +
+          	      "It aggregates networking, drools, and other resources," + 
+          	      "as provides operational controls over drools applications",
+          	response=PolicyController.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                                "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A problem has occurred while deleting the Policy Controller")
+    }) 
+    public Response controllerDelete(@ApiParam(value="Policy Controller Name", required=true) 
+                                     @PathParam("controller") String controllerName) {
+    	
+    	PolicyController controller;
+    	try {
+	    	controller =
+	    			PolicyController.factory.get(controllerName);
+	    	if (controller == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+	    				        entity(new Error(controllerName + "  does not exist")).
+	    				        build();
+		} catch (IllegalArgumentException e) {
+			logger.info("{}: cannot get policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
+			return Response.status(Response.Status.BAD_REQUEST).
+							        entity(new Error(controllerName +  " not found: " + e.getMessage())).
+							        build();
+		} catch (IllegalStateException e) {
+			logger.info("{}: cannot get policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                                   entity(new Error(controllerName + " not acceptable")).build();
+		}
+    	
+    	try {
+			PolicyEngine.manager.removePolicyController(controllerName);
+		} catch (IllegalArgumentException | IllegalStateException e) {
+			logger.info("{}: cannot remove policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
+    		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+							       entity(new Error(e.getMessage())).
+							       build();
+		}
+    	
+		return Response.status(Response.Status.OK).
+                entity(controller).
+                build();
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/properties")
+    @ApiOperation(
+        	value="Retrieves the configuration properties of a Policy Controller", 
+        	notes="Configuration resources used by the controller if Properties format",
+        	response=PolicyController.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    }) 
+    public Response controllerProperties(@ApiParam(value="Policy Controller Name", required=true) 
+                                         @PathParam("controller") String controllerName) {
+		try {
+			PolicyController controller = PolicyController.factory.get(controllerName);
+    		return Response.status(Response.Status.OK).
+    				        entity(controller.getProperties()).
+    				        build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/inputs")
+    @ApiOperation(
+        	value="Policy Controller Input Ports", 
+        	notes="List of input ports",
+        	responseContainer="List"
+    )
+    public Response controllerInputs() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Inputs.values())).
+                        build();
+    }
+    
+    @POST
+    @Path("engine/controllers/{controller}/inputs/configuration")
+    @ApiOperation(
+        	value="Policy Controller Input Configuration Requests", 
+        	notes="Feeds a configuration request input into the given Policy Controller"
+    )
+    @ApiResponses(value={
+    	@ApiResponse(code=400, message = "The configuration request is invalid"),
+    	@ApiResponse(code=406, message = "The configuration request cannot be honored") 
+    })
+    public Response controllerUpdate(@ApiParam(value="Policy Controller Name", required=true) 
+                                     @PathParam("controller") String controllerName,
+                                     @ApiParam(value="Configuration to apply", required=true)
+    		                         ControllerConfiguration controllerConfiguration) {
+    	
+    	if (controllerName == null || controllerName.isEmpty() || 
+    	    controllerConfiguration == null || 
+    	    controllerConfiguration.getName().intern() != controllerName)
+    		return Response.status(Response.Status.BAD_REQUEST).
+    				        entity("A valid or matching controller names must be provided").
+    				        build();
+    	
+    	PolicyController controller;
+    	try {
+    		controller = PolicyEngine.manager.updatePolicyController(controllerConfiguration);
+	    	if (controller == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+	    				        entity(new Error(controllerName + "  does not exist")).
+	    				        build();
+		} catch (IllegalArgumentException e) {
+			logger.info("{}: cannot update policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
+			return Response.status(Response.Status.BAD_REQUEST).
+							        entity(new Error(controllerName +  " not found: " + e.getMessage())).
+							        build();
+		} catch (Exception e) {
+			logger.info("{}: cannot update policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                                   entity(new Error(controllerName + " not acceptable")).build();
+		}
+    	
+		return Response.status(Response.Status.OK).
+                entity(controller).
+                build();
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/switches")
+    @ApiOperation(
+        	value="Policy Controller Switches", 
+        	notes="List of the Policy Controller Switches",
+        	responseContainer="List"
+    )
+    public Response controllerSwitches() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Switches.values())).
+                        build();
+    }
+    
+    @PUT
+    @Path("engine/controllers/{controller}/switches/lock")
+    @ApiOperation(
+        	value="Switches on the Policy Controller Lock Control", 
+        	notes="This action on the switch locks the Policy Controller",
+          	response=PolicyController.class
+    )   
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response controllerLock(@ApiParam(value="Policy Controller Name", required=true) 
+                                   @PathParam("controller") String controllerName) {
+    	PolicyController policyController = PolicyController.factory.get(controllerName);
+    	boolean success = policyController.lock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(policyController).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("Controller " + controllerName + " cannot be locked")).
+    				        build();
+    }  
+    
+    @DELETE
+    @Path("engine/controllers/{controller}/switches/lock")
+    @ApiOperation(
+        	value="Switches off the Policy Controller Lock Control", 
+        	notes="This action on the switch unlocks the Policy Controller",
+          	response=PolicyController.class
+    ) 
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response controllerUnlock(@ApiParam(value="Policy Controller Name", required=true) 
+                                     @PathParam("controller") String controllerName) {
+    	PolicyController policyController = PolicyController.factory.get(controllerName);
+    	boolean success = policyController.unlock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(policyController).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("Controller " + controllerName + " cannot be unlocked")).
+    				        build();
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/drools")
+    @ApiOperation(
+        	value="Retrieves the Drools Controller subcomponent of the Policy Controller", 
+        	notes="The Drools Controller provides an abstraction over the Drools subsystem",
+        	response=DroolsController.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    }) 
+    public Response drools(@ApiParam(value="Policy Controller Name", required=true) 
+                           @PathParam("controller") String controllerName) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);			
+			return Response.status(Response.Status.OK).
+	                               entity(drools).
+	                               build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/drools/facts")
+    @ApiOperation(
+        	value="Retrieves Facts Summary information for a given controller", 
+        	notes="Provides the session names, and a count of fact object in the drools working memory",
+        	responseContainer="Map"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response droolsFacts(@ApiParam(value="Policy Controller Name", required=true) 
+                                @PathParam("controller") String controllerName) {
+		try {
+			Map<String,Long> sessionCounts = new HashMap<>(); 
+			DroolsController drools = getDroolsController(controllerName);
+			for (String session : drools.getSessionNames()) {
+				sessionCounts.put(session, drools.factCount(session));
+			}
+			return Response.status(Response.Status.OK).
+	                               entity(sessionCounts).
+	                               build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/drools/facts/{session}")
+    @ApiOperation(
+        	value="Retrieves Fact Types (classnames) for a given controller and its count", 
+        	notes="The fact types are the classnames of the objects inserted in the drools working memory",
+        	responseContainer="Map"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller or session cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response droolsFacts(@ApiParam(value="Policy Controller Name", required=true)
+                                @PathParam("controller") String controllerName,
+                                @ApiParam(value="Drools Session Name", required=true)
+    		                    @PathParam("session") String sessionName) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			return Response.status(Response.Status.OK).
+	                               entity(drools.factClassNames(sessionName)).
+	                               build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error("entity not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + sessionName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/drools/facts/{session}/{factType}")
+    @ApiOperation(
+        	value="Retrieves fact objects of a given type in the drools working memory" +
+                  "for a given controller and session", 
+            notes="The fact types are the classnames of the objects inserted in the drools working memory",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller, session, or fact type cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response droolsFacts(@ApiParam(value="Fact count", required=false)
+                                @DefaultValue("false") @QueryParam("count") boolean count,
+                                @ApiParam(value="Policy Controller Name", required=true)
+    		                    @PathParam("controller") String controllerName,
+                                @ApiParam(value="Drools Session Name", required=true)
+    		                    @PathParam("session") String sessionName,
+                                @ApiParam(value="Drools Fact Type", required=true)
+    		                    @PathParam("factType") String factType) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<Object> facts = drools.facts(sessionName, factType, false);
+			if (!count)
+				return Response.status(Response.Status.OK).entity(facts).build();
+			else
+				return Response.status(Response.Status.OK).entity(facts.size()).build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
+                            		         " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
+                            		         " not acceptable")).
+                            build();
+		}
+    }
+    
+    @DELETE
+    @Path("engine/controllers/{controller}/drools/facts/{session}/{factType}")
+    @ApiOperation(
+        	value="Deletes all the fact objects of a given type from the drools working memory" +
+                  "for a given controller and session.   The objects retracted from the working " +
+        		  "memory are provided in the response.", 
+            notes="The fact types are the classnames of the objects inserted in the drools working memory",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller, session, or fact type, cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A server error has occurred processing this request")
+    })
+    public Response droolsFactsDelete(@ApiParam(value="Policy Controller Name", required=true)
+								      @PathParam("controller") String controllerName,
+								      @ApiParam(value="Drools Session Name", required=true)
+								      @PathParam("session") String sessionName,
+								      @ApiParam(value="Drools Fact Type", required=true)
+								      @PathParam("factType") String factType) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<Object> facts = drools.facts(sessionName, factType, true);
+			return Response.status(Response.Status.OK).entity(facts).build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
+                            		         " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
+                            		         " not acceptable")).
+                            build();
+		} catch (Exception e) {
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+		                    entity(new Error(e.getMessage())).
+		                    build();			
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/drools/facts/{session}/{query}/{queriedEntity}")
+    @ApiOperation(
+        	value="Gets all the fact objects returned by a DRL query with no parameters from the drools working memory" +
+                  "for a given controller and session", 
+            notes="The DRL query must be defined in the DRL file",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller, session, or query information, cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A server error has occurred processing this request")
+    })
+    public Response droolsFacts(@ApiParam(value="Fact count", required=false)
+                                @DefaultValue("false") @QueryParam("count") boolean count,
+                                @ApiParam(value="Policy Controller Name", required=true)
+                                @PathParam("controller") String controllerName,
+                                @ApiParam(value="Drools Session Name", required=true)
+                                @PathParam("session") String sessionName,
+                                @ApiParam(value="Query Name Present in DRL", required=true)
+                                @PathParam("query") String queryName,
+                                @ApiParam(value="Query Identifier Present in the DRL Query", required=true)
+    		                    @PathParam("queriedEntity") String queriedEntity) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<Object> facts = drools.factQuery(sessionName, queryName, queriedEntity, false);
+			if (!count)
+				return Response.status(Response.Status.OK).entity(facts).build();
+			else
+				return Response.status(Response.Status.OK).entity(facts.size()).build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
+                            		         queriedEntity + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
+                            		         queriedEntity + " not acceptable")).
+                            build();
+		} catch (Exception e) {
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+		                    entity(new Error(e.getMessage())).
+		                    build();			
+		}
+    }
+    
+    @POST
+    @Path("engine/controllers/{controller}/drools/facts/{session}/{query}/{queriedEntity}")
+    @ApiOperation(
+        	value="Gets all the fact objects returned by a DRL query with parameters from the drools working memory" +
+                  "for a given controller and session", 
+            notes="The DRL query with parameters must be defined in the DRL file",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller, session, or query information, cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A server error has occurred processing this request")
+    })
+    public Response droolsFacts(@ApiParam(value="Policy Controller Name", required=true)
+                                @PathParam("controller") String controllerName,
+                                @ApiParam(value="Drools Session Name", required=true)
+                                @PathParam("session") String sessionName,
+                                @ApiParam(value="Query Name Present in DRL", required=true)
+                                @PathParam("query") String queryName,
+                                @ApiParam(value="Query Identifier Present in the DRL Query", required=true)
+    		                    @PathParam("queriedEntity") String queriedEntity,
+    		                    @ApiParam(value="Query Parameter Values to pass in the DRL Query", required=false)
+                                List<Object> queryParameters) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<Object> facts;
+			if (queryParameters == null || queryParameters.isEmpty())
+				facts = drools.factQuery(sessionName, queryName, queriedEntity, false);
+			else
+				facts = drools.factQuery(sessionName, queryName, queriedEntity, false, queryParameters.toArray());
+			return Response.status(Response.Status.OK).entity(facts).build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
+                            		         queriedEntity + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
+                            		         queriedEntity + " not acceptable")).
+                            build();
+		} catch (Exception e) {
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+		                    entity(new Error(e.getMessage())).
+		                    build();			
+		}
+    }
+    
+    @DELETE
+    @Path("engine/controllers/{controller}/drools/facts/{session}/{query}/{queriedEntity}")
+    @ApiOperation(
+        	value="Deletes all the fact objects returned by a DRL query with parameters from the drools working memory" +
+                  "for a given controller and session", 
+            notes="The DRL query with parameters must be defined in the DRL file",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller, session, or query information, cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A server error has occurred processing this request")
+    })
+    public Response droolsFactsDelete(@ApiParam(value="Policy Controller Name", required=true)
+								      @PathParam("controller") String controllerName,
+								      @ApiParam(value="Drools Session Name", required=true)
+								      @PathParam("session") String sessionName,
+								      @ApiParam(value="Query Name Present in DRL", required=true)
+								      @PathParam("query") String queryName,
+								      @ApiParam(value="Query Identifier Present in the DRL Query", required=true)
+								      @PathParam("queriedEntity") String queriedEntity,
+								      @ApiParam(value="Query Parameter Values to pass in the DRL Query", required=false)
+								      List<Object> queryParameters) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<Object> facts;
+			if (queryParameters == null || queryParameters.isEmpty())
+				facts = drools.factQuery(sessionName, queryName, queriedEntity, true);
+			else
+				facts = drools.factQuery(sessionName, queryName, queriedEntity, true, queryParameters.toArray());			
+			return Response.status(Response.Status.OK).entity(facts).build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
+                            		         queriedEntity + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
+                            		         queriedEntity + " not acceptable")).
+                            build();
+		} catch (Exception e) {
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+		                    entity(new Error(e.getMessage())).
+		                    build();			
+		}
+    }
+    
+    @POST
+    @Path("engine/controllers/tools/coders/decoders/filters/rules/{ruleName}")
+    @ApiOperation(
+        	value="Produces a Decoder Rule Filter in a format that the Policy Controller can understand", 
+        	notes="The result can be used with other APIs to attach a filter to a decoder"
+    )
+    public Response rules(@ApiParam(value="Negate regex?", required=true)
+                          @DefaultValue("false") @QueryParam("negate") boolean negate,
+    		              @ApiParam(value="Rule Name", required=true)
+    		              @PathParam("ruleName") String name,
+    		              @ApiParam(value="Regex expression", required=true)
+    		              String regex) {   	
+    	String literalRegex = Pattern.quote(regex);
+    	if (negate)
+    		literalRegex = "^(?!" + literalRegex + "$).*";
+    	
+		return Response.status(Status.OK).
+				        entity(new JsonProtocolFilter.FilterRule(name,literalRegex)).
+				        build();
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders")
+    @ApiOperation(
+        	value="Gets all the decoders used by a controller", 
+            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
+        	      "subscribed network topics into specific (fact) objects. " +
+        	      "The deserialized (fact) object will typically be inserted in the drools working " +
+        	      " memory of the controlled drools application.",
+        	responseContainer="List",
+        	response=ProtocolCoderToolset.class
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoders(@ApiParam(value="Policy Controller Name", required=true)
+                             @PathParam("controller") String controllerName) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<ProtocolCoderToolset> decoders = EventProtocolCoder.manager.getDecoders
+														(drools.getGroupId(), drools.getArtifactId());			
+			return Response.status(Response.Status.OK).
+	                               entity(decoders).
+	                               build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders/filters")
+    @ApiOperation(
+        	value="Gets all the filters used by a controller", 
+            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
+          	      "subscribed network topics into specific (fact) objects. " +
+          	      "The deserialized (fact) object will typically be inserted in the drools working " +
+          	      " memory of the controlled drools application." +
+                  "Acceptance filters are used to filter out undesired network messages for the given controller",
+        	responseContainer="List",
+        	response=CoderFilters.class
+    )
+    @ApiResponses(value = { 
+    	@ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilters(@ApiParam(value="Policy Controller Name", required=true)
+                                   @PathParam("controller") String controllerName) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			List<CoderFilters> filters = EventProtocolCoder.manager.getDecoderFilters
+														(drools.getGroupId(), drools.getArtifactId());
+			return Response.status(Response.Status.OK).
+		                    entity(filters).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders/{topic}")
+    @ApiOperation(
+        	value="Gets all the decoders in use by a controller for a networked topic", 
+            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
+          	      "subscribed network topics into specific (fact) objects. " +
+          	      "The deserialized (fact) object will typically be inserted in the drools working " +
+          	      " memory of the controlled drools application.",
+        	responseContainer="List",
+        	response=ProtocolCoderToolset.class
+    )
+    @ApiResponses(value = { 
+    	@ApiResponse(code=404, message="The controller or topic cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoder(@ApiParam(value="Policy Controller Name", required=true)
+                            @PathParam("controller") String controllerName,
+                            @ApiParam(value="Networked Topic Name", required=true)
+    		                @PathParam("topic") String topic) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+							(drools.getGroupId(), drools.getArtifactId(), topic);
+			return Response.status(Response.Status.OK).
+		                    entity(decoder).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + " not acceptable")).
+                            build();
+		}
+    }    
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters")
+    @ApiOperation(
+        	value="Gets all filters attached to decoders for a given networked topic in use by a controller", 
+            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
+            	      "subscribed network topics into specific (fact) objects. " +
+            	      "The deserialized (fact) object will typically be inserted in the drools working " +
+            	      " memory of the controlled drools application." +
+                      "Acceptance filters are used to filter out undesired network messages for the given controller",
+          	responseContainer="List",
+        	response=CoderFilters.class
+    )
+    @ApiResponses(value = { 
+    	@ApiResponse(code=404, message="The controller or topic cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilter(@ApiParam(value="Policy Controller Name", required=true)
+							      @PathParam("controller") String controllerName,
+							      @ApiParam(value="Networked Topic Name", required=true)
+							      @PathParam("topic") String topic) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+			ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+												(drools.getGroupId(), drools.getArtifactId(), topic);
+			if (decoder == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(topic + "  does not exist")).
+				        build();
+			else
+				return Response.status(Response.Status.OK).
+	                    entity(decoder.getCoders()).
+	                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}")
+    @ApiOperation(
+        	value="Gets all filters attached to decoders for a given subscribed networked topic " +
+                  "and fact type", 
+            notes="Decoders are associated with networked topics. A Policy Controller manages " +
+        	      "multiple topics and therefore its attached decoders. " + 
+        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
+        	      "Filters are applied on a per fact type (classname).",
+        	responseContainer="List",
+        	response=CoderFilters.class
+    )
+    @ApiResponses(value = { 
+        @ApiResponse(code=404, message="The controller, topic, or fact type cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilter(@ApiParam(value="Policy Controller Name", required=true)
+                                  @PathParam("controller") String controllerName,
+                                  @ApiParam(value="Networked Topic Name", required=true)
+    		                      @PathParam("topic") String topic,
+    		                      @ApiParam(value="Fact Type", required=true)
+    		                      @PathParam("factType") String factClass) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+											(drools.getGroupId(), drools.getArtifactId(), topic);
+			CoderFilters filters = decoder.getCoder(factClass);
+			if (filters == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(topic + ":" + factClass + "  does not exist")).
+				        build();
+			else
+				return Response.status(Response.Status.OK).
+                        entity(filters).
+                        build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @PUT
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}")
+    @ApiOperation(
+        	value="Attaches filters to the decoder for a given networked topic " +
+                  "and fact type", 
+            notes="Decoders are associated with networked topics. A Policy Controller manages " +
+        	      "multiple topics and therefore its attached decoders. " + 
+        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
+        	      "Filters are applied on a per fact type (classname).",
+        	responseContainer="List",
+        	response=CoderFilters.class
+    )
+    @ApiResponses(value = { 
+        @ApiResponse(code=404, message="The controller, topic, fact type, cannot be found, " +
+                                       "or a filter has not been provided"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilter(@ApiParam(value="Policy Controller Name", required=true)
+							      @PathParam("controller") String controllerName,
+							      @ApiParam(value="Topic Name", required=true)
+							      @PathParam("topic") String topic,
+							      @ApiParam(value="Fact Type", required=true)
+							      @PathParam("factType") String factClass,
+							      @ApiParam(value="Configuration Filter", required=true)
+    		                      JsonProtocolFilter configFilters) {
+    	
+    	if (configFilters == null) {
+    		return Response.status(Response.Status.BAD_REQUEST).
+    				        entity(new Error("Configuration Filters not provided")).
+    				        build();
+    	}
+    	
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+											(drools.getGroupId(), drools.getArtifactId(), topic);
+	    	CoderFilters filters = decoder.getCoder(factClass);
+			if (filters == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(topic + ":" + factClass + "  does not exist")).
+				        build();
+			filters.setFilter(configFilters);
+			return Response.status(Response.Status.OK).
+		                    entity(filters).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules")
+    @ApiOperation(
+        	value="Gets the filter rules attached to a topic decoder of a controller", 
+            notes="Decoders are associated with networked topics. A Policy Controller manages " +
+        	      "multiple topics and therefore its attached decoders. " + 
+        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
+        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
+          	responseContainer="List",
+        	response=FilterRule.class
+    )
+    @ApiResponses(value = { 
+        @ApiResponse(code=404, message="The controller, topic, or fact type cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilterRules(@ApiParam(value="Policy Controller Name", required=true)
+									   @PathParam("controller") String controllerName,
+									   @ApiParam(value="Topic Name", required=true)
+									   @PathParam("topic") String topic,
+									   @ApiParam(value="Fact Type", required=true)
+									   @PathParam("factType") String factClass) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+											(drools.getGroupId(), drools.getArtifactId(), topic);
+	    	
+	    	CoderFilters filters = decoder.getCoder(factClass);
+			if (filters == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
+				        build();
+			
+			JsonProtocolFilter filter = filters.getFilter();
+			if (filter == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
+				        build();
+			
+			return Response.status(Response.Status.OK).
+		                    entity(filter.getRules()).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules/{ruleName}")
+    @ApiOperation(
+        	value="Gets a filter rule by name attached to a topic decoder of a controller", 
+            notes="Decoders are associated with networked topics. A Policy Controller manages " +
+        	      "multiple topics and therefore its attached decoders. " + 
+        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
+        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
+        	responseContainer="List",
+        	response=FilterRule.class
+    )
+    @ApiResponses(value = { 
+        @ApiResponse(code=404, message="The controller, topic, fact type, or rule name cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilterRules(@ApiParam(value="Policy Controller Name", required=true)
+									   @PathParam("controller") String controllerName,
+									   @ApiParam(value="Topic Name", required=true)
+									   @PathParam("topic") String topic,
+									   @ApiParam(value="Fact Type", required=true)
+									   @PathParam("factType") String factClass,
+									   @ApiParam(value="Rule Name", required=true)
+    		                           @PathParam("ruleName") String ruleName) {
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+											(drools.getGroupId(), drools.getArtifactId(), topic);
+	    	
+	    	CoderFilters filters = decoder.getCoder(factClass);
+			if (filters == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
+				        build();
+			
+			JsonProtocolFilter filter = filters.getFilter();
+			if (filter == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
+				        build();
+			
+			return Response.status(Response.Status.OK).
+		                    entity(filter.getRules(ruleName)).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + ": " + ruleName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + ":" + ruleName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @DELETE
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules/{ruleName}")
+    @ApiOperation(
+        	value="Deletes a filter rule by name attached to a topic decoder of a controller", 
+            notes="Decoders are associated with networked topics. A Policy Controller manages " +
+        	      "multiple topics and therefore its attached decoders. " + 
+        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
+        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
+        	responseContainer="List",
+        	response=FilterRule.class
+    )
+    @ApiResponses(value = { 
+        @ApiResponse(code=404, message="The controller, topic, fact type, or rule name cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilterRuleDelete(@ApiParam(value="Policy Controller Name", required=true)
+										    @PathParam("controller") String controllerName,
+										    @ApiParam(value="Topic Name", required=true)
+										    @PathParam("topic") String topic,
+										    @ApiParam(value="Fact Type", required=true)
+										    @PathParam("factType") String factClass,
+										    @ApiParam(value="Rule Name", required=true)
+									        @PathParam("ruleName") String ruleName,
+									        @ApiParam(value="Filter Rule", required=true)
+	    		                            FilterRule rule) {
+		
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+											(drools.getGroupId(), drools.getArtifactId(), topic);
+	    	
+	    	CoderFilters filters = decoder.getCoder(factClass);
+			if (filters == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
+				        build();
+			
+			JsonProtocolFilter filter = filters.getFilter();
+			if (filter == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
+				        build();
+			
+			if (rule == null) {
+				filter.deleteRules(ruleName);
+				return Response.status(Response.Status.OK).
+	                    entity(filter.getRules()).
+	                    build();		
+			}
+			
+			if (rule.getName() == null || !rule.getName().equals(ruleName))
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + ":" + ruleName + 
+				        		         " rule name request inconsistencies (" + rule.getName() + ")")).
+				        build();
+			
+			filter.deleteRule(ruleName, rule.getRegex());
+			return Response.status(Response.Status.OK).
+		                    entity(filter.getRules()).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + ": " + ruleName + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + ":" + ruleName + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @PUT
+    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules")
+    @ApiOperation(
+        	value="Places a new filter rule in a topic decoder", 
+            notes="Decoders are associated with networked topics. A Policy Controller manages " +
+        	      "multiple topics and therefore its attached decoders. " + 
+        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
+        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
+        	responseContainer="List",
+        	response=FilterRule.class
+    )
+    @ApiResponses(value = { 
+        @ApiResponse(code=404, message="The controller, topic, or fact type cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decoderFilterRule(@ApiParam(value="Policy Controller Name", required=true)
+									  @PathParam("controller") String controllerName,
+									  @ApiParam(value="Topic Name", required=true)
+									  @PathParam("topic") String topic,
+									  @ApiParam(value="Fact Type", required=true)
+									  @PathParam("factType") String factClass,
+									  @ApiParam(value="Rule Name", required=true)
+									  @PathParam("ruleName") String ruleName,
+									  @ApiParam(value="Filter Rule", required=true)
+									  FilterRule rule) {
+		
+		try {
+			DroolsController drools = getDroolsController(controllerName);
+	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
+											(drools.getGroupId(), drools.getArtifactId(), topic);
+	    	
+	    	CoderFilters filters = decoder.getCoder(factClass);
+			if (filters == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
+				        build();
+			
+			JsonProtocolFilter filter = filters.getFilter();
+			if (filter == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
+				        build();
+			
+			if (rule.getName() == null)
+	    		return Response.status(Response.Status.BAD_REQUEST).
+				        entity(new Error(controllerName + ":" + topic + ":" + factClass +  
+				        		         " rule name request inconsistencies (" + rule.getName() + ")")).
+				        build();
+			
+			filter.addRule(rule.getName(), rule.getRegex());
+			return Response.status(Response.Status.OK).
+		                    entity(filter.getRules()).
+		                    build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 factClass + " not acceptable")).
+                            build();
+		}
+    }
+    
+    @POST
+    @Path("engine/controllers/{controller}/decoders/{topic}")
+    @Consumes(MediaType.TEXT_PLAIN)
+    @ApiOperation(
+        	value="Decodes a string into a fact object, and encodes it back into a string", 
+            notes="Tests the decode/encode functions of a controller",
+        	response=CodingResult.class
+    )
+    @ApiResponses(value = { 
+    	@ApiResponse(code=400, message="Bad input has been provided"),
+        @ApiResponse(code=404, message="The controller cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response decode(@ApiParam(value="Policy Controller Name", required=true)
+                           @PathParam("controller") String controllerName,
+                           @ApiParam(value="Topic Name", required=true)
+    					   @PathParam("topic") String topic,
+    					   @ApiParam(value="JSON String to decode", required=true)
+    		               String json) {
+    	
+    	PolicyController policyController;
+		try {
+			policyController = PolicyController.factory.get(controllerName);
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(controllerName + ":" + topic + ":" +
+			                                 " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + ":" + topic + ":" + 
+			                                 " not acceptable")).
+                            build();
+		}
+    	
+    	CodingResult result = new CodingResult();
+		result.decoding = false;
+		result.encoding = false;
+		result.jsonEncoding = null;
+
+		Object event;
+    	try {
+    		event = EventProtocolCoder.manager.decode
+    					(policyController.getDrools().getGroupId(), 
+    					 policyController.getDrools().getArtifactId(), 
+    					 topic, 
+    					 json);
+    		result.decoding = true;
+    	} catch (Exception e) {
+    		return Response.status(Response.Status.BAD_REQUEST).
+			        entity(new Error(e.getMessage())).
+			        build();
+    	}
+    	
+    	try {
+    		result.jsonEncoding = EventProtocolCoder.manager.encode(topic, event);
+    		result.encoding = true;
+    	} catch (Exception e) {
+    		// continue so to propagate decoding results ..
+    	} 
+    	
+		return Response.status(Response.Status.OK).
+                entity(result).
+                build();
+    }
+    
+    @GET
+    @Path("engine/controllers/{controller}/encoders")
+    @ApiOperation(
+        	value="Retrieves the encoder filters of a controller", 
+            notes="The encoders serializes a fact object, typically for network transmission",
+            responseContainer="List",
+        	response=CoderFilters.class
+    )
+    @ApiResponses(value = { 
+    	@ApiResponse(code=400, message="Bad input has been provided"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled")
+    })
+    public Response encoderFilters(@ApiParam(value="Policy Controller Name", required=true)
+                                   @PathParam("controller") String controllerName) {   	
+		List<CoderFilters> encoders;
+		try {
+			PolicyController controller = PolicyController.factory.get(controllerName);
+			DroolsController drools = controller.getDrools();
+			encoders = EventProtocolCoder.manager.getEncoderFilters
+							(drools.getGroupId(), drools.getArtifactId());
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.BAD_REQUEST).
+					               entity(new Error(controllerName +  " not found: " + e.getMessage())).
+					               build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(controllerName + " is not accepting the request")).build();
+		}
+		
+		return Response.status(Response.Status.OK).
+                               entity(encoders).
+                               build();
+    }
+    
+	@GET
+    @Path("engine/topics")
+    @ApiOperation(
+        	value="Retrieves the managed topics", 
+            notes="Network Topics Aggregation",
+        	response=TopicEndpoint.class
+    )
+    public Response topics() {
+		return Response.status(Response.Status.OK).
+				        entity(TopicEndpoint.manager).
+				        build();
+    }
+	
+    @GET
+    @Path("engine/topics/switches")
+    @ApiOperation(
+        	value="Topics Control Switches", 
+        	notes="List of the Topic Control Switches",
+        	responseContainer="List"
+    )
+    public Response topicSwitches() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Switches.values())).
+                        build();
+    }
+    
+    @PUT
+    @Path("engine/topics/switches/lock")
+    @ApiOperation(
+        	value="Locks all the managed topics", 
+        	notes="The operation affects all managed sources and sinks",
+        	response=TopicEndpoint.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response topicsLock() {
+    	boolean success = TopicEndpoint.manager.lock();
+		if (success)
+			return Response.status(Status.OK).
+					        entity(TopicEndpoint.manager).
+					        build();
+		else
+			return Response.status(Status.NOT_ACCEPTABLE).
+					        entity(new Error("cannot perform operation")).
+					        build();
+    }
+    
+    @DELETE
+	@Path("engine/topics/switches/lock")
+    @ApiOperation(
+        	value="Unlocks all the managed topics", 
+        	notes="The operation affects all managed sources and sinks",
+        	response=TopicEndpoint.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+	public Response topicsUnlock() {
+		boolean success = TopicEndpoint.manager.unlock();
+		if (success)
+			return Response.status(Status.OK).
+					        entity(TopicEndpoint.manager).
+					        build();
+		else
+			return Response.status(Status.NOT_ACCEPTABLE).
+					        entity(new Error("cannot perform operation")).
+					        build();
+	}
+    
+	@GET
+    @Path("engine/topics/sources")
+    @ApiOperation(
+        	value="Retrieves the managed topic sources", 
+            notes="Network Topic Sources Agregation",
+            responseContainer="List",
+        	response=TopicSource.class
+    )
+    public Response sources() {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getTopicSources()).
+    			        build();
+    }
+    
+	@GET
+    @Path("engine/topics/sinks")
+    @ApiOperation(
+        	value="Retrieves the managed topic sinks", 
+            notes="Network Topic Sinks Agregation",
+            responseContainer="List",
+        	response=TopicSink.class
+    )
+    public Response sinks() {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getTopicSinks()).
+    			        build();
+    }
+    
+	@GET
+    @Path("engine/topics/sources/ueb")
+    @ApiOperation(
+        	value="Retrieves the UEB managed topic sources", 
+            notes="UEB Topic Sources Agregation",
+            responseContainer="List",
+        	response=UebTopicSource.class
+    )
+    public Response uebSources() {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getUebTopicSources()).
+    			        build();
+    }
+    
+	@GET
+    @Path("engine/topics/sinks/ueb")
+    @ApiOperation(
+        	value="Retrieves the UEB managed topic sinks", 
+            notes="UEB Topic Sinks Agregation",
+            responseContainer="List",
+        	response=UebTopicSource.class
+    )
+    public Response uebSinks() {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getUebTopicSinks()).
+    			        build();
+    }
+    
+	@GET
+    @Path("engine/topics/sources/dmaap")
+    @ApiOperation(
+        	value="Retrieves the DMaaP managed topic sources", 
+            notes="DMaaP Topic Sources Agregation",
+            responseContainer="List",
+        	response=DmaapTopicSource.class
+    )
+    public Response dmaapSources() {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getDmaapTopicSources()).
+    			        build();
+    }
+    
+	@GET
+    @Path("engine/topics/sinks/dmaap")
+    @ApiOperation(
+        	value="Retrieves the DMaaP managed topic sinks", 
+            notes="DMaaP Topic Sinks Agregation",
+            responseContainer="List",
+        	response=DmaapTopicSink.class
+    )
+    public Response dmaapSinks() {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getDmaapTopicSinks()).
+    			        build();
+    }
+    
+    @GET
+    @Path("engine/topics/sources/ueb/{topic}")
+    @ApiOperation(
+        	value="Retrieves an UEB managed topic source", 
+            notes="This is an UEB Network Communicaton Endpoint source of messages for the Engine",
+        	response=UebTopicSource.class
+    )
+    public Response uebSourceTopic(@ApiParam(value="Topic Name", required=true)
+                                   @PathParam("topic") String topic) {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getUebTopicSource(topic)).
+    			        build();
+    }
+    
+    @GET
+    @Path("engine/topics/sinks/ueb/{topic}")
+    @ApiOperation(
+        	value="Retrieves an UEB managed topic sink", 
+            notes="This is an UEB Network Communicaton Endpoint destination of messages from the Engine",
+        	response=UebTopicSink.class
+    )
+    public Response uebSinkTopic(@ApiParam(value="Topic Name", required=true) 
+                                 @PathParam("topic") String topic) {
+    	return Response.status(Response.Status.OK).
+    			        entity(TopicEndpoint.manager.getUebTopicSink(topic)).
+    			        build();
+    }
+    
+    @GET
+    @Path("engine/topics/sources/dmaap/{topic}")
+    @ApiOperation(
+        	value="Retrieves a DMaaP managed topic source", 
+            notes="This is a DMaaP Network Communicaton Endpoint source of messages for the Engine",
+        	response=DmaapTopicSource.class
+    )
+    public Response dmaapSourceTopic(@ApiParam(value="Topic Name", required=true) 
+                                     @PathParam("topic") String topic) {
+    	return Response.status(Response.Status.OK).
+                        entity(TopicEndpoint.manager.getDmaapTopicSource(topic)).
+                        build();
+    }
+    
+    @GET
+    @Path("engine/topics/sinks/dmaap/{topic}")
+    @ApiOperation(
+        	value="Retrieves a DMaaP managed topic sink", 
+            notes="This is a DMaaP Network Communicaton Endpoint destination of messages from the Engine",
+        	response=DmaapTopicSink.class
+    )
+    public Response dmaapSinkTopic(@ApiParam(value="Topic Name", required=true)
+                                   @PathParam("topic") String topic) {
+    	return Response.status(Response.Status.OK).
+		                entity(TopicEndpoint.manager.getDmaapTopicSink(topic)).
+		                build();
+    }
+    
+    @GET
+    @Path("engine/topics/sources/ueb/{topic}/events")
+    @ApiOperation(
+        	value="Retrieves the latest events received by an UEB topic", 
+            notes="This is a UEB Network Communicaton Endpoint source of messages for the Engine",
+            responseContainer="List"
+    )
+    public Response uebSourceEvents(@ApiParam(value="Topic Name", required=true)
+                                    @PathParam("topic") String topic) {
+		return Response.status(Status.OK).
+		                entity(Arrays.asList(TopicEndpoint.manager.getUebTopicSource(topic).getRecentEvents())).
+		                build();
+    }
+    
+    @GET
+    @Path("engine/topics/sinks/ueb/{topic}/events")
+    @ApiOperation(
+        	value="Retrieves the latest events sent from a topic", 
+            notes="This is a UEB Network Communicaton Endpoint sink of messages from the Engine",
+            responseContainer="List"
+    )
+    public Response uebSinkEvents(@ApiParam(value="Topic Name", required=true)
+                                  @PathParam("topic") String topic) {
+		return Response.status(Status.OK).
+				        entity(Arrays.asList(TopicEndpoint.manager.getUebTopicSink(topic).getRecentEvents())).
+				        build();
+    }
+    
+    @GET
+    @Path("engine/topics/sources/dmaap/{topic}/events")
+    @ApiOperation(
+        	value="Retrieves the latest events received by a DMaaP topic", 
+            notes="This is a DMaaP Network Communicaton Endpoint source of messages for the Engine",
+            responseContainer="List"
+    )
+    public Response dmaapSourceEvents(@ApiParam(value="Topic Name", required=true)
+                                      @PathParam("topic") String topic) {   	
+		return Response.status(Status.OK).
+                entity(Arrays.asList(TopicEndpoint.manager.getDmaapTopicSource(topic).getRecentEvents())).
+                build();
+    }
+    
+    @GET
+    @Path("engine/topics/sinks/dmaap/{topic}/events")
+    @ApiOperation(
+        	value="Retrieves the latest events send through a DMaaP topic", 
+            notes="This is a DMaaP Network Communicaton Endpoint destination of messages from the Engine",
+            responseContainer="List"
+    )
+    public Response dmaapSinkEvents(
+                                    @PathParam("topic") String topic) {   	
+		return Response.status(Status.OK).
+                entity(Arrays.asList(TopicEndpoint.manager.getDmaapTopicSink(topic).getRecentEvents())).
+                build();
+    }
+    
+    @GET
+    @Path("engine/topics/sources/ueb/{topic}/switches")
+    @ApiOperation(
+        	value="UEB Topic Control Switches", 
+        	notes="List of the UEB Topic Control Switches",
+        	responseContainer="List"
+    )
+    public Response uebTopicSwitches() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Switches.values())).
+                        build();
+    }
+    
+    @PUT
+    @Path("engine/topics/sources/ueb/{topic}/switches/lock")
+    @ApiOperation(
+        	value="Locks an UEB Source topic", 
+        	response=UebTopicSource.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response uebTopicLock(@ApiParam(value="Topic Name", required=true)
+                                 @PathParam("topic") String topic) {
+    	UebTopicSource source = TopicEndpoint.manager.getUebTopicSource(topic);  	
+    	boolean success = source.lock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(source).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("cannot perform operation on " + topic)).
+    				        build();
+    }
+    
+    @DELETE
+    @Path("engine/topics/sources/ueb/{topic}/switches/lock")
+    @ApiOperation(
+        	value="Unlocks an UEB Source topic", 
+        	response=UebTopicSource.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response uebTopicUnlock(@ApiParam(value="Topic Name", required=true)
+                                   @PathParam("topic") String topic) {
+    	UebTopicSource source = TopicEndpoint.manager.getUebTopicSource(topic);  	
+    	boolean success = source.unlock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(source).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("cannot perform operation on " + topic)).
+    				        build();
+    }
+    
+    @GET
+    @Path("engine/topics/sources/dmaap/{topic}/switches")
+    @ApiOperation(
+        	value="DMaaP Topic Control Switches", 
+        	notes="List of the DMaaP Topic Control Switches",
+        	responseContainer="List"
+    )
+    public Response dmaapTopicSwitches() {  	
+		return Response.status(Response.Status.OK).
+                        entity(Arrays.asList(Switches.values())).
+                        build();
+    }
+    
+    @PUT
+    @Path("engine/topics/sources/dmaap/{topic}/switches/lock")
+    @ApiOperation(
+        	value="Locks an DMaaP Source topic", 
+        	response=DmaapTopicSource.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response dmmapTopicLock(@ApiParam(value="Topic Name", required=true)
+                                   @PathParam("topic") String topic) {
+    	DmaapTopicSource source = TopicEndpoint.manager.getDmaapTopicSource(topic);  	
+    	boolean success = source.lock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(source).
+    				        build();
+    	else
+    		return Response.status(Status.NOT_ACCEPTABLE).
+    				        entity(new Error("cannot perform operation on " + topic)).
+    				        build();
+    }
+    
+    @DELETE
+    @Path("engine/topics/sources/dmaap/{topic}/switches/lock")
+    @ApiOperation(
+        	value="Unlocks an DMaaP Source topic", 
+        	response=DmaapTopicSource.class
+    )
+    @ApiResponses(value = { 
+    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+    		                               "this request to be fulfilled")
+    })
+    public Response dmaapTopicUnlock(@ApiParam(value="Topic Name", required=true)
+                                     @PathParam("topic") String topic) {
+    	DmaapTopicSource source = TopicEndpoint.manager.getDmaapTopicSource(topic);  	
+    	boolean success = source.unlock();
+    	if (success)
+    		return Response.status(Status.OK).
+    				        entity(source).
+    				        build();
+    	else
+    		return Response.status(Status.SERVICE_UNAVAILABLE).
+    				        entity(new Error("cannot perform operation on " + topic)).
+    				        build();
+    }
+    
+    @PUT
+    @Path("engine/topics/sources/ueb/{topic}/events")
+    @Consumes(MediaType.TEXT_PLAIN)
+    @ApiOperation(
+        	value="Offers an event to an UEB topic for internal processing by the engine", 
+        	notes="The offered event is treated as it was incoming from the network",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The topic information cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A server error has occurred processing this request")
+    })
+    public Response uebOffer(@ApiParam(value="Topic Name", required=true)
+                             @PathParam("topic") String topic,
+                             @ApiParam(value="Network Message", required=true)
+    		                 String json) {
+    	try {
+			UebTopicSource uebReader = TopicEndpoint.manager.getUebTopicSource(topic);
+			boolean success = uebReader.offer(json);
+			if (success)
+				return Response.status(Status.OK).
+						        entity(Arrays.asList(TopicEndpoint.manager.getUebTopicSource(topic).getRecentEvents())).
+						        build();
+			else
+				return Response.status(Status.NOT_ACCEPTABLE).
+						        entity(new Error("Failure to inject event over " + topic)).
+						        build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(topic + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(topic + " not acceptable due to current state")).
+                            build();
+		} catch (Exception e) {
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+		                    entity(new Error(e.getMessage())).
+		                    build();			
+		}
+    }
+    
+    @PUT
+    @Path("engine/topics/sources/dmaap/{topic}/events")
+    @Consumes(MediaType.TEXT_PLAIN)
+    @ApiOperation(
+        	value="Offers an event to a DMaaP topic for internal processing by the engine", 
+        	notes="The offered event is treated as it was incoming from the network",
+        	responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=404, message="The topic information cannot be found"),
+		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
+		                               "this request to be fulfilled"),
+		@ApiResponse(code=500, message="A server error has occurred processing this request")
+    })
+    public Response dmaapOffer(@ApiParam(value="Topic Name", required=true)
+                               @PathParam("topic") String topic,
+                               @ApiParam(value="Network Message", required=true)
+    		                   String json) {
+    	try {
+			DmaapTopicSource dmaapReader = TopicEndpoint.manager.getDmaapTopicSource(topic);
+			boolean success = dmaapReader.offer(json);
+			if (success)
+				return Response.status(Status.OK).
+				                entity(Arrays.asList(TopicEndpoint.manager.getDmaapTopicSource(topic).getRecentEvents())).
+				                build();
+			else
+				return Response.status(Status.NOT_ACCEPTABLE).
+						        entity(new Error("Failure to inject event over " + topic)).
+						        build();
+		} catch (IllegalArgumentException e) {
+			return Response.status(Response.Status.NOT_FOUND).
+                            entity(new Error(topic + " not found")).
+                            build();
+		} catch (IllegalStateException e) {
+			return Response.status(Response.Status.NOT_ACCEPTABLE).
+                            entity(new Error(topic + " not acceptable due to current state")).
+                            build();
+		} catch (Exception e) {
+			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
+		                    entity(new Error(e.getMessage())).
+		                    build();			
+		}
+    }
+    
+    @GET
+    @Path("engine/tools/uuid")
+    @ApiOperation(
+        	value="Produces an UUID", 
+        	notes="UUID generation utility"
+    )
+    @Produces(MediaType.TEXT_PLAIN)
+    public Response uuid() {   	
+		return Response.status(Status.OK).
+		        entity(UUID.randomUUID().toString()).
+		        build();
+    }
+    
+    @GET
+    @Path("engine/tools/loggers")
+    @ApiOperation(
+        	value="all active loggers", 
+            responseContainer="List"
+    )
+    @ApiResponses(value = { 
+		@ApiResponse(code=500, message="logging misconfiguration")
+    })
+    public Response loggers() { 
+    	List<String> names = new ArrayList<String>();
+    	if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
+    		logger.warn("The SLF4J logger factory is not configured for logback");
+    		return Response.status(Status.INTERNAL_SERVER_ERROR).
+    				        entity(names).build();
+    	}
+    		
+    	LoggerContext context = 
+    			(LoggerContext) LoggerFactory.getILoggerFactory();
+    	for (Logger logger: context.getLoggerList()) {
+    		names.add(logger.getName());
+    	}
+    	
+		return Response.status(Status.OK).
+		        entity(names).
+		        build();
+    }
+    
+    @GET
+    @Path("engine/tools/loggers/{logger}")
+    @ApiOperation(
+        	value="logging level of a logger"
+    )
+    @ApiResponses(value = { 
+    	@ApiResponse(code=500, message="logging misconfiguration"),
+		@ApiResponse(code=404, message="logger not found")
+    })
+    public Response loggerName(@ApiParam(value="Logger Name", required=true) 
+                               @PathParam("logger") String loggerName) { 
+    	if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
+    		logger.warn("The SLF4J logger factory is not configured for logback");
+    		return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+    	}
+    	
+    	LoggerContext context = 
+    			(LoggerContext) LoggerFactory.getILoggerFactory();
+    	ch.qos.logback.classic.Logger logger = context.getLogger(loggerName);
+    	if (logger == null) {
+    		return Response.status(Status.NOT_FOUND).build();
+    	}
+    	
+    	String loggerLevel = (logger.getLevel() != null) ? logger.getLevel().toString() : "";   	
+		return Response.status(Status.OK).entity(loggerLevel).build();
+    }
+    
+    @PUT
+    @Path("engine/tools/loggers/{logger}/{level}")
+    @ApiOperation(
+        	value="sets the logger level", 
+        	notes="Please use the SLF4J logger levels"
+    )
+    @ApiResponses(value = { 
+        	@ApiResponse(code=500, message="logging misconfiguration"),
+    		@ApiResponse(code=404, message="logger not found")
+    })
+    public Response loggerName(@ApiParam(value="Logger Name", required=true) 
+                               @PathParam("logger") String loggerName,
+                               @ApiParam(value="Logger Level", required=true) 
+                               @PathParam("level") String loggerLevel) { 
+    	if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
+    		logger.warn("The SLF4J logger factory is not configured for logback");
+    		return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+    	}
+    		
+    	LoggerContext context = 
+    			(LoggerContext) LoggerFactory.getILoggerFactory();
+    	ch.qos.logback.classic.Logger logger = context.getLogger(loggerName);
+    	if (logger == null) {
+    		return Response.status(Status.NOT_FOUND).build();
+    	}
+    	
+    	logger.setLevel(ch.qos.logback.classic.Level.toLevel(loggerLevel));
+		return Response.status(Status.OK).entity(logger.getLevel().toString()).build();
+    }
+    
+    /**
+     * gets the underlying drools controller from the named policy controller
+     * @param controllerName the policy controller name
+     * @return the underlying drools controller
+     * @throws IllegalArgumentException if an invalid controller name has been passed in
+     */
+    protected DroolsController getDroolsController(String controllerName) throws IllegalArgumentException {
+		PolicyController controller = PolicyController.factory.get(controllerName);
+    	if (controller == null)
+    		throw new IllegalArgumentException(controllerName + "  does not exist");
+
+		DroolsController drools = controller.getDrools();
+    	if (drools == null)
+    		throw new IllegalArgumentException(controllerName + "  has no drools configuration");
+    	
+    	return drools;
+    }
+    
+    /*
+     * Helper classes for aggregation of results
+     */
+	
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("rest-telemetry-api []");
+		return builder.toString();
+	}
+
+	/**
+	 * Coding/Encoding Results Aggregation Helper class 
+	 */
+	public static class CodingResult {
+		/**
+		 * serialized output
+		 */
+		
+		public String jsonEncoding;
+		/**
+		 * encoding result
+		 */
+		
+		public Boolean encoding;
+		
+		/**
+		 * decoding result
+		 */
+		public Boolean decoding;
+	}
+	
+	/**
+	 * Generic Error Reporting class 
+	 */
+	public static class Error {
+		public String error;
+
+		public Error(String error) {
+			this.error = error;
+		}
+	}
+	
+	/**
+	 * Feed Ports into Resources
+	 */
+	public enum Inputs {
+		configuration,
+	}
+	
+	/**
+	 * Resource Toggles
+	 */
+	public enum Switches {
+		activation,
+		lock,
+	}
+}
+
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
new file mode 100644
index 00000000..fe0cc01f
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java
@@ -0,0 +1,135 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.system;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.utils.PropertyUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Programmatic entry point to the management layer
+ */
+public class Main {
+
+	/**
+	 * logback configuration file system property
+	 */
+	public static final String LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY = "logback.configurationFile";
+	
+	/**
+	 * logback configuration file system property
+	 */
+	public static final String LOGBACK_CONFIGURATION_FILE_DEFAULT = "config/logback.xml";
+	
+	/**
+	 * constructor (hides public default one)
+	 */
+	private Main() {}	
+	
+	/**
+	 * main
+	 * 
+	 * @param args program arguments
+	 */
+	public static void main(String args[]) {
+		
+		/* logging defaults */
+		
+		if (System.getProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY) == null)
+			System.setProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, LOGBACK_CONFIGURATION_FILE_DEFAULT);
+		
+		/* 0. boot */
+		
+		PolicyEngine.manager.boot(args);
+		
+		Logger logger = LoggerFactory.getLogger(Main.class);
+		
+		File configDir = new File(SystemPersistence.CONFIG_DIR_NAME);
+		
+		if (!configDir.isDirectory()) {
+			throw new IllegalArgumentException
+						("config directory: " + configDir.getAbsolutePath() + 
+						 " not found");
+		}
+		
+		/* 1. Configure the Engine */
+
+		try {
+			Path policyEnginePath = Paths.get(configDir.toPath().toString(), SystemPersistence.PROPERTIES_FILE_ENGINE);
+			Properties properties = PropertyUtil.getProperties(policyEnginePath.toFile());
+			PolicyEngine.manager.configure(properties);
+		} catch (Exception e) {
+			logger.warn("Main: cannot initialize {} because of {}", PolicyEngine.manager, e.getMessage(), e);
+		}
+		
+		/* 2. Start the Engine with the basic services only (no Policy Controllers) */
+		
+		try {
+			boolean success = PolicyEngine.manager.start();
+			if (!success) {
+				logger.warn("Main: {} has been partially started", PolicyEngine.manager);		
+			}
+		} catch (IllegalStateException e) {
+			logger.warn("Main: cannot start {} (bad state) because of {}", PolicyEngine.manager, e.getMessage(), e);
+		} catch (Exception e) {
+			logger.warn("Main: cannot start {} because of {}", PolicyEngine.manager, e.getMessage(), e);
+			System.exit(1);
+		}
+		
+		/* 3. Create and start the controllers */
+		
+		File[] controllerFiles = configDir.listFiles();
+		for (File config : controllerFiles) {
+
+			if (config.getName().endsWith(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX)) {
+				int idxSuffix = 
+						config.getName().indexOf(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
+				int lastIdxSuffix = 
+						config.getName().lastIndexOf(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
+				if (idxSuffix != lastIdxSuffix) {
+					throw new IllegalArgumentException
+								("Improper naming of controller properties file: " +
+				                 "Expected <controller-name>" + 
+				                 SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
+				}
+
+				String name = 
+						config.getName().substring(0, lastIdxSuffix);
+				try {
+					Properties properties = PropertyUtil.getProperties(config);
+					PolicyController controller = PolicyEngine.manager.createPolicyController(name, properties);
+					controller.start();
+				} catch (Exception e) {
+					logger.error("Main: cannot instantiate policy-controller {} because of {}", name, e.getMessage(), e);
+				} catch (LinkageError e) {
+					logger.warn("Main: cannot instantiate policy-controller {} (linkage) because of {}", 
+							    name, e.getMessage(), e);
+				}
+			}
+		}
+	}
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java
new file mode 100644
index 00000000..e6e1ca7e
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.system;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+
+/**
+ * A Policy Controller is the higher level unit of control.  It corresponds to
+ * the ncomp equivalent of a controller.  It provides management of underlying
+ * resources associated with the policy controller, which is a) communication
+ * infrastructure, and b) policy-core (drools) session infrastructure
+ *
+ */
+public interface PolicyController extends Startable, Lockable {
+	
+	/**
+	 * name of this Policy Controller
+	 */
+	public String getName();
+	
+	/**
+	 * Get the topic readers of interest for this controller
+	 */
+	public List<? extends TopicSource> getTopicSources();
+	
+	/**
+	 * Get the topic readers of interest for this controller
+	 */
+	public List<? extends TopicSink> getTopicSinks();
+	
+	/**
+	 * Get the Drools Controller
+	 */
+	public DroolsController getDrools();
+	
+	/**
+	 * update maven configuration
+	 * 
+	 * @param newDroolsConfiguration new drools configuration
+	 * @return true if the update was successful, false otherwise
+	 */	
+	public boolean updateDrools(DroolsConfiguration newDroolsConfiguration);
+	
+	/**
+	 * Get the Properties
+	 */
+	public Properties getProperties();
+	
+	/**
+	 * Attempts delivering of an String over communication 
+	 * infrastructure "busType"
+	 * 
+	 * @param eventBus Communication infrastructure identifier
+	 * @param topic topic
+	 * @param event the event object to send
+	 * 
+	 * @return true if successful, false if a failure has occurred.
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted (ie. locked or stopped).
+	 * @throws UnsupportedOperationException when the engine cannot deliver due
+	 *         to the functionality missing (ie. communication infrastructure
+	 *         not supported.
+	 */
+	public boolean deliver(CommInfrastructure busType, String topic, 
+			               Object event)
+			throws IllegalArgumentException, IllegalStateException, 
+			       UnsupportedOperationException;
+	
+	/**
+	 * halts and permanently releases all resources
+	 * @throws IllegalStateException
+	 */
+	public void halt() throws IllegalStateException;
+	
+	/**
+	 * Factory that tracks and manages Policy Controllers
+	 */
+	public static PolicyControllerFactory factory =
+						new IndexedPolicyControllerFactory();
+	
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
new file mode 100644
index 00000000..34c8589f
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
@@ -0,0 +1,522 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.system;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.system.internal.AggregatedPolicyController;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Policy Controller Factory to manage controller creation, destruction,
+ * and retrieval for management interfaces
+ */
+public interface PolicyControllerFactory {
+	/**
+	 * Build a controller from a properties file
+	 * 
+	 * @param name the global name of this controller
+	 * @param properties input parameters in form of properties for controller
+	 * initialization.
+	 * 
+	 * @return a Policy Controller
+	 * 
+	 * @throws IllegalArgumentException invalid values provided in properties
+	 */
+	public PolicyController build(String name, Properties properties)
+			throws IllegalArgumentException;
+	
+	/**
+	 * patches (updates) a controller from a critical configuration update.
+	 * 
+	 * @param name
+	 * @param configController
+	 * 
+	 * @return a Policy Controller
+	 */
+	public PolicyController patch(String name, DroolsConfiguration configController);
+	
+	/**
+	 * rebuilds (updates) a controller from a configuration update.
+	 * 
+	 * @param controller
+	 * @param configController
+	 * 
+	 * @return a Policy Controller
+	 */
+	public PolicyController patch(PolicyController controller, 
+			                      DroolsConfiguration configController);
+	
+	/**
+	 * get PolicyController from DroolsController
+	 * 
+	 * @param droolsController
+	 * @return
+	 * @throws IllegalArgumentException
+	 * @throws IllegalStateException
+	 */
+	public PolicyController get(DroolsController droolsController) 
+			throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Makes the Policy Controller identified by controllerName not operational, but
+	 * does not delete its associated data
+	 * 
+	 * @param controllerName  name of the policy controller
+	 * @throws IllegalArgumentException invalid arguments
+	 */
+	public void shutdown(String controllerName) throws IllegalArgumentException;;
+	
+	/**
+	 * Makes the Policy Controller identified by controller not operational, but
+	 * does not delete its associated data
+	 * 
+	 * @param controller a Policy Controller
+	 * @throws IllegalArgumentException invalid arguments
+	 */
+	public void shutdown(PolicyController controller) throws IllegalArgumentException;
+	
+	/**
+	 * Releases all Policy Controllers from operation
+	 */
+	public void shutdown();
+
+	/**
+	 * Destroys this Policy Controller
+	 * 
+	 * @param controllerName  name of the policy controller
+	 * @throws IllegalArgumentException invalid arguments
+	 */
+	public void destroy(String controllerName) throws IllegalArgumentException;;
+	
+	/**
+	 * Destroys this Policy Controller
+	 * 
+	 * @param controller a Policy Controller
+	 * @throws IllegalArgumentException invalid arguments
+	 */
+	public void destroy(PolicyController controller) throws IllegalArgumentException;
+	
+	/**
+	 * Releases all Policy Controller resources
+	 */
+	public void destroy();
+	
+	/**
+	 * gets the Policy Controller identified by its name
+	 * 
+	 * @param policyControllerName
+	 * @return
+	 * @throws IllegalArgumentException
+	 * @throws IllegalStateException
+	 */
+	public PolicyController get(String policyControllerName)
+		   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * gets the Policy Controller identified by group and artifact ids
+	 * 
+	 * @param groupId group id
+	 * @param artifactId artifact id
+	 * @return
+	 * @throws IllegalArgumentException
+	 * @throws IllegalStateException
+	 */
+	public PolicyController get(String groupId, String artifactId)
+		   throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * get features attached to the Policy Controllers
+	 * @return list of features
+	 */
+	public List<PolicyControllerFeatureAPI> getFeatureProviders();
+	
+	/**
+	 * get named feature attached to the Policy Controllers
+	 * @return the feature
+	 */
+	public PolicyControllerFeatureAPI getFeatureProvider(String featureName) 
+			throws IllegalArgumentException;
+	
+	/**
+	 * get features attached to the Policy Controllers
+	 * @return list of features
+	 */
+	public List<String> getFeatures();
+	
+	/**
+	 * returns the current inventory of Policy Controllers
+	 * 
+	 * @return a list of Policy Controllers
+	 */
+	public List<PolicyController> inventory();
+}
+
+/**
+ * Factory of Policy Controllers indexed by the name of the Policy Controller
+ */
+class IndexedPolicyControllerFactory implements PolicyControllerFactory {
+	// get an instance of logger 
+	private static Logger  logger = LoggerFactory.getLogger(PolicyControllerFactory.class);		
+	
+	/**
+	 * Policy Controller Name Index
+	 */
+	protected HashMap<String,PolicyController> policyControllers =
+			new HashMap<String,PolicyController>();
+	
+	/**
+	 * Group/Artifact Ids Index
+	 */
+	protected HashMap<String,PolicyController> coordinates2Controller = 
+			new HashMap<String,PolicyController>();
+	
+	/**
+	 * produces key for indexing controller names
+	 * 
+	 * @param group group id
+	 * @param artifactId artifact id
+	 * @return index key
+	 */
+	protected String toKey(String groupId, String artifactId) {
+		return groupId + ":" + artifactId;
+	}
+		
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized PolicyController build(String name, Properties properties) 
+			throws IllegalArgumentException {
+		
+		if (this.policyControllers.containsKey(name)) {
+			return this.policyControllers.get(name);
+		}
+		
+		/* A PolicyController does not exist */
+		
+		PolicyController controller =
+				new AggregatedPolicyController(name, properties);
+		
+		String coordinates = toKey(controller.getDrools().getGroupId(),
+				                   controller.getDrools().getArtifactId());
+		
+		this.policyControllers.put(name, controller);	
+		
+
+		if (controller.getDrools().isBrained())
+			this.coordinates2Controller.put(coordinates, controller);
+		
+		return controller;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized PolicyController patch(String name, DroolsConfiguration droolsConfig) 
+			throws IllegalArgumentException {
+		
+		if (name == null || name.isEmpty() || !this.policyControllers.containsKey(name)) {
+			throw new IllegalArgumentException("Invalid " + name);
+		}
+		
+		if (droolsConfig == null)
+			throw new IllegalArgumentException("Invalid Drools Configuration");
+		
+		PolicyController controller = this.get(name);
+		
+		if (controller == null) {
+			logger.warn("A POLICY CONTROLLER of name " + name + 
+					    "does not exist for patch operation: " + droolsConfig);
+			
+			throw new IllegalArgumentException("Not a valid controller of name " + name);
+		}
+		
+		this.patch(controller, droolsConfig);
+		
+		if (logger.isInfoEnabled())
+			logger.info("UPDATED drools configuration: " + droolsConfig + " on " + this);
+		
+		return controller;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyController patch(PolicyController controller, DroolsConfiguration droolsConfig) 
+			throws IllegalArgumentException {
+
+		if (controller == null)
+			throw new IllegalArgumentException("Not a valid controller:  null");
+		
+		if (!controller.updateDrools(droolsConfig)) {
+			logger.warn("Cannot update drools configuration: " + droolsConfig + " on " + this);
+			throw new IllegalArgumentException("Cannot update drools configuration Drools Configuration");
+		}
+		
+		if (logger.isInfoEnabled())
+			logger.info("UPDATED drools configuration: " + droolsConfig + " on " + this);
+		
+		String coordinates = toKey(controller.getDrools().getGroupId(),
+				                   controller.getDrools().getArtifactId());
+		
+		if (controller.getDrools().isBrained())
+			this.coordinates2Controller.put(coordinates, controller);
+		
+		return controller;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown(String controllerName) throws IllegalArgumentException {
+		
+		if (controllerName == null || controllerName.isEmpty()) {
+			throw new IllegalArgumentException("Invalid " + controllerName);
+		}
+		
+		synchronized(this) {
+			if (!this.policyControllers.containsKey(controllerName)) {
+				return;
+			}
+					
+			PolicyController controller = this.policyControllers.get(controllerName);
+			this.shutdown(controller);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown(PolicyController controller) throws IllegalArgumentException {		
+		this.unmanage(controller);
+		controller.shutdown();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() {
+		List<PolicyController> controllers = this.inventory();
+		for (PolicyController controller: controllers) {
+			controller.shutdown();
+		}
+		
+		synchronized(this) {
+			this.policyControllers.clear();
+			this.coordinates2Controller.clear();
+		}
+	}
+	
+	/**
+	 * unmanage the controller
+	 * 
+	 * @param controller
+	 * @return
+	 * @throws IllegalArgumentException
+	 */
+	protected void unmanage(PolicyController controller) throws IllegalArgumentException {
+		if (controller == null) {
+			throw new IllegalArgumentException("Invalid Controller");
+		}
+		
+		synchronized(this) {
+			if (!this.policyControllers.containsKey(controller.getName())) {
+				return;
+			}
+			controller = this.policyControllers.remove(controller.getName());
+			
+			String coordinates = toKey(controller.getDrools().getGroupId(),
+                                       controller.getDrools().getArtifactId());
+			this.coordinates2Controller.remove(coordinates);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(String controllerName) throws IllegalArgumentException {
+		
+		if (controllerName == null || controllerName.isEmpty()) {
+			throw new IllegalArgumentException("Invalid " + controllerName);
+		}
+		
+		synchronized(this) {
+			if (!this.policyControllers.containsKey(controllerName)) {
+				return;
+			}
+					
+			PolicyController controller = this.policyControllers.get(controllerName);
+			this.destroy(controller);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy(PolicyController controller) throws IllegalArgumentException {
+		this.unmanage(controller);
+		controller.halt();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void destroy() {
+		List<PolicyController> controllers = this.inventory();
+		for (PolicyController controller: controllers) {
+			controller.halt();
+		}
+		
+		synchronized(this) {
+			this.policyControllers.clear();
+			this.coordinates2Controller.clear();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyController get(String name) throws IllegalArgumentException, IllegalStateException {
+
+		if (name == null || name.isEmpty()) {
+			throw new IllegalArgumentException("Invalid " + name);
+		}
+		
+		synchronized(this) {
+			if (this.policyControllers.containsKey(name)) {
+				return this.policyControllers.get(name);
+			} else {
+				throw new IllegalArgumentException("Invalid " + name);
+			}
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyController get(String groupId, String artifactId) 
+			throws IllegalArgumentException, IllegalStateException {
+
+		if (groupId == null || groupId.isEmpty() || 
+			artifactId == null || artifactId.isEmpty()) {
+			throw new IllegalArgumentException("Invalid group/artifact ids");
+		}
+		
+		synchronized(this) {
+			String key = toKey(groupId,artifactId);
+			if (this.coordinates2Controller.containsKey(key)) {
+				return this.coordinates2Controller.get(key);
+			} else {
+				throw new IllegalArgumentException("Invalid " + key);
+			}
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyController get(DroolsController droolsController) 
+			throws IllegalArgumentException, IllegalStateException {
+
+		if (droolsController == null) {
+			throw new IllegalArgumentException("No Drools Controller provided");
+		}
+		
+		synchronized(this) {
+			String key = toKey(droolsController.getGroupId(), droolsController.getArtifactId());
+			if (this.coordinates2Controller.containsKey(key)) {
+				return this.coordinates2Controller.get(key);
+			} else {
+				logger.error("Drools Controller not associated with Policy Controller " + droolsController + ":" + this);
+				throw new IllegalStateException("Drools Controller not associated with Policy Controller " + droolsController + ":" + this);
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<PolicyController> inventory() {
+		 List<PolicyController> controllers = 
+				 new ArrayList<PolicyController>(this.policyControllers.values());
+		 return controllers;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override 
+	public List<String> getFeatures() {
+		List<String> features = new ArrayList<String>();
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			features.add(feature.getName());
+		}
+		return features;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<PolicyControllerFeatureAPI> getFeatureProviders() {
+		return PolicyControllerFeatureAPI.providers.getList();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyControllerFeatureAPI getFeatureProvider(String featureName) throws IllegalArgumentException {
+		if (featureName == null || featureName.isEmpty())
+			throw new IllegalArgumentException("A feature name must be provided");
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			if (feature.getName().equals(featureName))
+				return feature;
+		}
+		
+		throw new IllegalArgumentException("Invalid Feature Name: " + featureName);
+	}
+}
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
new file mode 100644
index 00000000..1ee12304
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
@@ -0,0 +1,1461 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.core.PolicyContainer;
+import org.onap.policy.drools.core.jmx.PdpJmxListener;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.Topic.CommInfrastructure;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.Lockable;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.properties.Startable;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;
+import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * Policy Engine, the top abstraction for the Drools PDP Policy Engine.
+ * It abstracts away a Drools PDP Engine from management purposes.
+ * This is the best place to looking at the code from a top down approach. 
+ * Other managed entities can be obtained from the PolicyEngine, hierarchically. 
+ * <br>
+ * PolicyEngine 1 --- * PolicyController 1 --- 1 DroolsController 1 --- 1 PolicyContainer 1 --- * PolicySession
+ * <br>
+ * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 UebTopicReader
+ * <br>
+ * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 DmaapTopicReader
+ * <br>
+ * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 DmaapTopicWriter
+ * <br>
+ * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 RestTopicReader
+ * <br>
+ * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 RestTopicWriter
+ * <br>
+ * PolicyEngine 1 --- 1 ManagementServer
+ */
+public interface PolicyEngine extends Startable, Lockable, TopicListener {
+	
+	/**
+	 * Default Config Server Port
+	 */
+	public static final int CONFIG_SERVER_DEFAULT_PORT = 9696;
+	
+	/**
+	 * Default Config Server Hostname
+	 */
+	public static final String CONFIG_SERVER_DEFAULT_HOST = "localhost";
+	
+	/**
+	 * Boot the engine
+	 * 
+	 * @param cliArgs command line arguments
+	 */
+	public void boot(String cliArgs[]);
+	
+	/**
+	 * configure the policy engine according to the given properties
+	 * 
+	 * @param properties Policy Engine properties
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 */
+	public void configure(Properties properties)  throws IllegalArgumentException;
+
+	/**
+	 * registers a new Policy Controller with the Policy Engine
+	 * initialized per properties.
+	 * 
+	 * @param controller name
+	 * @param properties properties to initialize the Policy Controller
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted.
+	 * @return the newly instantiated Policy Controller
+	 */
+	public PolicyController createPolicyController(String name, Properties properties)
+		throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * updates the Policy Engine with the given configuration
+	 * 
+	 * @param configuration the configuration
+	 * @return success or failure
+	 * @throws IllegalArgumentException if invalid argument provided
+	 * @throws IllegalStateException if the system is in an invalid state
+	 */
+	public boolean configure(PdpdConfiguration configuration)
+		throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * updates a set of Policy Controllers with configuration information
+	 * 
+	 * @param configuration
+	 * @return
+	 * @throws IllegalArgumentException
+	 * @throws IllegalStateException
+	 */
+	public List<PolicyController> updatePolicyControllers(List<ControllerConfiguration> configuration)
+		throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * updates an already existing Policy Controller with configuration information
+	 * 
+	 * @param configuration configuration
+	 * 
+	 * @return the updated Policy Controller
+	 * @throws IllegalArgumentException in the configuration is invalid
+	 * @throws IllegalStateException if the controller is in a bad state
+	 * @throws Exception any other reason
+	 */
+	public PolicyController updatePolicyController(ControllerConfiguration configuration)
+		throws Exception;
+
+	/**
+	 * removes the Policy Controller identified by its name from the Policy Engine
+	 * 
+	 * @param name name of the Policy Controller
+	 * @return the removed Policy Controller
+	 */
+	public void removePolicyController(String name);
+	
+	/**
+	 * removes a Policy Controller from the Policy Engine
+	 * @param controller the Policy Controller to remove from the Policy Engine
+	 */
+	public void removePolicyController(PolicyController controller);
+
+	/**
+	 * returns a list of the available Policy Controllers
+	 * 
+	 * @return list of Policy Controllers
+	 */
+	public List<PolicyController> getPolicyControllers();
+	
+
+	/**
+	 * get policy controller names
+	 * 
+	 * @return list of controller names
+	 */
+	public List<String> getPolicyControllerIds();
+	
+	/**
+	 * get unmanaged sources
+	 * 
+	 * @return unmanaged sources
+	 */
+	public List<TopicSource> getSources();
+	
+	/**
+	 * get unmanaged sinks
+	 * 
+	 * @return unmanaged sinks
+	 */
+	public List<TopicSink> getSinks();
+	
+	/**
+	 * get unmmanaged http servers list
+	 * @return http servers
+	 */
+	public List<HttpServletServer> getHttpServers();
+	
+	/**
+	 * get properties configuration
+	 * 
+	 * @return properties objects
+	 */
+	public Properties getProperties();
+	
+	/**
+	 * get features attached to the Policy Engine
+	 * @return list of features
+	 */
+	public List<PolicyEngineFeatureAPI> getFeatureProviders();
+	
+	/**
+	 * get named feature attached to the Policy Engine
+	 * @return the feature
+	 */
+	public PolicyEngineFeatureAPI getFeatureProvider(String featureName) 
+			throws IllegalArgumentException;
+	
+	/**
+	 * get features attached to the Policy Engine
+	 * @return list of features
+	 */
+	public List<String> getFeatures();
+	
+	/**
+	 * Attempts the dispatching of an "event" object
+	 * 
+	 * @param topic topic
+	 * @param event the event object to send
+	 * 
+	 * @return true if successful, false if a failure has occurred.
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted (ie. locked or stopped).
+	 */
+	public boolean deliver(String topic, Object event)
+			throws IllegalArgumentException, IllegalStateException;
+	
+	/**
+	 * Attempts the dispatching of an "event" object over communication 
+	 * infrastructure "busType"
+	 * 
+	 * @param eventBus Communication infrastructure identifier
+	 * @param topic topic
+	 * @param event the event object to send
+	 * 
+	 * @return true if successful, false if a failure has occurred.
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted (ie. locked or stopped).
+	 * @throws UnsupportedOperationException when the engine cannot deliver due
+	 *         to the functionality missing (ie. communication infrastructure
+	 *         not supported.
+	 */
+	public boolean deliver(String busType, String topic, Object event)
+			throws IllegalArgumentException, IllegalStateException, 
+			       UnsupportedOperationException;
+	
+	/**
+	 * Attempts the dispatching of an "event" object over communication 
+	 * infrastructure "busType"
+	 * 
+	 * @param eventBus Communication infrastructure enum
+	 * @param topic topic
+	 * @param event the event object to send
+	 * 
+	 * @return true if successful, false if a failure has occurred.
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted (ie. locked or stopped).
+	 * @throws UnsupportedOperationException when the engine cannot deliver due
+	 *         to the functionality missing (ie. communication infrastructure
+	 *         not supported.
+	 */
+	public boolean deliver(CommInfrastructure busType, String topic, Object event)
+			throws IllegalArgumentException, IllegalStateException, 
+			       UnsupportedOperationException;
+	
+	/**
+	 * Attempts delivering of an String over communication 
+	 * infrastructure "busType"
+	 * 
+	 * @param eventBus Communication infrastructure identifier
+	 * @param topic topic
+	 * @param event the event object to send
+	 * 
+	 * @return true if successful, false if a failure has occurred.
+	 * @throws IllegalArgumentException when invalid or insufficient 
+	 *         properties are provided
+	 * @throws IllegalStateException when the engine is in a state where
+	 *         this operation is not permitted (ie. locked or stopped).
+	 * @throws UnsupportedOperationException when the engine cannot deliver due
+	 *         to the functionality missing (ie. communication infrastructure
+	 *         not supported.
+	 */
+	public boolean deliver(CommInfrastructure busType, String topic, 
+			               String event)
+			throws IllegalArgumentException, IllegalStateException, 
+			       UnsupportedOperationException;
+	
+	/**
+	 * Invoked when the host goes into the active state.
+	 */
+	public void activate();
+
+	/**
+	 * Invoked when the host goes into the standby state.
+	 */
+	public void deactivate();
+	
+	/**
+	 * Policy Engine Manager
+	 */
+	public final static PolicyEngine manager = new PolicyEngineManager();
+}
+
+/**
+ * Policy Engine Manager Implementation
+ */
+class PolicyEngineManager implements PolicyEngine {
+	/**
+	 * logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(PolicyEngineManager.class);  	
+	
+	/**
+	 * Is the Policy Engine running?
+	 */
+	protected boolean alive = false;
+	
+	/**
+	 * Is the engine locked? 
+	 */
+	protected boolean locked = false;	
+	
+	/**
+	 * Properties used to initialize the engine
+	 */
+	protected Properties properties;
+	
+	/**
+	 * Policy Engine Sources
+	 */
+	protected List<? extends TopicSource> sources = new ArrayList<>();
+	
+	/**
+	 * Policy Engine Sinks
+	 */
+	protected List<? extends TopicSink> sinks = new ArrayList<>();
+	
+	/**
+	 * Policy Engine HTTP Servers
+	 */
+	protected List<HttpServletServer> httpServers = new ArrayList<HttpServletServer>();
+	
+	/**
+	 * gson parser to decode configuration requests
+	 */
+	protected Gson decoder = new GsonBuilder().disableHtmlEscaping().create();
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized void boot(String cliArgs[]) {
+		
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeBoot(this, cliArgs))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-boot failure because of {}",  
+				             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		try {
+			PolicyContainer.globalInit(cliArgs);
+		} catch (Exception e) {
+			logger.error("{}: cannot init policy-container because of {}", this, e.getMessage(), e);
+		}
+		
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterBoot(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-boot failure because of {}",  
+				             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized void configure(Properties properties) throws IllegalArgumentException {
+		
+		if (properties == null) {
+			logger.warn("No properties provided");
+			throw new IllegalArgumentException("No properties provided");
+		}
+		
+		/* policy-engine dispatch pre configure hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeConfigure(this, properties))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-configure failure because of {}",  
+				             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		this.properties = properties;
+		
+		try {
+			this.sources = TopicEndpoint.manager.addTopicSources(properties);
+			for (TopicSource source: this.sources) {
+				source.register(this);
+			}
+		} catch (Exception e) {
+			logger.error("{}: add-sources failed", this, e);
+		}
+		
+		try {
+			this.sinks = TopicEndpoint.manager.addTopicSinks(properties);
+		} catch (IllegalArgumentException e) {
+			logger.error("{}: add-sinks failed", this, e);
+		}
+		
+		try {
+			this.httpServers = HttpServletServer.factory.build(properties);
+		} catch (IllegalArgumentException e) {
+			logger.error("{}: add-http-servers failed", this, e);
+		}
+		
+		/* policy-engine dispatch post configure hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterConfigure(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-configure failure because of {}",  
+						     this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized PolicyController createPolicyController(String name, Properties properties) 
+			throws IllegalArgumentException, IllegalStateException {
+		
+		// check if a PROPERTY_CONTROLLER_NAME property is present
+		// if so, override the given name
+		
+		String propertyControllerName = properties.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME);
+		if (propertyControllerName != null && !propertyControllerName.isEmpty())  {
+			if (!propertyControllerName.equals(name)) {
+				throw new IllegalStateException("Proposed name (" + name + 
+						                        ") and properties name (" + propertyControllerName + 
+						                        ") don't match");
+			}
+			name = propertyControllerName;
+		}
+		
+		PolicyController controller;
+		for (PolicyControllerFeatureAPI controllerFeature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				controller = controllerFeature.beforeCreate(name, properties);
+				if (controller != null)
+					return controller;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-controller-create failure because of {}",  
+				             this, controllerFeature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		controller = PolicyController.factory.build(name, properties);	
+		if (this.isLocked())
+			controller.lock();
+		
+		// feature hook
+		for (PolicyControllerFeatureAPI controllerFeature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (controllerFeature.afterCreate(controller))
+					return controller;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-controller-create failure because of {}",  
+			                 this, controllerFeature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return controller;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean configure(PdpdConfiguration config) throws IllegalArgumentException, IllegalStateException {
+	
+		if (config == null)
+			throw new IllegalArgumentException("No configuration provided");
+		
+		String entity = config.getEntity();
+		
+		switch (entity) {
+		case PdpdConfiguration.CONFIG_ENTITY_CONTROLLER:
+			/* only this one supported for now */
+			List<ControllerConfiguration> configControllers = config.getControllers();
+			if (configControllers == null || configControllers.isEmpty()) {
+				if (logger.isInfoEnabled())
+					logger.info("No controller configuration provided: " + config);
+				return false;
+			}
+			List<PolicyController> policyControllers = this.updatePolicyControllers(config.getControllers());
+			if (policyControllers == null || policyControllers.isEmpty())
+				return false;
+			else if (policyControllers.size() == configControllers.size())
+				return true;
+			
+			return false;
+		default:
+			String msg = "Configuration Entity is not supported: " + entity;
+			logger.warn(msg);
+			throw new IllegalArgumentException(msg);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<PolicyController> updatePolicyControllers(List<ControllerConfiguration> configControllers)
+			throws IllegalArgumentException, IllegalStateException {
+		
+		List<PolicyController> policyControllers = new ArrayList<PolicyController>();
+		if (configControllers == null || configControllers.isEmpty()) {
+			if (logger.isInfoEnabled())
+				logger.info("No controller configuration provided: " + configControllers);
+			return policyControllers;
+		}
+		
+		for (ControllerConfiguration configController: configControllers) {
+			try {
+				PolicyController policyController = this.updatePolicyController(configController);
+				policyControllers.add(policyController);
+			} catch (Exception e) {
+				logger.error("{}: cannot update-policy-controllers because of {}", this, e.getMessage(), e);
+			}
+		}
+		
+		return policyControllers;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyController updatePolicyController(ControllerConfiguration configController) 
+		   throws Exception {
+		
+		if (configController == null) 
+			throw new IllegalArgumentException("No controller configuration has been provided");
+		
+		String controllerName = configController.getName();	
+		if (controllerName == null || controllerName.isEmpty()) {
+			logger.warn("controller-name  must be provided");
+			throw new IllegalArgumentException("No controller configuration has been provided");
+		}
+		
+		PolicyController policyController = null;
+		try {		
+			String operation = configController.getOperation();
+			if (operation == null || operation.isEmpty()) {
+				logger.warn("operation must be provided");
+				throw new IllegalArgumentException("operation must be provided");
+			}
+			
+			try {
+				policyController = PolicyController.factory.get(controllerName);
+			} catch (IllegalArgumentException e) {
+				// not found
+				logger.warn("Policy Controller " + controllerName + " not found");
+			}
+			
+			if (policyController == null) {
+				
+				if (operation.equalsIgnoreCase(ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_LOCK) ||
+					operation.equalsIgnoreCase(ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_UNLOCK)) {
+					throw new IllegalArgumentException(controllerName + " is not available for operation " + operation);
+				}
+				
+				/* Recovery case */
+				
+				logger.warn("controller " + controllerName + " does not exist.  " +
+				            "Attempting recovery from disk");	
+				
+				Properties properties = 
+						SystemPersistence.manager.getControllerProperties(controllerName);
+				
+				/* 
+				 * returned properties cannot be null (per implementation) 
+				 * assert (properties != null)
+				 */
+				
+				if (properties == null) {
+					throw new IllegalArgumentException(controllerName + " is invalid");
+				}
+				
+				logger.warn("controller " + controllerName + " being recovered. " +
+			                "Reset controller's bad maven coordinates to brainless");
+				
+				/* 
+				 * try to bring up bad controller in brainless mode,
+				 * after having it working, apply the new create/update operation.
+				 */
+				properties.setProperty(PolicyProperties.RULES_GROUPID, DroolsController.NO_GROUP_ID);
+				properties.setProperty(PolicyProperties.RULES_ARTIFACTID, DroolsController.NO_ARTIFACT_ID);
+				properties.setProperty(PolicyProperties.RULES_VERSION, DroolsController.NO_VERSION);
+				
+				policyController = PolicyEngine.manager.createPolicyController(controllerName, properties);
+				
+				/* fall through to do brain update operation*/
+			}
+			
+			switch (operation) {
+			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_CREATE:
+				PolicyController.factory.patch(policyController, configController.getDrools());
+				break;
+			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_UPDATE:
+				policyController.unlock();
+				PolicyController.factory.patch(policyController, configController.getDrools());
+				break;
+			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_LOCK:
+				policyController.lock();
+				break;
+			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_UNLOCK:
+				policyController.unlock();
+				break;
+			default:
+				String msg = "Controller Operation Configuration is not supported: " + 
+		                     operation + " for " + controllerName;
+				logger.warn(msg);
+				throw new IllegalArgumentException(msg);
+			}
+			
+			return policyController;
+		} catch (Exception e) {
+			logger.error("{}: cannot update-policy-controller because of {}", this, e.getMessage(), e);
+			throw e;
+		} catch (LinkageError e) {
+			logger.error("{}: cannot update-policy-controllers (rules) because of {}", this, e.getMessage(), e);
+			throw new IllegalStateException(e);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean start() throws IllegalStateException {
+		
+		/* policy-engine dispatch pre start hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeStart(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-start failure because of {}", 
+					         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+			
+		boolean success = true;
+		if (this.locked)
+			throw new IllegalStateException("Engine is locked");
+		
+		this.alive = true;
+
+		/* Start Policy Engine exclusively-owned (unmanaged) http servers */
+		
+		for (HttpServletServer httpServer: this.httpServers) {
+			try {
+				if (!httpServer.waitedStart(5 * 1000L))
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start http-server {} because of {}", this, 
+						     httpServer, e.getMessage(), e);
+			}
+		}
+		
+		/* Start Policy Engine exclusively-owned (unmanaged) sources */
+		
+		for (TopicSource source: this.sources) {
+			try {
+				if (!source.start())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start topic-source {} because of {}", this, 
+					         source, e.getMessage(), e);
+			}
+		}
+		
+		/* Start Policy Engine owned (unmanaged) sinks */
+		
+		for (TopicSink sink: this.sinks) {
+			try {
+				if (!sink.start())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start topic-sink {} because of {}", this, 
+				             sink, e.getMessage(), e);
+			}
+		}
+		
+		/* Start Policy Controllers */
+		
+		List<PolicyController> controllers = PolicyController.factory.inventory();
+		for (PolicyController controller : controllers) {
+			try {
+				if (!controller.start())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start policy-controller {} because of {}", this, 
+			                 controller, e.getMessage(), e);
+				success = false;
+			}
+		}
+		
+		/* Start managed Topic Endpoints */
+		
+		try {
+			if (!TopicEndpoint.manager.start())
+				success = false;			
+		} catch (IllegalStateException e) {
+			logger.warn("{}: Topic Endpoint Manager is in an invalid state because of {}", this, e.getMessage(), e);			
+		}
+		
+		
+		// Start the JMX listener
+		
+		PdpJmxListener.start();
+		
+		/* policy-engine dispatch after start hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterStart(this))
+					return success;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-start failure because of {}",  
+					         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean stop() {
+		
+		/* policy-engine dispatch pre stop hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeStop(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-stop failure because of {}", 
+					     this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		/* stop regardless of the lock state */
+		
+		boolean success = true;
+		if (!this.alive)
+			return true;
+		
+		this.alive = false;			
+	
+		List<PolicyController> controllers = PolicyController.factory.inventory();
+		for (PolicyController controller : controllers) {
+			try {
+				if (!controller.stop())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot stop policy-controller {} because of {}", this, 
+		                     controller, e.getMessage(), e);
+				success = false;
+			}
+		}
+		
+		/* Stop Policy Engine owned (unmanaged) sources */
+		for (TopicSource source: this.sources) {
+			try {
+				if (!source.stop())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start topic-source {} because of {}", this, 
+		                     source, e.getMessage(), e);
+			}
+		}
+		
+		/* Stop Policy Engine owned (unmanaged) sinks */
+		for (TopicSink sink: this.sinks) {
+			try {
+				if (!sink.stop())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start topic-sink {} because of {}", this, 
+	                         sink, e.getMessage(), e);
+			}
+		}
+		
+		/* stop all managed topics sources and sinks */
+		if (!TopicEndpoint.manager.stop())
+			success = false;
+		
+		/* stop all unmanaged http servers */
+		for (HttpServletServer httpServer: this.httpServers) {
+			try {
+				if (!httpServer.stop())
+					success = false;
+			} catch (Exception e) {
+				logger.error("{}: cannot start http-server {} because of {}", this, 
+						     httpServer, e.getMessage(), e);
+			}
+		}		
+		
+		/* policy-engine dispatch pre stop hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterStop(this))
+					return success;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-stop failure because of {}",  
+					         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized void shutdown() throws IllegalStateException {
+		
+		/* policy-engine dispatch pre shutdown hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeShutdown(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-shutdown failure because of {}", 
+					         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+
+		this.alive = false;			
+	
+		/* Shutdown Policy Engine owned (unmanaged) sources */
+		for (TopicSource source: this.sources) {
+			try {
+				source.shutdown();
+			} catch (Exception e) {
+				logger.error("{}: cannot shutdown topic-source {} because of {}", this, 
+	                         source, e.getMessage(), e);
+			}
+		}
+		
+		/* Shutdown Policy Engine owned (unmanaged) sinks */
+		for (TopicSink sink: this.sinks) {
+			try {
+				sink.shutdown();
+			} catch (Exception e) {
+				logger.error("{}: cannot shutdown topic-sink {} because of {}", this, 
+                             sink, e.getMessage(), e);
+			}
+		}
+		
+		/* Shutdown managed resources */
+		PolicyController.factory.shutdown();
+		TopicEndpoint.manager.shutdown();
+		HttpServletServer.factory.destroy();
+		
+		// Stop the JMX listener
+		
+		PdpJmxListener.stop();
+		
+		/* policy-engine dispatch post shutdown hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterShutdown(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-shutdown failure because of {}",  
+				         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+
+		
+		new Thread(new Runnable() {
+		    @Override
+		    public void run() {
+		    	try {
+					Thread.sleep(5000L);
+				} catch (InterruptedException e) {
+					logger.warn("{}: interrupted-exception while shutting down management server: ", this);
+				}		    	
+				
+				/* shutdown all unmanaged http servers */
+				for (HttpServletServer httpServer: getHttpServers()) {
+					try {
+						httpServer.shutdown();
+					} catch (Exception e) {
+						logger.error("{}: cannot shutdown http-server {} because of {}", this, 
+								     httpServer, e.getMessage(), e);
+					}
+				} 
+		    	
+		    	try {
+					Thread.sleep(5000L);
+				} catch (InterruptedException e) {
+					logger.warn("{}: interrupted-exception while shutting down management server: ", this);
+				}
+		    	
+		    	System.exit(0);
+		    }		    
+		}).start();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean isAlive() {
+		return this.alive;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean lock() {
+		
+		/* policy-engine dispatch pre lock hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeLock(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-lock failure because of {}",  
+				         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		if (this.locked)
+			return true;
+		
+		this.locked = true;			
+	
+		boolean success = true;
+		List<PolicyController> controllers = PolicyController.factory.inventory();
+		for (PolicyController controller : controllers) {
+			try {
+				success = controller.lock() && success;
+			} catch (Exception e) {
+				logger.error("{}: cannot lock policy-controller {} because of {}", this, 
+						     controller, e.getMessage(), e);
+				success = false;
+			}
+		}
+		
+		success = TopicEndpoint.manager.lock() && success;	
+			
+		/* policy-engine dispatch post lock hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterLock(this))
+					return success;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-lock failure because of {}",  
+				         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean unlock() {
+		
+		/* policy-engine dispatch pre unlock hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeUnlock(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-unlock failure because of {}",  
+				         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		if (!this.locked)
+			return true;
+		
+		this.locked = false;			
+		
+		boolean success = true;
+		List<PolicyController> controllers = PolicyController.factory.inventory();
+		for (PolicyController controller : controllers) {
+			try {
+				success = controller.unlock() && success;
+			} catch (Exception e) {
+				logger.error("{}: cannot unlock policy-controller {} because of {}", this, 
+					         controller, e.getMessage(), e);
+				success = false;
+			}
+		}
+		
+		success = TopicEndpoint.manager.unlock() && success;
+		
+		/* policy-engine dispatch after unlock hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterUnlock(this))
+					return success;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-unlock failure because of {}",  
+				         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized boolean isLocked() {
+		return this.locked;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removePolicyController(String name) {
+		PolicyController.factory.destroy(name);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void removePolicyController(PolicyController controller) {
+		PolicyController.factory.destroy(controller);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<PolicyController> getPolicyControllers() {
+		return PolicyController.factory.inventory();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonProperty("controllers")
+	@Override
+	public List<String> getPolicyControllerIds() {
+		List<String> controllerNames = new ArrayList<String>();
+		for (PolicyController controller: PolicyController.factory.inventory()) {
+			controllerNames.add(controller.getName());
+		}
+		return controllerNames;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	@JsonIgnore
+	public Properties getProperties() {
+		return this.properties;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<TopicSource> getSources() {
+		return (List<TopicSource>) this.sources;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<TopicSink> getSinks() {
+		return (List<TopicSink>) this.sinks;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<HttpServletServer> getHttpServers() {
+		return this.httpServers;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<String> getFeatures() {
+		List<String> features = new ArrayList<String>();
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			features.add(feature.getName());
+		}
+		return features;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@JsonIgnore
+	@Override
+	public List<PolicyEngineFeatureAPI> getFeatureProviders() {
+		return PolicyEngineFeatureAPI.providers.getList();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public PolicyEngineFeatureAPI getFeatureProvider(String featureName) throws IllegalArgumentException {
+		if (featureName == null || featureName.isEmpty())
+			throw new IllegalArgumentException("A feature name must be provided");
+		
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			if (feature.getName().equals(featureName))
+				return feature;
+		}
+		
+		throw new IllegalArgumentException("Invalid Feature Name: " + featureName);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
+		/* configuration request */
+		try {
+			PdpdConfiguration configuration = this.decoder.fromJson(event, PdpdConfiguration.class);
+			this.configure(configuration);
+		} catch (Exception e) {
+			logger.error("{}: configuration-error due to {} because of {}", 
+					     this, event, e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException {
+		
+		/*
+		 * Note this entry point is usually from the DRL
+		 */
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		if (event == null)
+			throw new IllegalArgumentException("Invalid Event");
+			
+		if (!this.isAlive())
+			throw new IllegalStateException("Policy Engine is stopped");
+		
+		if (this.isLocked())
+			throw new IllegalStateException("Policy Engine is locked");
+		
+		List<? extends TopicSink> sinks = 
+				TopicEndpoint.manager.getTopicSinks(topic);
+		if (sinks == null || sinks.isEmpty() || sinks.size() > 1)
+			throw new IllegalStateException
+				("Cannot ensure correct delivery on topic " + topic + ": " + sinks);		
+
+		return this.deliver(sinks.get(0).getTopicCommInfrastructure(), 
+				            topic, event);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(String busType, String topic, Object event) 
+			throws IllegalArgumentException, IllegalStateException,
+		       UnsupportedOperationException {
+		
+		/*
+		 * Note this entry point is usually from the DRL (one of the reasons
+		 * busType is String.
+		 */
+		
+		if (busType == null || busType.isEmpty())
+			throw new IllegalArgumentException
+				("Invalid Communication Infrastructure");
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		if (event == null)
+			throw new IllegalArgumentException("Invalid Event");
+		
+		boolean valid = false;
+		for (Topic.CommInfrastructure comm: Topic.CommInfrastructure.values()) {
+			if (comm.name().equals(busType)) {
+				valid = true;
+			}
+		}
+		
+		if (!valid)
+			throw new IllegalArgumentException
+				("Invalid Communication Infrastructure: " + busType);
+		
+		
+		if (!this.isAlive())
+			throw new IllegalStateException("Policy Engine is stopped");
+		
+		if (this.isLocked())
+			throw new IllegalStateException("Policy Engine is locked");
+		
+
+		return this.deliver(Topic.CommInfrastructure.valueOf(busType), 
+				            topic, event);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(Topic.CommInfrastructure busType, 
+			               String topic, Object event) 
+		throws IllegalArgumentException, IllegalStateException,
+		       UnsupportedOperationException {
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		if (event == null)
+			throw new IllegalArgumentException("Invalid Event");
+		
+		if (!this.isAlive())
+			throw new IllegalStateException("Policy Engine is stopped");
+		
+		if (this.isLocked())
+			throw new IllegalStateException("Policy Engine is locked");
+		
+		/* Try to send through the controller, this is the
+		 * preferred way, since it may want to apply additional
+		 * processing
+		 */
+		try {
+			DroolsController droolsController = 
+					EventProtocolCoder.manager.getDroolsController(topic, event);
+			PolicyController controller = PolicyController.factory.get(droolsController);
+			if (controller != null)
+				return controller.deliver(busType, topic, event);
+		} catch (Exception e) {
+			logger.warn("{}: cannot find policy-controller to deliver {} over {}:{} because of {}", 
+					    this, event, busType, topic, e.getMessage(), e);
+			
+			/* continue (try without routing through the controller) */
+		}
+		
+		/*
+		 * cannot route through the controller, send directly through
+		 * the topic sink
+		 */
+		try {			
+			String json = EventProtocolCoder.manager.encode(topic, event);
+			return this.deliver(busType, topic, json);
+
+		} catch (Exception e) {
+			logger.warn("{}: cannot deliver {} over {}:{} because of {}", 
+				        this, event, busType, topic, e.getMessage(), e);
+			throw e;
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(Topic.CommInfrastructure busType, 
+			               String topic, String event) 
+		throws IllegalArgumentException, IllegalStateException,
+		       UnsupportedOperationException {
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		if (event == null || event.isEmpty())
+			throw new IllegalArgumentException("Invalid Event");
+		
+		if (!this.isAlive())
+			throw new IllegalStateException("Policy Engine is stopped");
+		
+		if (this.isLocked())
+			throw new IllegalStateException("Policy Engine is locked");
+		
+		try {
+			TopicSink sink = 
+					TopicEndpoint.manager.getTopicSink
+						(busType, topic);
+			
+			if (sink == null)
+				throw new IllegalStateException("Inconsistent State: " + this);
+			
+			return sink.send(event);
+
+		} catch (Exception e) {
+			logger.warn("{}: cannot deliver {} over {}:{} because of {}", 
+			            this, event, busType, topic, e.getMessage(), e);
+			throw e;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized void activate() {
+		
+		/* policy-engine dispatch pre activate hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeActivate(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-activate failure because of {}",  
+				             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+
+		// activate 'policy-management'
+		for (PolicyController policyController : getPolicyControllers()) {
+			try {
+				policyController.unlock();
+				policyController.start();
+			} catch (Exception e) {
+				logger.error("{}: cannot activate of policy-controller {} because of {}", 
+				             this, policyController,e.getMessage(), e);
+			} catch (LinkageError e) {
+				logger.error("{}: cannot activate (rules compilation) of policy-controller {} because of {}", 
+			                 this, policyController,e.getMessage(), e);
+			}
+		}
+		
+		this.unlock();
+		
+		/* policy-engine dispatch post activate hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterActivate(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-activate failure because of {}",  
+				             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public synchronized void deactivate() {
+		
+		/* policy-engine dispatch pre deactivate hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeDeactivate(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-deactivate failure because of {}",  
+				              this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		this.lock();
+		
+		for (PolicyController policyController : getPolicyControllers()) {
+			try { 
+				policyController.stop();
+			} catch (Exception e) {
+				logger.error("{}: cannot deactivate (stop) policy-controller {} because of {}", 
+			                 this, policyController, e.getMessage(), e);
+			} catch (LinkageError e) {
+				logger.error("{}: cannot deactivate (stop) policy-controller {} because of {}", 
+		                     this, policyController, e.getMessage(), e);
+			}
+		}
+		
+		/* policy-engine dispatch post deactivate hook */
+		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterDeactivate(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-deactivate failure because of {}",  
+				             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("PolicyEngineManager [alive=").append(alive).append(", locked=").append(locked).append("]");
+		return builder.toString();
+	}
+	
+}
+
+
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
new file mode 100644
index 00000000..e67e542f
--- /dev/null
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
@@ -0,0 +1,626 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.system.internal;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.event.comm.Topic;
+import org.onap.policy.drools.event.comm.TopicEndpoint;
+import org.onap.policy.drools.event.comm.TopicListener;
+import org.onap.policy.drools.event.comm.TopicSink;
+import org.onap.policy.drools.event.comm.TopicSource;
+import org.onap.policy.drools.features.PolicyControllerFeatureAPI;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.drools.properties.PolicyProperties;
+import org.onap.policy.drools.protocol.configuration.DroolsConfiguration;
+import org.onap.policy.drools.system.PolicyController;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * This implementation of the Policy Controller merely aggregates and tracks for
+ * management purposes all underlying resources that this controller depends upon.
+ */
+public class AggregatedPolicyController implements PolicyController, 
+                                                   TopicListener {
+	
+	/**
+	 * Logger
+	 */
+	private static Logger logger = LoggerFactory.getLogger(AggregatedPolicyController.class); 
+	
+	/**
+	 * identifier for this policy controller
+	 */
+	protected final String name;
+	
+	/**
+	 * Abstracted Event Sources List regardless communication
+	 * technology
+	 */
+	protected final List<? extends TopicSource> sources;
+	
+	/**
+	 * Abstracted Event Sinks List regardless communication
+	 * technology
+	 */
+	protected final List<? extends TopicSink> sinks;
+	
+	/**
+	 * Mapping topics to sinks
+	 */
+	@JsonIgnore
+	protected final HashMap<String, TopicSink> topic2Sinks =
+		new HashMap<String, TopicSink>();
+	
+	/**
+	 * Is this Policy Controller running (alive) ?
+	 * reflects invocation of start()/stop() only
+	 */
+	protected volatile boolean alive;
+	
+	/**
+	 * Is this Policy Controller locked ?
+	 * reflects if i/o controller related operations and start 
+	 * are permitted,
+	 * more specifically: start(), deliver() and onTopicEvent().
+	 * It does not affect the ability to stop the
+	 * underlying drools infrastructure 
+	 */
+	protected volatile boolean locked;
+	
+	/**
+	 * Policy Drools Controller
+	 */
+	protected volatile DroolsController droolsController;
+	
+	/**
+	 * Properties used to initialize controller
+	 */
+	protected final Properties properties;
+	
+	/**
+	 * Constructor version mainly used for bootstrapping at initialization time
+	 * a policy engine controller
+	 * 
+	 * @param name controller name
+	 * @param properties
+	 * 
+	 * @throws IllegalArgumentException when invalid arguments are provided
+	 */
+	public AggregatedPolicyController(String name, Properties properties) 
+			throws IllegalArgumentException {
+		
+		this.name = name;
+		
+		/*
+		 * 1. Register read topics with network infrastructure (ueb, dmaap, rest)
+		 * 2. Register write topics with network infrastructure (ueb, dmaap, rest)
+		 * 3. Register with drools infrastructure
+		 */
+		
+		// Create/Reuse Readers/Writers for all event sources endpoints
+		
+		this.sources = TopicEndpoint.manager.addTopicSources(properties);
+		this.sinks = TopicEndpoint.manager.addTopicSinks(properties);
+		
+		initDrools(properties);		
+		initSinks();		
+		
+		/* persist new properties */
+		SystemPersistence.manager.storeController(name, properties);	
+		this.properties = properties;
+	}
+	
+	/**
+	 * initialize drools layer
+	 * @throws IllegalArgumentException if invalid parameters are passed in
+	 */
+	protected void initDrools(Properties properties) throws IllegalArgumentException {
+		try {
+			// Register with drools infrastructure
+			this.droolsController = DroolsController.factory.build(properties, sources, sinks);
+		} catch (Exception | LinkageError e) {
+			logger.error("{}: cannot init-drools because of {}", this, e.getMessage(), e);
+			throw new IllegalArgumentException(e);
+		}
+	}
+	
+	/**
+	 * initialize sinks
+	 * @throws IllegalArgumentException if invalid parameters are passed in
+	 */
+	protected void initSinks() throws IllegalArgumentException {
+		this.topic2Sinks.clear();
+		for (TopicSink sink: sinks) {
+			this.topic2Sinks.put(sink.getTopic(), sink);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean updateDrools(DroolsConfiguration newDroolsConfiguration) {
+		
+		DroolsConfiguration oldDroolsConfiguration =
+				new DroolsConfiguration(this.droolsController.getArtifactId(),
+										this.droolsController.getGroupId(), 
+				                        this.droolsController.getVersion());
+		
+		if (oldDroolsConfiguration.getGroupId().equalsIgnoreCase(newDroolsConfiguration.getGroupId()) &&
+			oldDroolsConfiguration.getArtifactId().equalsIgnoreCase(newDroolsConfiguration.getArtifactId()) &&
+			oldDroolsConfiguration.getVersion().equalsIgnoreCase(newDroolsConfiguration.getVersion())) {
+			logger.warn("{}: cannot update-drools: identical configuration {} vs {}", 
+					    this, oldDroolsConfiguration, newDroolsConfiguration);
+			return true;
+		}
+		
+		try {
+			/* Drools Controller created, update initialization properties for restarts */
+			
+			this.properties.setProperty(PolicyProperties.RULES_GROUPID, newDroolsConfiguration.getGroupId());
+			this.properties.setProperty(PolicyProperties.RULES_ARTIFACTID, newDroolsConfiguration.getArtifactId());
+			this.properties.setProperty(PolicyProperties.RULES_VERSION, newDroolsConfiguration.getVersion());
+					
+			SystemPersistence.manager.storeController(name, this.properties);
+			
+			this.initDrools(this.properties);
+			
+			/* set drools controller to current locked status */
+			
+			if (this.isLocked())
+				this.droolsController.lock();
+			else
+				this.droolsController.unlock();
+			
+			/* set drools controller to current alive status */
+			
+			if (this.isAlive())
+				this.droolsController.start();
+			else
+				this.droolsController.stop();
+			
+		} catch (IllegalArgumentException e) {
+			logger.error("{}: cannot update-drools because of {}", this, e.getMessage(), e);
+			return false;
+		}	
+		
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean start() throws IllegalStateException {		
+		logger.info("{}: start", this);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeStart(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-start failure because of {}",  
+			                 this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		if (this.isLocked())
+			throw new IllegalStateException("Policy Controller " + name  + " is locked");
+
+		synchronized(this) {
+			if (this.alive)
+				return true;
+			
+			this.alive = true;
+		}
+
+		boolean success = this.droolsController.start();
+		
+		// register for events
+		
+		for (TopicSource source: sources) {
+			source.register(this);
+		}
+		
+		for (TopicSink sink: sinks) {
+			try {
+				sink.start();
+			} catch (Exception e) {
+				logger.error("{}: cannot start {} because of {}",  
+		                     this, sink, e.getMessage(), e);
+			}
+		}
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterStart(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-start failure because of {}",  
+		                     this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean stop() {
+		logger.info("{}: stop", this);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeStop(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-stop failure because of {}",  
+		                     this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		/* stop regardless locked state */
+		
+		synchronized(this) {
+			if (!this.alive)
+				return true;
+			
+			this.alive = false;
+		}
+		
+		// 1. Stop registration
+		
+		for (TopicSource source: sources) {
+			source.unregister(this);
+		}
+		
+		boolean success = this.droolsController.stop();
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterStop(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-stop failure because of {}",  
+	                         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void shutdown() throws IllegalStateException {
+		logger.info("{}: shutdown", this);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeShutdown(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-shutdown failure because of {}",  
+	                         this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		this.stop();
+		
+		DroolsController.factory.shutdown(this.droolsController);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterShutdown(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-shutdown failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void halt() throws IllegalStateException {
+		logger.info("{}: halt", this);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeHalt(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-halt failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		this.stop();	
+		DroolsController.factory.destroy(this.droolsController);
+		SystemPersistence.manager.deleteController(this.name);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterHalt(this))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-halt failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void onTopicEvent(Topic.CommInfrastructure commType, 
+			                    String topic, String event) {
+
+		if (logger.isDebugEnabled())
+			logger.debug("{}: event offered from {}:{}: {}", this, commType, topic, event);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeOffer(this, commType, topic, event))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-offer failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		if (this.locked)
+			return;
+		
+		if (!this.alive)
+			return;
+		
+		boolean success = this.droolsController.offer(topic, event);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterOffer(this, commType, topic, event, success))
+					return;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-offer failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean deliver(Topic.CommInfrastructure commType, 
+			               String topic, Object event)
+		throws IllegalArgumentException, IllegalStateException,
+               UnsupportedOperationException {	
+		
+		if (logger.isDebugEnabled())
+			logger.debug("{}: deliver event to {}:{}: {}", this, commType, topic, event);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeDeliver(this, commType, topic, event))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-deliver failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		if (topic == null || topic.isEmpty())
+			throw new IllegalArgumentException("Invalid Topic");
+		
+		if (event == null)
+			throw new IllegalArgumentException("Invalid Event");
+		
+		if (!this.isAlive())
+			throw new IllegalStateException("Policy Engine is stopped");
+		
+		if (this.isLocked())
+			throw new IllegalStateException("Policy Engine is locked");
+		
+		if (!this.topic2Sinks.containsKey(topic)) {
+			logger.warn("{}: cannot deliver event because the sink {}:{} is not registered: {}", 
+					     this, commType, topic, event);
+			throw new IllegalArgumentException("Unsuported topic " + topic + " for delivery");
+		}
+		
+		boolean success = this.droolsController.deliver(this.topic2Sinks.get(topic), event);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterDeliver(this, commType, topic, event, success))
+					return success;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-deliver failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isAlive() {
+		return this.alive;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean lock() {
+		logger.info("{}: lock", this);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeLock(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-lock failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		synchronized(this) {
+			if (this.locked)
+				return true;
+			
+			this.locked = true;
+		}
+		
+		// it does not affect associated sources/sinks, they are
+		// autonomous entities
+		
+		boolean success = this.droolsController.lock();
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterLock(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-lock failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean unlock() {
+		
+		logger.info("{}: unlock", this);
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.beforeUnlock(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} before-unlock failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		synchronized(this) {
+			if (!this.locked)
+				return true;
+			
+			this.locked = false;
+		}
+		
+		boolean success = this.droolsController.unlock();
+		
+		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
+			try {
+				if (feature.afterUnlock(this))
+					return true;
+			} catch (Exception e) {
+				logger.error("{}: feature {} after-unlock failure because of {}",  
+                             this, feature.getClass().getName(), e.getMessage(), e);
+			}
+		}
+		
+		return success;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLocked() {
+		return this.locked;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSource> getTopicSources() {
+		return this.sources;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<? extends TopicSink> getTopicSinks() {
+		return this.sinks;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public DroolsController getDrools() {
+		return this.droolsController;
+	}
+	
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	@JsonIgnore
+	public Properties getProperties() {
+		return this.properties;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("AggregatedPolicyController [name=").append(name).append(", alive=").append(alive).append(", locked=").append(locked)
+				.append(", droolsController=").append(droolsController).append("]");
+		return builder.toString();
+	}
+
+}
+
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java b/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java
deleted file mode 100644
index 251cef11..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsController.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-
-/**
- * Drools Controller is the abstractions that wraps the
- * drools layer (policy-core)
- */
-public interface DroolsController extends Startable, Lockable {	
-	
-	/**
-	 * No Group ID identifier
-	 */
-	public static final String NO_GROUP_ID = "NO-GROUP-ID";
-
-	/**
-	 * No Artifact ID identifier
-	 */
-	public static final String NO_ARTIFACT_ID = "NO-ARTIFACT-ID";
-	
-	/**
-	 * No version identifier
-	 */
-	public static final String NO_VERSION = "NO-VERSION";
-	
-	/**
-	 * get group id
-	 * @return group id
-	 */
-	public String getGroupId();
-	
-	/**
-	 * get artifact id
-	 * @return artifact id
-	 */	
-	public String getArtifactId();
-	
-	/**
-	 * get version
-	 * @return version
-	 */
-	public String getVersion();
-
-	/**
-	 * return the policy session names
-	 * 
-	 * @return policy session
-	 */
-	public List<String> getSessionNames();	
-	
-	/**
-	 * return the policy full session names
-	 * 
-	 * @return policy session
-	 */
-	public List<String> getCanonicalSessionNames();
-	
-	/**
-	 * offers an event to this controller for processing
-	 * 
-	 * @param topic topic associated with the event
-	 * @param event the event
-	 * 
-	 * @return true if the operation was successful
-	 */
-	public boolean offer(String topic, String event);
-	
-	/**
-	 * delivers "event" to "sink"
-	 * 
-	 * @param sink destination
-	 * @param event 
-	 * @return true if successful, false if a failure has occurred.
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted (ie. locked or stopped).
-	 * @throws UnsupportedOperationException when the engine cannot deliver due
-	 *         to the functionality missing (ie. communication infrastructure
-	 *         not supported.
-	 */
-	public boolean deliver(TopicSink sink, Object event)
-			throws IllegalArgumentException, IllegalStateException, 
-		           UnsupportedOperationException;
-	
-	/**
-	 * 
-	 * @return the most recent received events
-	 */
-	public Object[] getRecentSourceEvents();
-
-	/**
-	 * 
-	 * @return the most recent delivered events 
-	 */
-	public String[] getRecentSinkEvents();
-	
-	/**
-	 * @return the underlying policy container
-	 */
-	public PolicyContainer getContainer();
-	
-	/**
-	 * Supports this encoder?
-	 * 
-	 * @param encodedObject
-	 * @return
-	 */
-	public boolean ownsCoder(Class<? extends Object> coderClass, int modelHash) throws IllegalStateException;
-	
-	/**
-	 * fetches a class from the model
-	 * 
-	 * @param className the class to fetch
-	 * @return the actual class object, or null if not found
-	 */
-	public Class<?> fetchModelClass(String className) throws IllegalArgumentException;
-	
-	/**
-	 * is this controller Smart?
-	 */
-	public boolean isBrained();
-	
-	/**
-	 * update the new version of the maven jar rules file
-	 * 
-	 * @param newGroupId - new group id
-	 * @param newArtifactId - new artifact id
-	 * @param newVersion - new version
-	 * @param decoderConfigurations - decoder configurations
-	 * @param encoderConfigurations - encoder configurations
-	 * 
-	 * @throws Exception from within drools libraries
-	 * @throws LinkageError from within drools libraries
-	 * @throws ArgumentException bad parameter passed in
-	 */
-	public void updateToVersion(String newGroupId, String newArtifactId, String newVersion,
-			List<TopicCoderFilterConfiguration> decoderConfigurations,
-			List<TopicCoderFilterConfiguration> encoderConfigurations)
-	throws IllegalArgumentException, LinkageError, Exception;
-
-	/**
-	 * gets the classnames of facts as well as the current count
-	 * @param sessionName the session name
-	 * @return map of class to count
-	 */
-	public Map<String,Integer> factClassNames(String sessionName) throws IllegalArgumentException;	
-	
-	/**
-	 * gets the count of facts for a given session
-	 * @param sessionName the session name
-	 * @return the fact count 
-	 * @throws IllegalArgumentException
-	 */
-	public long factCount(String sessionName) throws IllegalArgumentException;
-	
-	/**
-	 * gets all the facts of a given class for a given session
-	 *  
-	 * @param sessionName the session identifier
-	 * @param className the class type
-	 * @param delete retract from drools the results of the query?
-	 * @return the list of facts returned by the query
-	 */
-	public List<Object> facts(String sessionName, String className, boolean delete);
-
-	/**
-	 * gets the facts associated with a query for a give session for a given queried entity
-	 * 
-	 * @param sessionName the session
-	 * @param queryName the query identifier
-	 * @param queriedEntity the queried entity
-	 * @param delete retract from drools the results of the query?
-	 * @param queryParams query parameters
-	 * @return list of facts returned by the query
-	 */
-	public List<Object> factQuery(String sessionName, String queryName, String queriedEntity, 
-			                      boolean delete, Object... queryParams);
-	
-	/**
-	 * halts and permanently releases all resources
-	 * @throws IllegalStateException
-	 */
-	public void halt() throws IllegalStateException;
-	
-	/**
-	 * Factory to track and manage drools controllers
-	 */
-	public static final DroolsControllerFactory factory = 
-									new IndexedDroolsControllerFactory();
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java b/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java
deleted file mode 100644
index 625eef56..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/DroolsControllerFactory.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.controller.internal.MavenDroolsController;
-import org.openecomp.policy.drools.controller.internal.NullDroolsController;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
-import org.openecomp.policy.drools.utils.Pair;
-
-/**
- * Drools Controller Factory to manage controller creation, destruction,
- * and retrieval for management interfaces
- */
-public interface DroolsControllerFactory {
-	
-	/**
-	 * Constructs a Drools Controller based on properties
-	 * 
-	 * @param properties properties containing initialization parameters
-	 * @param eventSources list of event sources
-	 * @param eventSinks list of event sinks
-	 * 
-	 * @return the instantiated Drools Controller
-	 * @throws IllegalArgumentException with invalid parameters
-	 * @throws LinkageError Failure to link rules and models in Drools Libraries
-	 * @throws Exception Exception from Drools Libraries
-	 */
-	public DroolsController build(Properties properties,
-								  List<? extends TopicSource> eventSources, 
-								  List<? extends TopicSink> eventSinks)
-			throws IllegalArgumentException, LinkageError, Exception;
-	
-	/**
-	 * Explicit construction of a Drools Controller
-	 * 
-	 * @param groupId maven group id of drools artifact
-	 * @param artifactId maven artifact id of drools artifact
-	 * @param version maven version id of drools artifact
-	 * @param decoderConfigurations list of decoder configurations
-	 * @param encoderConfigurations list of encoder configurations
-	 * 
-	 * @return the instantiated Drools Controller
-	 * @throws IllegalArgumentException with invalid parameters
-	 * @throws LinkageError Failure to link rules and models in Drools Libraries
-	 * @throws Exception Exception from Drools Libraries
-	 */
-	public DroolsController build(String groupId, 
-			 					  String artifactId, 
-			 					  String version,
-			 					  List<TopicCoderFilterConfiguration> decoderConfigurations,
-			 					  List<TopicCoderFilterConfiguration> encoderConfigurations)
-			throws IllegalArgumentException, LinkageError, Exception;
-	
-	/**
-	 * Releases the Drools Controller from operation
-	 * 
-	 * @param controller the Drools Controller to shut down
-	 */
-	public void shutdown(DroolsController controller);
-	
-	/**
-	 * Disables all Drools Controllers from operation
-	 */
-	public void shutdown();
-	
-	/**
-	 * Destroys and releases resources for a Drools Controller
-	 * 
-	 * @param controller the Drools Controller to destroy
-	 */
-	public void destroy(DroolsController controller);
-	
-	/**
-	 * Destroys all Drools Controllers
-	 */
-	public void destroy();
-	
-	/**
-	 * Gets the Drools Controller associated with the maven group 
-	 * and artifact id
-	 * 
-	 * @param groupId maven group id of drools artifact
-	 * @param artifactId maven artifact id of drools artifact
-	 * @param version maven version id of drools artifact
-	 * 
-	 * @return the Drools Controller
-	 * @throws IllegalArgumentException with invalid parameters
-	 */
-	public DroolsController get(String groupId, 
-							    String artifactId,
-								String version)
-			throws IllegalArgumentException;
-
-	/**
-	 * returns the current inventory of Drools Controllers
-	 * 
-	 * @return a list of Drools Controllers
-	 */
-	public List<DroolsController> inventory();
-}
-
-/* ---------------- implementation -----------------*/
-
-/**
- * Factory of Drools Controllers indexed by the Maven coordinates 
- */
-class IndexedDroolsControllerFactory implements DroolsControllerFactory {
-
-	/**
-	 * logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(MavenDroolsController.class);
-	
-	/**
-	 * Policy Controller Name Index
-	 */
-	protected HashMap<String, DroolsController> droolsControllers =
-									new HashMap<String, DroolsController>();
-	
-	/**
-	 * Null Drools Controller
-	 */
-	protected NullDroolsController nullDroolsController = new NullDroolsController();
-	
-	
-	public IndexedDroolsControllerFactory() {
-		
-		/* Add a NULL controller which will always be present in the hash */
-		
-		DroolsController controller = new NullDroolsController();
-		String controllerId = controller.getGroupId() + ":" + controller.getArtifactId();
-
-		synchronized(this) {
-			droolsControllers.put(controllerId, controller);
-		}	
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DroolsController build(Properties properties,
-								  List<? extends TopicSource> eventSources,
-								  List<? extends TopicSink> eventSinks) 
-			throws IllegalArgumentException, LinkageError, Exception {
-		
-		String groupId = properties.getProperty(PolicyProperties.RULES_GROUPID);
-		if (groupId == null || groupId.isEmpty())
-			groupId =  DroolsController.NO_GROUP_ID;	
-	
-		String artifactId = properties.getProperty(PolicyProperties.RULES_ARTIFACTID);
-		if (artifactId == null || artifactId.isEmpty())
-			artifactId =  DroolsController.NO_ARTIFACT_ID;
-		
-		String version = properties.getProperty(PolicyProperties.RULES_VERSION);
-		if (version == null || version.isEmpty())
-			version =  DroolsController.NO_VERSION;
-		
-		List<TopicCoderFilterConfiguration> 
-			topics2DecodedClasses2Filters = codersAndFilters(properties, eventSources);
-		
-		List<TopicCoderFilterConfiguration> 
-			topics2EncodedClasses2Filters = codersAndFilters(properties, eventSinks);
-		
-		return this.build(groupId, artifactId, version, 
-						  topics2DecodedClasses2Filters,
-				          topics2EncodedClasses2Filters);
-	}
-
-	/**
-	 * find out decoder classes and filters
-	 * 
-	 * @param properties properties with information about decoders
-	 * @param topicEntities topic sources
-	 * @return list of topics, each with associated decoder classes, each
-	 *         with a list of associated filters
-	 * @throws IllegalArgumentException invalid input data
-	 */
-	protected List<TopicCoderFilterConfiguration> codersAndFilters
-					(Properties properties, List<? extends Topic> topicEntities) 
-				throws IllegalArgumentException {
-		
-		String PROPERTY_TOPIC_ENTITY_PREFIX;
-		
-		List<TopicCoderFilterConfiguration>
-			topics2DecodedClasses2Filters =
-					new ArrayList<TopicCoderFilterConfiguration>();
-		
-		if (topicEntities.isEmpty())
-			return topics2DecodedClasses2Filters;
-				
-		for (Topic topic: topicEntities) {
-			
-			/* source or sink ? ueb or dmaap? */
-			boolean isSource = (topic instanceof TopicSource);
-			CommInfrastructure commInfra = topic.getTopicCommInfrastructure();
-			if (commInfra == CommInfrastructure.UEB) {
-				if (isSource) {
-					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_UEB_SOURCE_TOPICS + ".";
-				} else {
-					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_UEB_SINK_TOPICS + ".";
-				}
-			} else if (commInfra == CommInfrastructure.DMAAP) {
-				if (isSource) {
-					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_DMAAP_SOURCE_TOPICS + ".";
-				} else {
-					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_DMAAP_SINK_TOPICS + ".";
-				}
-			} else if (commInfra == CommInfrastructure.NOOP) {
-				if (!isSource)
-					PROPERTY_TOPIC_ENTITY_PREFIX = PolicyProperties.PROPERTY_NOOP_SINK_TOPICS + ".";
-				else
-					continue;
-			} else {
-				throw new IllegalArgumentException("Invalid Communication Infrastructure: " + commInfra);
-			}
-			
-			// 1. first the topic
-			
-			String aTopic = topic.getTopic();
-			
-			// 2.  check if there is a custom decoder for this topic that the user prefers to use
-			//     instead of the ones provided in the platform
-
-			String customGson = properties.getProperty
-					(PROPERTY_TOPIC_ENTITY_PREFIX + 
-					 aTopic + 
-					 PolicyProperties.PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_GSON_SUFFIX);
-			
-			CustomGsonCoder customGsonCoder = null;
-			if (customGson != null && !customGson.isEmpty()) {
-				try {
-					customGsonCoder =  new CustomGsonCoder(customGson);
-				} catch (IllegalArgumentException e) {
-					logger.warn("{}: cannot create custom-gson-coder {} because of {}", 
-							    this, customGson, e.getMessage(), e);
-				}
-			}
-			
-			String customJackson = properties.getProperty
-					(PROPERTY_TOPIC_ENTITY_PREFIX + 
-					 aTopic + 
-					 PolicyProperties.PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_JACKSON_SUFFIX);
-			
-			CustomJacksonCoder customJacksonCoder = null;
-			if (customJackson != null && !customJackson.isEmpty()) {
-				try {
-					customJacksonCoder =  new CustomJacksonCoder(customJackson);
-				} catch (IllegalArgumentException e) {
-					logger.warn("{}: cannot create custom-jackson-coder {} because of {}", 
-						        this, customJackson, e.getMessage(), e);
-				}
-			}
-			
-			// 3. second the list of classes associated with each topic
-			
-			String eventClasses = 
-					properties.getProperty(PROPERTY_TOPIC_ENTITY_PREFIX + aTopic + PolicyProperties.PROPERTY_TOPIC_EVENTS_SUFFIX);
-			
-			if (eventClasses == null || eventClasses.isEmpty()) {
-				// TODO warn
-				continue;
-			}
-			
-			List<PotentialCoderFilter> classes2Filters = new ArrayList<PotentialCoderFilter>();
-			
-			List<String> aTopicClasses = 
-					new ArrayList<String>(Arrays.asList(eventClasses.split("\\s*,\\s*")));
-			
-			for (String aClass: aTopicClasses) {
-				
-				
-				// 4. third, for each coder class, get the list of field filters
-				
-				String filter = properties.getProperty
-						(PROPERTY_TOPIC_ENTITY_PREFIX + 
-						 aTopic + 
-						 PolicyProperties.PROPERTY_TOPIC_EVENTS_SUFFIX + 
-						 "." + aClass + 
-						 PolicyProperties.PROPERTY_TOPIC_EVENTS_FILTER_SUFFIX);
-				
-				List<Pair<String,String>> filters = new ArrayList<Pair<String,String>>();
-				
-				if (filter == null || filter.isEmpty()) {
-					// 4. topic -> class -> with no filters
-					
-					JsonProtocolFilter protocolFilter = JsonProtocolFilter.fromRawFilters(filters);
-					PotentialCoderFilter class2Filters = 
-							new PotentialCoderFilter(aClass, protocolFilter);
-					classes2Filters.add(class2Filters);
-					continue;
-				}
-				
-				// There are filters associated with the applicability of
-				// this class for decoding.
-				List<String> listOfFilters = 
-						new ArrayList<String>(Arrays.asList(filter.split("\\s*,\\s*")));
-				
-				for (String nameValue: listOfFilters) {
-					String fieldName;
-					String regexValue;
-					
-					String[] nameValueSplit = nameValue.split("\\s*=\\s*");
-					if (nameValueSplit.length <= 0 || nameValueSplit.length > 2) {
-						// TODO warn
-						// skip
-						continue;
-					}
-					
-					if (nameValueSplit.length == 2) {
-						fieldName = nameValueSplit[0];
-						regexValue = nameValueSplit[1];
-					} else if (nameValueSplit.length == 1) {
-						fieldName = nameValueSplit[0];
-						regexValue = null;
-					} else {
-						// unreachable 
-						continue;
-					}
-					
-					filters.add(new Pair<String,String>(fieldName, regexValue));
-				}
-				
-				JsonProtocolFilter protocolFilter = JsonProtocolFilter.fromRawFilters(filters);
-				PotentialCoderFilter class2Filters = 
-						new PotentialCoderFilter(aClass, protocolFilter);
-				classes2Filters.add(class2Filters);
-			}
-			
-			TopicCoderFilterConfiguration topic2Classes2Filters =
-						new TopicCoderFilterConfiguration(aTopic,classes2Filters, customGsonCoder, customJacksonCoder);
-			topics2DecodedClasses2Filters.add(topic2Classes2Filters);
-		}
-		
-		return topics2DecodedClasses2Filters;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @param decoderConfiguration 
-	 */
-	@Override
-	public DroolsController build(String newGroupId, 
-			 					  String newArtifactId, 
-			                      String newVersion, 
-			                      List<TopicCoderFilterConfiguration> decoderConfigurations,
-			                      List<TopicCoderFilterConfiguration> encoderConfigurations)
-			throws IllegalArgumentException, LinkageError, Exception {
-		
-		if (newGroupId == null || newArtifactId == null || newVersion == null ||
-			newGroupId.isEmpty() || newArtifactId.isEmpty() || newVersion.isEmpty()) {
-				throw new IllegalArgumentException("Missing maven coordinates: " + 
-						                           newGroupId + ":" + newArtifactId + ":" + 
-						                           newVersion);
-		}
-		
-		String controllerId = newGroupId + ":" + newArtifactId;
-		DroolsController controllerCopy = null;
-		synchronized (this) {
-			/*
-			 * The Null Drools Controller for no maven coordinates is always here
-			 * so when no coordinates present, this is the return point
-			 * 
-			 * assert (controllerCopy instanceof NullDroolsController)
-			 */
-			if (droolsControllers.containsKey(controllerId)) {
-				controllerCopy = droolsControllers.get(controllerId);
-				if (controllerCopy.getVersion().equalsIgnoreCase(newVersion)) {
-					return controllerCopy;
-				}
-			}	
-		}
-		
-		if (controllerCopy != null) {
-			/* 
-			 * a controller keyed by group id + artifact id exists
-			 * but with different version => version upgrade/downgrade 
-			 */
-			
-			controllerCopy.updateToVersion(newGroupId, newArtifactId, newVersion, 
-					                       decoderConfigurations, encoderConfigurations);
-			
-			return controllerCopy;			
-		}
-		
-		/* new drools controller */
-		
-		DroolsController controller = new MavenDroolsController
-												(newGroupId, newArtifactId, newVersion, 
-											     decoderConfigurations,
-											     encoderConfigurations);
-		
-		synchronized(this) {
-			droolsControllers.put(controllerId, controller);
-		}
-
-		return controller;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(DroolsController controller) throws IllegalArgumentException {
-		unmanage(controller);
-		controller.halt();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy() {
-		List<DroolsController> controllers = this.inventory();
-		for (DroolsController controller: controllers) {
-			controller.halt();
-		}
-		
-		synchronized(this) {
-			this.droolsControllers.clear();
-		}
-	}
-
-	/**
-	 * unmanage the drools controller
-	 * 
-	 * @param controller
-	 * @return
-	 * @throws IllegalArgumentException
-	 */
-	protected void unmanage(DroolsController controller) throws IllegalArgumentException {
-		if (controller == null) {
-			throw new IllegalArgumentException("No controller provided");
-		}
-		
-		if (!controller.isBrained()) {	
-			logger.info("Drools Controller is NOT OPERATIONAL - nothing to destroy");
-			return;
-		}
-		
-		String controllerId = controller.getGroupId() + ":" + controller.getArtifactId();
-		synchronized(this) {
-			if (!this.droolsControllers.containsKey(controllerId)) {
-				return;
-			}
-			
-			droolsControllers.remove(controllerId);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown(DroolsController controller) throws IllegalArgumentException {
-		this.unmanage(controller);
-		controller.shutdown();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() {
-		List<DroolsController> controllers = this.inventory();
-		for (DroolsController controller: controllers) {
-			controller.shutdown();
-		}
-		
-		synchronized(this) {
-			this.droolsControllers.clear();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DroolsController get(String groupId, 
-			                    String artifactId, 
-			                    String version)
-			throws IllegalArgumentException, IllegalStateException {
-		
-		if (groupId == null || artifactId == null ||
-			groupId.isEmpty() || artifactId.isEmpty()) {
-			throw new IllegalArgumentException("Missing maven coordinates: " + 
-								               groupId + ":" + artifactId);
-		}
-		
-		String controllerId = groupId + ":" + artifactId;
-		
-		synchronized(this) {
-			if (this.droolsControllers.containsKey(controllerId)) {
-				return droolsControllers.get(controllerId);
-			} else {
-				throw new IllegalStateException("DroolController for " + 
-												controllerId + " not found");
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<DroolsController> inventory() {
-		 List<DroolsController> controllers = 
-				 new ArrayList<DroolsController>(this.droolsControllers.values());
-		 return controllers;
-	}
-	
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("IndexedDroolsControllerFactory [#droolsControllers=").append(droolsControllers.size())
-				.append("]");
-		return builder.toString();
-	}
-	
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java b/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java
deleted file mode 100644
index 4eacbd1c..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/MavenDroolsController.java
+++ /dev/null
@@ -1,910 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.controller.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections4.queue.CircularFifoQueue;
-import org.drools.core.ClassObjectFilter;
-import org.kie.api.definition.KiePackage;
-import org.kie.api.definition.rule.Query;
-import org.kie.api.runtime.KieSession;
-import org.kie.api.runtime.rule.FactHandle;
-import org.kie.api.runtime.rule.QueryResults;
-import org.kie.api.runtime.rule.QueryResultsRow;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.PolicySession;
-import org.openecomp.policy.drools.core.jmx.PdpJmx;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
-import org.openecomp.policy.drools.utils.ReflectionUtil;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * Maven-based Drools Controller that interacts with the 
- * policy-core PolicyContainer and PolicySession to manage
- * Drools containers instantiated using Maven.
- */
-public class MavenDroolsController implements DroolsController {
-	
-	/**
-	 * logger 
-	 */
-	private static Logger  logger = LoggerFactory.getLogger(MavenDroolsController.class);
-	
-	/**
-	 * Policy Container, the access object to the policy-core layer
-	 */
-	@JsonIgnore
-	protected final PolicyContainer policyContainer;
-	
-	/**
-	 * alive status of this drools controller, 
-	 * reflects invocation of start()/stop() only
-	 */
-	protected volatile boolean alive = false;
-	
-	/**
-	 * locked status of this drools controller,
-	 * reflects if i/o drools related operations are permitted,
-	 * more specifically: offer() and deliver().
-	 * It does not affect the ability to start and stop 
-	 * underlying drools infrastructure
-	 */
-	protected volatile boolean locked = false;
-	
-	/**
-	 * list of topics, each with associated decoder classes, each
-	 * with a list of associated filters.
-	 */
-	protected List<TopicCoderFilterConfiguration> decoderConfigurations;
-	
-	/**
-	 * list of topics, each with associated encoder classes, each
-	 * with a list of associated filters.
-	 */
-	protected List<TopicCoderFilterConfiguration> encoderConfigurations;
-	
-	/**
-	 * recent source events processed
-	 */
-	protected final CircularFifoQueue<Object> recentSourceEvents = new CircularFifoQueue<Object>(10);
-	
-	/**
-	 * recent sink events processed
-	 */
-	protected final CircularFifoQueue<String> recentSinkEvents = new CircularFifoQueue<String>(10);
-	
-	/**
-	 * original Drools Model/Rules classloader hash
-	 */
-	protected int modelClassLoaderHash;
-
-	/**
-	 * Expanded version of the constructor 
-	 * 
-	 * @param groupId maven group id
-	 * @param artifactId maven artifact id
-	 * @param version maven version
-	 * @param decoderConfiguration list of topic -> decoders -> filters mapping
-	 * @param encoderConfiguration list of topic -> encoders -> filters mapping
-	 * 
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 */
-	public MavenDroolsController(String groupId, 
-								 String artifactId, 
-								 String version,
-								 List<TopicCoderFilterConfiguration> decoderConfigurations,
-								 List<TopicCoderFilterConfiguration> encoderConfigurations) 
-		   throws IllegalArgumentException {
-		
-		if (logger.isInfoEnabled())
-			logger.info("DROOLS CONTROLLER: instantiation " +  this + 
-					    " -> {" + groupId + ":" + artifactId + ":" + version + "}");
-		
-		if (groupId == null || artifactId == null || version == null ||
-			groupId.isEmpty() || artifactId.isEmpty() || version.isEmpty()) {
-			throw new IllegalArgumentException("Missing maven coordinates: " + 
-					                           groupId + ":" + artifactId + ":" + 
-					                           version);
-		}
-		
-		this.policyContainer= new PolicyContainer(groupId, artifactId, version);
-		this.init(decoderConfigurations, encoderConfigurations);
-		
-		if (logger.isInfoEnabled())
-			logger.info("DROOLS CONTROLLER: instantiation completed " +  this);
-	}
-	
-	/**
-	 * init encoding/decoding configuration
-	 * @param decoderConfiguration list of topic -> decoders -> filters mapping
-	 * @param encoderConfiguration list of topic -> encoders -> filters mapping
-	 */
-	protected void init(List<TopicCoderFilterConfiguration> decoderConfigurations,
-			            List<TopicCoderFilterConfiguration> encoderConfigurations) {
-		
-		this.decoderConfigurations = decoderConfigurations;
-		this.encoderConfigurations = encoderConfigurations;
-		
-		this.initCoders(decoderConfigurations, true);
-		this.initCoders(encoderConfigurations, false);
-		
-		this.modelClassLoaderHash = this.policyContainer.getClassLoader().hashCode();		
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void updateToVersion(String newGroupId, String newArtifactId, String newVersion,
-			                    List<TopicCoderFilterConfiguration> decoderConfigurations,
-			                    List<TopicCoderFilterConfiguration> encoderConfigurations) 
-		throws IllegalArgumentException, LinkageError, Exception {
-		
-		if (logger.isInfoEnabled())
-			logger.info("UPDATE-TO-VERSION: " +  this + " -> {" + newGroupId + ":" + newArtifactId + ":" + newVersion + "}");
-		
-		if (newGroupId == null || newArtifactId == null || newVersion == null ||
-			newGroupId.isEmpty() || newArtifactId.isEmpty() || newVersion.isEmpty()) {
-				throw new IllegalArgumentException("Missing maven coordinates: " + 
-						                           newGroupId + ":" + newArtifactId + ":" + 
-						                           newVersion);
-		}
-		
-		if (newGroupId.equalsIgnoreCase(DroolsController.NO_GROUP_ID) || 
-			newArtifactId.equalsIgnoreCase(DroolsController.NO_ARTIFACT_ID) || 
-			newVersion.equalsIgnoreCase(DroolsController.NO_VERSION)) {
-				throw new IllegalArgumentException("BRAINLESS maven coordinates provided: " + 
-						                           newGroupId + ":" + newArtifactId + ":" + 
-						                           newVersion);
-		}
-		
-		if (newGroupId.equalsIgnoreCase(this.getGroupId()) && 
-			newArtifactId.equalsIgnoreCase(this.getArtifactId()) &&
-			newVersion.equalsIgnoreCase(this.getVersion())) {
-				logger.warn("Al in the right version: " + newGroupId + ":" + 
-			                newArtifactId + ":" +  newVersion + " vs. " + this);
-				return;
-		}
-		
-		if (!newGroupId.equalsIgnoreCase(this.getGroupId()) || 
-			!newArtifactId.equalsIgnoreCase(this.getArtifactId())) {
-				throw new IllegalArgumentException("Group ID and Artifact ID maven coordinates must be identical for the upgrade: " + 
-							                       newGroupId + ":" + newArtifactId + ":" + 
-							                       newVersion + " vs. " + this);
-		}
-
-		/* upgrade */
-		String messages = this.policyContainer.updateToVersion(newVersion);
-		if (logger.isWarnEnabled())
-			logger.warn(this + "UPGRADE results: " + messages);
-		
-		/*
-		 * If all sucessful (can load new container), now we can remove all coders from previous sessions
-		 */
-		this.removeCoders();
-		
-		/*
-		 * add the new coders
-		 */
-		this.init(decoderConfigurations, encoderConfigurations);
-		
-		if (logger.isInfoEnabled())
-			logger.info("UPDATE-TO-VERSION: completed " +  this);
-	}
-
-	/**
-	 * initialize decoders for all the topics supported by this controller
-	 * Note this is critical to be done after the Policy Container is
-	 * instantiated to be able to fetch the corresponding classes.
-	 * 
-	 * @param decoderConfiguration list of topic -> decoders -> filters mapping
-	 */
-	protected void initCoders(List<TopicCoderFilterConfiguration> coderConfigurations, 
-			                  boolean decoder) 
-	          throws IllegalArgumentException {
-		
-		if (logger.isInfoEnabled())
-			logger.info("INIT-CODERS: " +  this);
-		
-		if (coderConfigurations == null) {
-			return;
-		}
-			
-
-		for (TopicCoderFilterConfiguration coderConfig: coderConfigurations) {
-			String topic = coderConfig.getTopic();
-			
-			CustomGsonCoder customGsonCoder = coderConfig.getCustomGsonCoder();
-			if (coderConfig.getCustomGsonCoder() != null && 
-				coderConfig.getCustomGsonCoder().getClassContainer() != null &&
-				!coderConfig.getCustomGsonCoder().getClassContainer().isEmpty()) {
-					
-				String customGsonCoderClass = coderConfig.getCustomGsonCoder().getClassContainer();
-				if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(),
-						                   customGsonCoderClass)) {
-					logger.error(customGsonCoderClass + " cannot be retrieved");
-					throw new IllegalArgumentException(customGsonCoderClass + " cannot be retrieved");
-				} else {
-					if (logger.isInfoEnabled())
-						logger.info("CLASS FETCHED " + customGsonCoderClass);
-				}
-			}
-			
-			CustomJacksonCoder customJacksonCoder = coderConfig.getCustomJacksonCoder();
-			if (coderConfig.getCustomJacksonCoder() != null && 
-				coderConfig.getCustomJacksonCoder().getClassContainer() != null &&
-				!coderConfig.getCustomJacksonCoder().getClassContainer().isEmpty()) {
-				
-				String customJacksonCoderClass = coderConfig.getCustomJacksonCoder().getClassContainer();
-				if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(),
-						                   customJacksonCoderClass)) {
-					logger.error(customJacksonCoderClass + " cannot be retrieved");
-					throw new IllegalArgumentException(customJacksonCoderClass + " cannot be retrieved");
-				} else {
-					if (logger.isInfoEnabled())
-						logger.info("CLASS FETCHED " + customJacksonCoderClass);
-				}
-			}	
-			
-			List<PotentialCoderFilter> coderFilters = coderConfig.getCoderFilters();
-			if (coderFilters == null || coderFilters.isEmpty()) {
-				continue;
-			}
-			
-			for (PotentialCoderFilter coderFilter : coderFilters) {
-				String potentialCodedClass = coderFilter.getCodedClass();
-				JsonProtocolFilter protocolFilter = coderFilter.getFilter();
-				
-				if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(), 
-						                   potentialCodedClass)) {
-					logger.error(potentialCodedClass + " cannot be retrieved");
-					throw new IllegalArgumentException(potentialCodedClass + " cannot be retrieved");
-				} else {
-					if (logger.isInfoEnabled())
-						logger.info("CLASS FETCHED " + potentialCodedClass);
-				}			
-				
-				if (decoder)
-					EventProtocolCoder.manager.addDecoder(this.getGroupId(), this.getArtifactId(), 
-							                              topic, potentialCodedClass, protocolFilter,
-							                              customGsonCoder,
-							                              customJacksonCoder,
-							                              this.policyContainer.getClassLoader().hashCode());
-				else
-					EventProtocolCoder.manager.addEncoder(this.getGroupId(), this.getArtifactId(), 
-                                                          topic, potentialCodedClass, protocolFilter,
-							                              customGsonCoder,
-							                              customJacksonCoder,
-							                              this.policyContainer.getClassLoader().hashCode());
-			}
-		}
-	}
-	
-
-	/**
-	 * remove decoders.
-	 */
-	protected void removeDecoders() 
-	          throws IllegalArgumentException {
-		if (logger.isInfoEnabled())
-			logger.info("REMOVE-DECODERS: " +  this);
-		
-		if (this.decoderConfigurations == null) {
-			return;
-		}
-			
-
-		for (TopicCoderFilterConfiguration coderConfig: decoderConfigurations) {
-			String topic = coderConfig.getTopic();								
-			EventProtocolCoder.manager.removeDecoders
-						(this.getGroupId(), this.getArtifactId(), topic);
-		}
-	}
-	
-	/**
-	 * remove decoders.
-	 */
-	protected void removeEncoders() 
-	          throws IllegalArgumentException {
-		
-		if (logger.isInfoEnabled())
-			logger.info("REMOVE-ENCODERS: " +  this);
-		
-		if (this.encoderConfigurations == null)
-			return;
-			
-
-		for (TopicCoderFilterConfiguration coderConfig: encoderConfigurations) {
-			String topic = coderConfig.getTopic();								
-			EventProtocolCoder.manager.removeEncoders
-						(this.getGroupId(), this.getArtifactId(), topic);
-		}
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean ownsCoder(Class<? extends Object> coderClass, int modelHash) throws IllegalStateException {
-		if (!ReflectionUtil.isClass
-				(this.policyContainer.getClassLoader(), coderClass.getCanonicalName())) {
-			logger.error(this + coderClass.getCanonicalName() + " cannot be retrieved. ");
-			return false;
-		}
-		
-		if (modelHash == this.modelClassLoaderHash) {
-			if (logger.isInfoEnabled())
-				logger.info(coderClass.getCanonicalName() + 
-						    this + " class loader matches original drools controller rules classloader " +
-			                coderClass.getClassLoader());
-			return true;
-		} else {
-			if (logger.isWarnEnabled())
-				logger.warn(this + coderClass.getCanonicalName() + " class loaders don't match  " +
-	                        coderClass.getClassLoader() + " vs " + 
-						    this.policyContainer.getClassLoader());
-			return false;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() {
-		
-		if (logger.isInfoEnabled())
-			logger.info("START: " + this);
-		
-		synchronized (this) {			
-			if (this.alive)
-				return true;
-			
-			this.alive = true;
-		}
-		
-		return this.policyContainer.start();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() {
-		
-		logger.info("STOP: " + this);
-		
-		synchronized (this) {
-			if (!this.alive)
-				return true;
-			
-			this.alive = false;
-		}
-		
-		return this.policyContainer.stop();
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {		
-		logger.info("{}: SHUTDOWN", this);
-		
-		try {
-			this.stop();
-			this.removeCoders();
-		} catch (Exception e) {
-			logger.error("{} SHUTDOWN FAILED because of {}", this, e.getMessage(), e);
-		} finally {
-			this.policyContainer.shutdown();
-		}
-
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void halt() throws IllegalStateException {
-		logger.info("{}: HALT", this);
-		
-		try {
-			this.stop();
-			this.removeCoders();
-		} catch (Exception e) {
-			logger.error("{} HALT FAILED because of {}", this, e.getMessage(), e);
-		} finally {
-			this.policyContainer.destroy();
-		}	
-	}
-	
-	/**
-	 * removes this drools controllers and encoders and decoders from operation
-	 */
-	protected void removeCoders() {
-		logger.info("{}: REMOVE-CODERS", this);
-		
-		try {
-			this.removeDecoders();
-		} catch (IllegalArgumentException e) {
-			logger.error("{} REMOVE-DECODERS FAILED because of {}", this, e.getMessage(), e);
-		}
-		
-		try {
-			this.removeEncoders();
-		} catch (IllegalArgumentException e) {
-			logger.error("{} REMOVE-ENCODERS FAILED because of {}", this, e.getMessage(), e);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAlive() {
-		return this.alive;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean offer(String topic, String event) {
-		logger.debug("{}: OFFER: {} <- {}", this, topic, event);
-		
-		if (this.locked)
-			return true;
-		
-		if (!this.alive)
-			return true;
-		
-		// 0. Check if the policy container has any sessions
-		
-		if (this.policyContainer.getPolicySessions().size() <= 0) {
-			// no sessions
-			return true;
-		}
-		
-		// 1. Now, check if this topic has a decoder:
-		
-		if (!EventProtocolCoder.manager.isDecodingSupported(this.getGroupId(), 
-				                                              this.getArtifactId(), 
-				                                              topic)) {
-			
-			logger.warn("{}: DECODING-UNSUPPORTED {}:{}:{}", this, 
-					    topic, this.getGroupId(), this.getArtifactId());
-			return true;
-		}
-		
-		// 2. Decode
-		
-		Object anEvent;
-		try {
-			anEvent = EventProtocolCoder.manager.decode(this.getGroupId(), 
-					                                      this.getArtifactId(), 
-					                                      topic, 
-					                                      event);
-		} catch (UnsupportedOperationException uoe) {
-			logger.debug("{}: DECODE FAILED: {} <- {} because of {}", this, topic, 
-					     event, uoe.getMessage(), uoe);
-			return true;
-		} catch (Exception e) {
-			logger.warn("{}: DECODE FAILED: {} <- {} because of {}", this, topic, 
-				        event, e.getMessage(), e);
-			return true;
-		}
-		
-		synchronized(this.recentSourceEvents) {
-			this.recentSourceEvents.add(anEvent);
-		}
-		
-		// increment event count for Nagios monitoring
-		PdpJmx.getInstance().updateOccured();  
-		
-		// Broadcast
-		
-		if (logger.isInfoEnabled())
-			logger.info(this + "BROADCAST-INJECT of " + event + " FROM " + topic + " INTO " + this.policyContainer.getName());		
-		
-		if (!this.policyContainer.insertAll(anEvent))
-			logger.warn(this + "Failed to inject into PolicyContainer " + this.getSessionNames());
-		
-		return true;
-	}	
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(TopicSink sink, Object event) 
-			throws IllegalArgumentException, 
-			       IllegalStateException, 
-		           UnsupportedOperationException {
-		
-		if (logger.isInfoEnabled())
-			logger.info(this + "DELIVER: " +  event + " FROM " + this + " TO " + sink);
-		
-		if (sink == null)
-			throw new IllegalArgumentException
-						(this +  " invalid sink");
-		
-		if (event == null)
-			throw new IllegalArgumentException
-						(this +  " invalid event");
-		
-		if (this.locked)
-			throw new IllegalStateException
-							(this +  " is locked");
-		
-		if (!this.alive)
-			throw new IllegalStateException
-							(this +  " is stopped");
-		
-		String json =
-				EventProtocolCoder.manager.encode(sink.getTopic(), event, this);
-		
-		synchronized(this.recentSinkEvents) {
-			this.recentSinkEvents.add(json);
-		}
-		
-		return sink.send(json);
-		
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getVersion() {
-		return this.policyContainer.getVersion();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getArtifactId() {
-		return this.policyContainer.getArtifactId();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getGroupId() {
-		return this.policyContainer.getGroupId();
-	}
-
-	/**
-	 * @return the modelClassLoaderHash
-	 */
-	public int getModelClassLoaderHash() {
-		return modelClassLoaderHash;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean lock() {
-		logger.info("LOCK: " +  this);
-		
-		this.locked = true;
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean unlock() {
-		logger.info("UNLOCK: " +  this);
-		
-		this.locked = false;
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isLocked() {
-		return this.locked;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	public PolicyContainer getContainer() {
-		return this.policyContainer;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonProperty("sessions")
-	@Override
-	public List<String> getSessionNames() {
-		return getSessionNames(true);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonProperty("sessionCoordinates")
-	@Override
-	public List<String> getCanonicalSessionNames() {
-		return getSessionNames(false);
-	}
-	
-	/**
-	 * get session names
-	 * @param abbreviated true for the short form, otherwise the long form
-	 * @return session names
-	 */
-	protected List<String> getSessionNames(boolean abbreviated) {
-		List<String> sessionNames = new ArrayList<String>();
-		try {
-			for (PolicySession session: this.policyContainer.getPolicySessions()) {
-				if (abbreviated)
-					sessionNames.add(session.getName());
-				else
-					sessionNames.add(session.getFullName());
-			}
-		} catch (Exception e) {
-			logger.warn("Can't retrieve CORE sessions: " + e.getMessage(), e);
-			sessionNames.add(e.getMessage());
-		}
-		return sessionNames;
-	}
-	
-	/**
-	 * provides the underlying core layer container sessions
-	 * 
-	 * @return the attached Policy Container
-	 */
-	protected List<PolicySession> getSessions() {
-		List<PolicySession> sessions = new ArrayList<PolicySession>();
-		sessions.addAll(this.policyContainer.getPolicySessions());
-		return sessions;
-	}
-	
-	/**
-	 * provides the underlying core layer container session with name sessionName
-	 * 
-	 * @param sessionName session name
-	 * @return the attached Policy Container
-	 * @throws IllegalArgumentException when an invalid session name is provided
-	 * @throws IllegalStateException when the drools controller is in an invalid state
-	 */
-	protected PolicySession getSession(String sessionName) {
-		if (sessionName == null || sessionName.isEmpty())
-			throw new IllegalArgumentException("A Session Name must be provided");
-		
-		List<PolicySession> sessions = this.getSessions();
-		for (PolicySession session : sessions) {
-			if (sessionName.equals(session.getName()) || sessionName.equals(session.getName()))
-				return session;				
-		}
-		
-		throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String,Integer> factClassNames(String sessionName) throws IllegalArgumentException {		
-		if (sessionName == null || sessionName.isEmpty())
-			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
-		
-		// List<String> classNames = new ArrayList<>();
-		Map<String,Integer> classNames = new HashMap<>();
-		
-		PolicySession session = getSession(sessionName);
-		KieSession kieSession = session.getKieSession();
-
-		Collection<FactHandle> facts = session.getKieSession().getFactHandles();
-		for (FactHandle fact : facts) {
-			try {
-				String className = kieSession.getObject(fact).getClass().getName();
-				if (classNames.containsKey(className))
-					classNames.put(className, classNames.get(className) + 1);
-				else
-					classNames.put(className, 1);
-			} catch (Exception e) {
-				if (logger.isInfoEnabled())
-					logger.info("Object cannot be retrieved from fact: " + fact);
-			}			
-		}	
-		
-		return classNames;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public long factCount(String sessionName) throws IllegalArgumentException {		
-		if (sessionName == null || sessionName.isEmpty())
-			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
-		
-		PolicySession session = getSession(sessionName);
-		return session.getKieSession().getFactCount();	
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<Object> facts(String sessionName, String className, boolean delete) {		
-		if (sessionName == null || sessionName.isEmpty())
-			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
-		
-		if (className == null || className.isEmpty())
-			throw new IllegalArgumentException("Invalid Class Name: " + className);
-		
-		Class<?> factClass = 
-				ReflectionUtil.fetchClass(this.policyContainer.getClassLoader(), className);
-		if (factClass == null)
-			throw new IllegalArgumentException("Class cannot be fetched in model's classloader: " + className);
-		
-		PolicySession session = getSession(sessionName);
-		KieSession kieSession = session.getKieSession();
-		
-		List<Object> factObjects = new ArrayList<>();
-		
-		Collection<FactHandle> factHandles = kieSession.getFactHandles(new ClassObjectFilter(factClass));
-		for (FactHandle factHandle : factHandles) {
-			try {
-				factObjects.add(kieSession.getObject(factHandle));
-				if (delete)
-					kieSession.delete(factHandle);					
-			} catch (Exception e) {
-				if (logger.isInfoEnabled())
-					logger.info("Object cannot be retrieved from fact: " + factHandle);
-			}
-		}		
-		
-		return factObjects;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<Object> factQuery(String sessionName, String queryName, String queriedEntity, boolean delete, Object... queryParams) {		
-		if (sessionName == null || sessionName.isEmpty())
-			throw new IllegalArgumentException("Invalid Session Name: " + sessionName);
-		
-		if (queryName == null || queryName.isEmpty())
-			throw new IllegalArgumentException("Invalid Query Name: " + queryName);
-		
-		if (queriedEntity == null || queriedEntity.isEmpty())
-			throw new IllegalArgumentException("Invalid Queried Entity: " + queriedEntity);
-		
-		PolicySession session = getSession(sessionName);
-		KieSession kieSession = session.getKieSession();
-		
-		boolean found = false;
-		for (KiePackage kiePackage : kieSession.getKieBase().getKiePackages()) {
-			for (Query q : kiePackage.getQueries()) {
-				if (q.getName() != null && q.getName().equals(queryName)) {
-					found = true;
-					break;
-				}
-			}
-		}
-		if (!found)
-			throw new IllegalArgumentException("Invalid Query Name: " + queryName);
-        
-		List<Object> factObjects = new ArrayList<>();
-		
-		QueryResults queryResults = kieSession.getQueryResults(queryName, queryParams);
-		for (QueryResultsRow row : queryResults) {
-			try {
-				factObjects.add(row.get(queriedEntity));
-				if (delete)
-					kieSession.delete(row.getFactHandle(queriedEntity));
-			} catch (Exception e) {
-				if (logger.isInfoEnabled())
-					logger.info("Object cannot be retrieved from fact: " + row);
-			}
-		}
-		
-		return factObjects;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Class<?> fetchModelClass(String className) throws IllegalStateException {
-		Class<?> modelClass = 
-			ReflectionUtil.fetchClass(this.policyContainer.getClassLoader(), className);
-		return modelClass;
-	}
-
-	/**
-	 * @return the recentSourceEvents
-	 */
-	@Override
-	public Object[] getRecentSourceEvents() {
-		synchronized(this.recentSourceEvents) {
-			Object[] events = new Object[recentSourceEvents.size()];
-			return recentSourceEvents.toArray(events);
-		}
-	}
-
-	/**
-	 * @return the recentSinkEvents
-	 */
-	@Override
-	public String[] getRecentSinkEvents() {
-		synchronized(this.recentSinkEvents) {
-			String[] events = new String[recentSinkEvents.size()];
-			return recentSinkEvents.toArray(events);
-		}
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isBrained() {
-		return true;
-	}
-	
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("MavenDroolsController [policyContainer=")
-		       .append((policyContainer != null) ? policyContainer.getName() : "NULL").append(":")
-		       .append(", alive=")
-			   .append(alive).append(", locked=")
-			   .append(", modelClassLoaderHash=").append(modelClassLoaderHash).append("]");
-		return builder.toString();
-	}
-
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java b/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java
deleted file mode 100644
index 7f5d4665..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/controller/internal/NullDroolsController.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.controller.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
-
-/**
- * no-op Drools Controller
- */
-public class NullDroolsController implements DroolsController {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() throws IllegalStateException {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		return;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void halt() throws IllegalStateException {
-		return;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAlive() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean lock() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean unlock() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isLocked() {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getGroupId() {
-		return NO_GROUP_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getArtifactId() {
-		return NO_ARTIFACT_ID;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getVersion() {
-		return NO_VERSION;
-	}	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<String> getSessionNames() {
-		return new ArrayList<String>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<String> getCanonicalSessionNames() {
-		return new ArrayList<String>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean offer(String topic, String event) {
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(TopicSink sink, Object event)
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
-		throw new IllegalStateException(this.getClass().getCanonicalName() + " invoked");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object[] getRecentSourceEvents() {
-		return new String[0];
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyContainer getContainer() {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String[] getRecentSinkEvents() {
-		return new String[0];
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean ownsCoder(Class<? extends Object> coderClass, int modelHash) throws IllegalStateException {
-		throw new IllegalStateException(this.getClass().getCanonicalName() + " invoked");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Class<?> fetchModelClass(String className) throws IllegalArgumentException {
-		throw new IllegalArgumentException(this.getClass().getCanonicalName() + " invoked");
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isBrained() {
-		return false;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("NullDroolsController []");
-		return builder.toString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void updateToVersion(String newGroupId, String newArtifactId, String newVersion,
-			List<TopicCoderFilterConfiguration> decoderConfigurations,
-			List<TopicCoderFilterConfiguration> encoderConfigurations)
-			throws IllegalArgumentException, LinkageError, Exception {
-		throw new IllegalArgumentException(this.getClass().getCanonicalName() + " invoked");
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Map<String, Integer> factClassNames(String sessionName) 
-		   throws IllegalArgumentException {
-		return new HashMap<String,Integer>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public long factCount(String sessionName) throws IllegalArgumentException {
-		return 0;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<Object> facts(String sessionName, String className, boolean delete) {
-		return new ArrayList<Object>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<Object> factQuery(String sessionName, String queryName, 
-			                      String queriedEntity, 
-			                      boolean delete, Object... queryParams) {
-		return new ArrayList<Object>();
-	}
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java b/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java
deleted file mode 100644
index 66f64a82..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyControllerFeatureAPI.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.features;
-
-import java.util.Properties;
-
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
-
-public interface PolicyControllerFeatureAPI extends OrderedService {
-
-	  /**
-	   * called before creating a controller with name 'name' and 
-	   * properties 'properties'
-	   * 
-	   * @param name name of the the controller
-	   * @param properties configuration properties
-	   * 
-	   * @return a policy controller.   A take over of the creation operation
-	   * is performed by returning a non-null policy controller.   
-	   * 'null' indicates that no take over has taken place, and processing should
-	   * continue to the next feature provider.
-	   */
-	  public default PolicyController beforeCreate(String name, Properties properties) {return null;}
-
-	  /**
-	   * called after creating a controller with name 'name'
-	   * 
-	   * @param controller controller
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterCreate(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller is started.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeStart(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept after the Policy Controller is started.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterStart(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller is stopped.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean beforeStop(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept after the Policy Controller is stopped
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.d.
-	   */
-	  public default boolean afterStop(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeLock(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept after the Policy Controller is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean afterLock(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeUnlock(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept after the Policy Controller is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterUnlock(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller is shut down
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean beforeShutdown(PolicyController controller) {return false;}
-	  
-	  /**
-	   * called after the Policy Controller is shut down
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterShutdown(PolicyController controller) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller is halted
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean beforeHalt(PolicyController controller) {return false;}
-	  
-	  /**
-	   * called after the Policy Controller is halted
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterHalt(PolicyController controller) {return false;}
-	  
-	  
-	  /**
-	   * intercept before the Policy Controller is offered an event
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeOffer(PolicyController controller,
-			                             CommInfrastructure protocol,
-			                             String topic,
-			                             String event) {return false;}
-
-	  /**
-	   * called after the Policy Controller processes an event offer
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterOffer(PolicyController controller,
-                                        CommInfrastructure protocol,
-                                        String topic,
-                                        String event, 
-                                        boolean success) {return false;}
-	  
-	  /**
-	   * intercept before the Policy Controller delivers (posts) an event
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeDeliver(PolicyController controller,
-							               CommInfrastructure protocol,
-							               String topic,
-							               Object event) {return false;}
-
-	  /**
-	   * called after the Policy Controller delivers (posts) an event
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterDeliver(PolicyController controller,
-							              CommInfrastructure protocol,
-							              String topic,
-							              Object event, 
-							              boolean success) {return false;}
-
-	  
-	  /**
-	   * Feature providers implementing this interface
-	   */
-	  public static final OrderedServiceImpl<PolicyControllerFeatureAPI> providers = 
-			  						new OrderedServiceImpl<PolicyControllerFeatureAPI>(PolicyControllerFeatureAPI.class);
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java b/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java
deleted file mode 100644
index df2ddd6f..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/features/PolicyEngineFeatureAPI.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.features;
-
-import java.util.Properties;
-
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.openecomp.policy.drools.utils.OrderedService;
-import org.openecomp.policy.drools.utils.OrderedServiceImpl;
-
-/**
- * Policy Engine Feature API.
- * Provides Interception Points during the Policy Engine lifecycle.
- */
-public interface PolicyEngineFeatureAPI extends OrderedService {
-	
-	  /**
-	   * intercept before the Policy Engine is commanded to boot.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeBoot(PolicyEngine engine, String cliArgs[]) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine is booted.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterBoot(PolicyEngine engine) {return false;};
-	
-	  /**
-	   * intercept before the Policy Engine is configured.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeConfigure(PolicyEngine engine, Properties properties) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine is configured.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterConfigure(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept before the Policy Engine goes active.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeActivate(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine goes active.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterActivate(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept before the Policy Engine goes standby.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeDeactivate(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine goes standby.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterDeactivate(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept before the Policy Engine is started.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeStart(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine is started.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterStart(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept before the Policy Engine is stopped.
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean beforeStop(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine is stopped
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.d.
-	   */
-	  public default boolean afterStop(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept before the Policy Engine is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeLock(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean afterLock(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept before the Policy Engine is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean beforeUnlock(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept after the Policy Engine is locked
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterUnlock(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * intercept the Policy Engine is shut down
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise..
-	   */
-	  public default boolean beforeShutdown(PolicyEngine engine){return false;};
-	  
-	  /**
-	   * called after the Policy Engine is shut down
-	   * 
-	   * @return true if this feature intercepts and takes ownership
-	   * of the operation preventing the invocation of 
-	   * lower priority features.   False, otherwise.
-	   */
-	  public default boolean afterShutdown(PolicyEngine engine) {return false;};
-	  
-	  /**
-	   * Feature providers implementing this interface
-	   */
-	  public static final OrderedServiceImpl<PolicyEngineFeatureAPI> providers = 
-			  						new OrderedServiceImpl<>(PolicyEngineFeatureAPI.class);
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java b/policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java
deleted file mode 100644
index dda20a08..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/persistence/SystemPersistence.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.persistence;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.utils.PropertyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public interface SystemPersistence {
-	
-	/**
-	 * configuration directory
-	 */
-	public static String CONFIG_DIR_NAME = "config";
-	
-	/**
-	 * policy controllers suffix
-	 */
-	public final static String CONTROLLER_SUFFIX_IDENTIFIER = "-controller";
-		
-	/**
-	 * policy controller properties file suffix
-	 */
-	public final static String PROPERTIES_FILE_CONTROLLER_SUFFIX = 
-							CONTROLLER_SUFFIX_IDENTIFIER + ".properties"; 
-	
-	/**
-	 * policy engine properties file name
-	 */
-	public final static String PROPERTIES_FILE_ENGINE = "policy-engine.properties";
-	
-	
-	/**
-	 * backs up a controller configuration.
-	 * 
-	 * @param controllerName the controller name
-	 * @return true if the configuration is backed up
-	 */
-	public boolean backupController(String controllerName);
-	
-	/**
-	 * persists controller configuration
-	 * 
-	 * @param controllerName the controller name
-	 * @param configuration object containing the configuration
-	 * @return true if storage is succesful, false otherwise
-	 * @throws IllegalArgumentException if the configuration cannot be handled by the persistence manager
-	 */
-	public boolean storeController(String controllerName, Object configuration)
-		throws IllegalArgumentException;
-	
-	/**
-	 * delete controller configuration
-	 * 
-	 * @param controllerName the controller name
-	 * @return true if storage is succesful, false otherwise
-	 */
-	public boolean deleteController(String controllerName);
-	
-	/**
-	 * get controller properties
-	 * 
-	 * @param controllerName controller name
-	 * @return properties for this controller
-	 * @throws IllegalArgumentException if the controller name does not lead to a properties configuration
-	 */
-	public Properties getControllerProperties(String controllerName)
-			throws IllegalArgumentException;
-	
-	/**
-	 * get properties by name
-	 * 
-	 * @param name 
-	 * @return properties 
-	 * @throws IllegalArgumentException if the name does not lead to a properties configuration
-	 */
-	public Properties getProperties(String name) throws IllegalArgumentException;
-	
-	/**
-	 * Persistence Manager.   For now it is a file-based properties management,
-	 * In the future, it will probably be DB based, so manager implementation
-	 * will change.
-	 */
-	public static final SystemPersistence manager = new SystemPropertiesPersistence();
-}
-
-/** 
- * Properties based Persistence
- */
-class SystemPropertiesPersistence implements SystemPersistence {
-	
-	/**
-	 * logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(SystemPropertiesPersistence.class);
-	
-	/**
-	 * backs up the properties-based controller configuration
-	 * @param controllerName the controller name
-	 * @return true if the configuration is backed up in disk or back up does not apply, false otherwise.
-	 */
-	@Override
-	public boolean backupController(String controllerName) {
-	   	Path controllerPropertiesPath = 
-	   			Paths.get(CONFIG_DIR_NAME, controllerName + PROPERTIES_FILE_CONTROLLER_SUFFIX);
-	   	
-		if (Files.exists(controllerPropertiesPath)) {
-			try {
-				logger.warn("There is an existing configuration file at " + 
-			                controllerPropertiesPath.toString() +
-						    " with contents: " + Files.readAllBytes(controllerPropertiesPath));
-				Path controllerPropertiesBakPath = 
-						Paths.get(CONFIG_DIR_NAME, controllerName + 
-                                  PROPERTIES_FILE_CONTROLLER_SUFFIX + ".bak");
-				Files.copy(controllerPropertiesPath, 
-						   controllerPropertiesBakPath, StandardCopyOption.REPLACE_EXISTING);
-			} catch (Exception e) {
-				logger.warn("{}: cannot be backed up", controllerName, e);
-	    		return false;
-			}
-		} 
-		
-		return true;
-	}
-	
-	/**
-	 * persists properties-based controller configuration and makes a backup if necessary
-	 * @param controllerName the controller name
-	 * @return true if the properties has been stored in disk, false otherwise
-	 */
-	@Override
-	public boolean storeController(String controllerName, Object configuration) {
-	   	if (!(configuration instanceof Properties)) {
-	   		throw new IllegalArgumentException("configuration must be of type properties to be handled by this manager");
-	   	}
-	   	
-	   	Properties properties = (Properties) configuration;
-	   	
-		Path controllerPropertiesPath = 
-	   			Paths.get(CONFIG_DIR_NAME, controllerName + PROPERTIES_FILE_CONTROLLER_SUFFIX);
-    	if (Files.exists(controllerPropertiesPath)) {
-    		try {
-				Properties oldProperties = PropertyUtil.getProperties(controllerPropertiesPath.toFile());
-				if (oldProperties.equals(properties)) {
-					logger.info("A properties file with the same contents already exists for controller " + 
-				                controllerName + 
-				                ". No action is taken");
-					return true;
-				} else {
-					this.backupController(controllerName);
-				}
-			} catch (Exception e) {
-				logger.info("{}: no existing Properties", controllerName);
-				// continue
-			}
-    	}
-	  	
-		try {
-	    	File controllerPropertiesFile = controllerPropertiesPath.toFile();
-	    	FileWriter writer = new FileWriter(controllerPropertiesFile);
-	    	properties.store(writer, "Machine created Policy Controller Configuration");
-		} catch (Exception e) {
-			logger.warn("{}: cannot be STORED", controllerName, e);
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * deletes properties-based controller configuration
-	 * @param controllerName the controller name
-	 * @return true if the properties has been deleted from disk, false otherwise
-	 */
-	@Override
-	public boolean deleteController(String controllerName) {
-		
-	   	Path controllerPropertiesPath = 
-	   			Paths.get(CONFIG_DIR_NAME, 
-	   					  controllerName + PROPERTIES_FILE_CONTROLLER_SUFFIX);
-
-	   	if (Files.exists(controllerPropertiesPath)) {
-			try {
-				Path controllerPropertiesBakPath = 
-						Paths.get(CONFIG_DIR_NAME, controllerName + 
-                                  PROPERTIES_FILE_CONTROLLER_SUFFIX + ".bak");
-				Files.move(controllerPropertiesPath, 
-						   controllerPropertiesBakPath, 
-						   StandardCopyOption.REPLACE_EXISTING);
-			} catch (Exception e) {
-				logger.warn("{}: cannot be DELETED", controllerName, e);
-				return false;
-			}
-		} 
-	   	
-	   	return true;
-	}
-
-	@Override
-	public Properties getControllerProperties(String controllerName) throws IllegalArgumentException {
-	   	return this.getProperties(controllerName + CONTROLLER_SUFFIX_IDENTIFIER);
-	}
-	
-	@Override
-	public Properties getProperties(String name) throws IllegalArgumentException {
-	   	Path propertiesPath = 
-	   			Paths.get(CONFIG_DIR_NAME, name + ".properties");
-	   	
-	   	if (!Files.exists(propertiesPath)) {
-			throw new IllegalArgumentException("properties for " + name + " are not persisted.");
-	   	}
-
-		try {
-			return PropertyUtil.getProperties(propertiesPath.toFile());
-		} catch (Exception e) {
-			logger.warn("{}: can't read properties @ {}", name, propertiesPath);
-			throw new IllegalArgumentException("can't read properties for " + 
-			                                   name + " @ " + 
-					                           propertiesPath);
-		}
-	}
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java
deleted file mode 100644
index 819ee812..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/EventProtocolCoder.java
+++ /dev/null
@@ -1,1393 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.coders;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.openecomp.policy.drools.utils.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Coder (Encoder/Decoder) of Events.
- */
-public interface EventProtocolCoder {
-	
-	public static class CoderFilters {
-
-		/**
-		 * coder class 
-		 */
-		protected String factClass;
-		
-		/**
-		 * filters to apply to the selection of the decodedClass;
-		 */
-		protected JsonProtocolFilter filter;
-
-		/**
-		 * classloader hash
-		 */
-		protected int modelClassLoaderHash;
-
-		
-		/**
-		 * constructor
-		 * 
-		 * @param codedClass coder class
-		 * @param filter filters to apply
-		 */
-		public CoderFilters(String codedClass, JsonProtocolFilter filter, int modelClassLoaderHash) {
-			this.factClass = codedClass;
-			this.filter = filter;
-			this.modelClassLoaderHash = modelClassLoaderHash;
-		}
-
-		/**
-		 * @return the codedClass
-		 */
-		public String getCodedClass() {
-			return factClass;
-		}
-
-		/**
-		 * @param codedClass the decodedClass to set
-		 */
-		public void setCodedClass(String codedClass) {
-			this.factClass = codedClass;
-		}
-		
-		/**
-		 * @return the filter
-		 */
-		public synchronized JsonProtocolFilter getFilter() {
-			return filter;
-		}
-
-		/**
-		 * @param filter the filter to set
-		 */
-		public synchronized void setFilter(JsonProtocolFilter filter) {
-			this.filter = filter;
-		}
-
-		public int getModelClassLoaderHash() {
-			return modelClassLoaderHash;
-		}
-
-		public void setFromClassLoaderHash(int fromClassLoaderHash) {
-			this.modelClassLoaderHash = fromClassLoaderHash;
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("CoderFilters [factClass=").append(factClass).append(", filter=").append(filter)
-					.append(", modelClassLoaderHash=").append(modelClassLoaderHash).append("]");
-			return builder.toString();
-		}
-
-	}
-	
-	/**
-	 * Adds a Decoder class to decode the protocol over this topic
-	 *  
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic 
-	 * @param eventClass the event class
-	 * @param protocolFilter filters to selectively choose a particular decoder
-	 * when there are multiples
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public void addDecoder(String groupId, String artifactId, 
-			               String topic, 
-			               String eventClass, 
-			               JsonProtocolFilter protocolFilter, 
-			               CustomGsonCoder customGsonCoder,
-			               CustomJacksonCoder customJacksonCoder,
-			               int modelClassLoaderHash)
-		throws IllegalArgumentException;
-
-	/**
-	 * removes all decoders associated with the controller id
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic of the controller
-	 * 
-	 * @throws IllegalArgumentException if invalid arguments have been provided
-	 */
-	void removeEncoders(String groupId, String artifactId, String topic) throws IllegalArgumentException;
-	
-	/**
-	 * removes decoders associated with the controller id and topic
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic
-	 * 
-	 * @throws IllegalArgumentException if invalid arguments have been provided
-	 */
-	public void removeDecoders(String groupId, String artifactId, String topic) throws IllegalArgumentException;
-	
-	/**
-	 * Given a controller id and a topic, it gives back its filters
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic
-	 * 
-	 * return list of decoders
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId, String topic)
-		throws IllegalArgumentException;	
-	
-
-	/**
-	 * Given a controller id and a topic, it gives back the decoding configuration
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic
-	 * 
-	 * return decoding toolset
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public ProtocolCoderToolset getDecoders(String groupId, String artifactId, String topic) 
-		   throws IllegalArgumentException;
-	
-	/**
-	 * Given a controller id and a topic, it gives back all the decoding configurations
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic
-	 * 
-	 * return decoding toolset
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public List<ProtocolCoderToolset> getDecoders(String groupId, String artifactId)
-		   throws IllegalArgumentException;
-	
-	
-	/**
-	 * gets all decoders associated with the group and artifact ids
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * 
-	 * @throws IllegalArgumentException if invalid arguments have been provided
-	 */
-	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId) throws IllegalArgumentException;
-	
-
-	/**
-	 * Given a controller id and a topic, it gives back the classes that implements the encoding
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic
-	 * 
-	 * return list of decoders
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId, String topic) 
-			throws IllegalArgumentException;
-	
-	/**
-	 * gets all encoders associated with the group and artifact ids
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * 
-	 * @throws IllegalArgumentException if invalid arguments have been provided
-	 */
-	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId) throws IllegalArgumentException;
-	
-	/**
-	 * Given a controller id, a topic, and a classname, it gives back the classes that implements the decoding
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic
-	 * @param classname classname
-	 * 
-	 * return list of decoders
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */	
-	public CoderFilters getDecoderFilters(String groupId, String artifactId, String topic, String classname)
-		throws IllegalArgumentException;	
-	
-	/**
-	 * is there a decoder supported for the controller id and topic
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic protocol
-	 * @return true if supported
-	 */
-	public boolean isDecodingSupported(String groupId, String artifactId, String topic);
-	
-	/**
-	 * Adds a Encoder class to encode the protocol over this topic
-	 *  
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic 
-	 * @param eventClass the event class
-	 * @param protocolFilter filters to selectively choose a particular decoder
-	 * when there are multiples
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public void addEncoder(String groupId, String artifactId, String topic, 
-						   String eventClass, 
-			               JsonProtocolFilter protocolFilter,
-			               CustomGsonCoder customGsonCoder,
-			               CustomJacksonCoder customJacksonCoder,
-			               int modelClassLoaderHash)
-		throws IllegalArgumentException;
-	
-	/**
-	 * is there an encoder supported for the controller id and topic
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic protocol
-	 * @return true if supported
-	 */
-	public boolean isEncodingSupported(String groupId, String artifactId, String topic);
-	
-	/**
-	 * get encoder based on coordinates and classname
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic protocol
-	 * @param json event string
-	 * @return
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 */
-	public CoderFilters getEncoderFilters(String groupId, String artifactId, String topic, String classname)
-			throws IllegalArgumentException;
-	
-	/**
-	 * get encoder based on topic and encoded class
-	 * 
-	 * @param topic topic
-	 * @param encodedClass encoded class
-	 * @return
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 */
-	public List<CoderFilters> getReverseEncoderFilters(String topic, String encodedClass)
-			throws IllegalArgumentException;
-	
-	/**
-	 * gets the identifier of the creator of the encoder
-	 * 
-	 * @param topic topic
-	 * @param encodedClass encoded class
-	 * @return a drools controller
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 */
-	public DroolsController getDroolsController(String topic, Object encodedClass)
-			throws IllegalArgumentException;
-	
-	/**
-	 * gets the identifier of the creator of the encoder
-	 * 
-	 * @param topic topic
-	 * @param encodedClass encoded class
-	 * @return list of drools controllers
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 */
-	public List<DroolsController> getDroolsControllers(String topic, Object encodedClass)
-			throws IllegalArgumentException;
-	
-	/**
-	 * decode topic's stringified event (json) to corresponding Event Object.
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic protocol
-	 * @param json event string
-	 * @return
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 * @throws UnsupportedOperationException if the operation is not supported
-	 * @throws IllegalStateException if the system is in an illegal state
-	 */
-	public Object decode(String groupId, String artifactId, String topic, String json) 
-			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException;
-
-	/**
-	 * encodes topic's stringified event (json) to corresponding Event Object.
-	 * 
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic protocol
-	 * @param event Object
-	 * 
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 */
-	public String encode(String groupId, String artifactId, String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException;
-	
-	/**
-	 * encodes topic's stringified event (json) to corresponding Event Object.
-	 * 
-	 * @param topic topic
-	 * @param event event object
-	 * 
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 * @throws UnsupportedOperationException operation cannot be performed
-	 */
-	public String encode(String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException;
-	
-	/**
-	 * encodes topic's stringified event (json) to corresponding Event Object.
-	 * 
-	 * @param topic topic
-	 * @param event event object
-	 * @param droolsController 
-	 * 
-	 * @throws IllegalArgumentException invalid arguments passed in
-	 * @throws UnsupportedOperationException operation cannot be performed
-	 */
-	public String encode(String topic, Object event, DroolsController droolsController) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException;
-	
-	/**
-	 * singleton reference to the global event protocol coder
-	 */
-	public static EventProtocolCoder manager = new MultiplexorEventProtocolCoder();
-}
-
-/**
- * Protocol Coder that does its best attempt to decode/encode, selecting the best
- * class and best fitted json parsing tools.
- */
-class MultiplexorEventProtocolCoder implements EventProtocolCoder {
-	/**
-	 * Logger 
-	 */
-	private static Logger logger = LoggerFactory.getLogger(MultiplexorEventProtocolCoder.class);
-	
-	/**
-	 * Decoders
-	 */
-	protected EventProtocolDecoder decoders = new EventProtocolDecoder();
-	
-	/**
-	 * Encoders
-	 */
-	protected EventProtocolEncoder encoders = new EventProtocolEncoder();
-	
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void addDecoder(String groupId, String artifactId, String topic, 
-			               String eventClass, 
-			               JsonProtocolFilter protocolFilter,
-			               CustomGsonCoder customGsonCoder,
-			               CustomJacksonCoder customJacksonCoder,
-			               int modelClassLoaderHash) 
-		   throws IllegalArgumentException {
-		logger.info("{}: add-decoder {}:{}:{}:{}:{}:{}:{}:{}", this, 
-				    groupId, artifactId, topic, eventClass,
-				    protocolFilter, customGsonCoder, customJacksonCoder,
-				    modelClassLoaderHash);
-		this.decoders.add(groupId, artifactId, topic, eventClass, protocolFilter, 
-				         customGsonCoder, customJacksonCoder, modelClassLoaderHash);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void addEncoder(String groupId, String artifactId, String topic, 
-			               String eventClass, 
-			               JsonProtocolFilter protocolFilter,
-			               CustomGsonCoder customGsonCoder,
-			               CustomJacksonCoder customJacksonCoder,
-			               int modelClassLoaderHash) 
-		   throws IllegalArgumentException {
-		logger.info("{}: add-decoder {}:{}:{}:{}:{}:{}:{}:{}", this, 
-			        groupId, artifactId, topic, eventClass,
-			        protocolFilter, customGsonCoder, customJacksonCoder,
-			        modelClassLoaderHash);
-		this.encoders.add(groupId, artifactId, topic, eventClass, protocolFilter, 
-		                  customGsonCoder, customJacksonCoder, modelClassLoaderHash);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void removeDecoders(String groupId, String artifactId, String topic) 
-		   throws IllegalArgumentException {
-		logger.info("{}: remove-decoder {}:{}:{}", this, groupId, artifactId, topic);	
-		this.decoders.remove(groupId, artifactId, topic);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void removeEncoders(String groupId, String artifactId, String topic) 
-		   throws IllegalArgumentException {
-		logger.info("{}: remove-encoder {}:{}:{}", this, groupId, artifactId, topic);
-		this.encoders.remove(groupId, artifactId, topic);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isDecodingSupported(String groupId, String artifactId, String topic) {	
-		return this.decoders.isCodingSupported(groupId, artifactId, topic);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isEncodingSupported(String groupId, String artifactId, String topic) {
-		return this.encoders.isCodingSupported(groupId, artifactId, topic);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object decode(String groupId, String artifactId, String topic, String json) 
-			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
-		logger.debug("{}: decode {}:{}:{}:{}", this, groupId, artifactId, topic, json);
-		return this.decoders.decode(groupId, artifactId, topic, json);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String encode(String groupId, String artifactId, String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
-		logger.debug("{}: encode {}:{}:{}:{}", this, groupId, artifactId, topic, event);
-		return this.encoders.encode(groupId, artifactId, topic, event);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String encode(String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
-		logger.debug("{}: encode {}:{}", this, topic, event);
-		return this.encoders.encode(topic, event);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String encode(String topic, Object event, DroolsController droolsController) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
-		logger.debug("{}: encode {}:{}:{}", this, topic, event, droolsController);
-		return this.encoders.encode(topic, event, droolsController);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId, String topic) 
-			throws IllegalArgumentException {		
-		return this.decoders.getFilters(groupId, artifactId, topic);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ProtocolCoderToolset getDecoders(String groupId, String artifactId, String topic) 
-			throws IllegalArgumentException {		
-		Pair<ProtocolCoderToolset,ProtocolCoderToolset> decoderToolsets = this.decoders.getCoders(groupId, artifactId, topic);
-		if (decoderToolsets == null)
-			throw new IllegalArgumentException("Decoders not found for " + groupId + ":" + artifactId + ":" + topic);
-		
-		return decoderToolsets.first();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId, String topic) 
-			throws IllegalArgumentException {		
-		return this.encoders.getFilters(groupId, artifactId, topic);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public CoderFilters getDecoderFilters(String groupId, String artifactId, String topic, String classname)
-			throws IllegalArgumentException {		
-		return this.decoders.getFilters(groupId, artifactId, topic, classname);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public CoderFilters getEncoderFilters(String groupId, String artifactId, String topic, String classname)
-			throws IllegalArgumentException {	
-		return this.encoders.getFilters(groupId, artifactId, topic, classname);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<CoderFilters> getReverseEncoderFilters(String topic, String encodedClass) throws IllegalArgumentException {
-		return this.encoders.getReverseFilters(topic, encodedClass);
-	}
-
-	/**
-	 * get all deocders by maven coordinates and topic
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * 
-	 * @return list of decoders
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	@Override
-	public List<ProtocolCoderToolset> getDecoders(String groupId, String artifactId) 
-			throws IllegalArgumentException {
-
-		List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> decoderToolsets = this.decoders.getCoders(groupId, artifactId);
-		if (decoderToolsets == null)
-			throw new IllegalArgumentException("Decoders not found for " + groupId + ":" + artifactId);
-		
-		List<ProtocolCoderToolset> parser1CoderToolset = new ArrayList<>();
-		for (Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderToolsetPair : decoderToolsets) {
-			parser1CoderToolset.add(coderToolsetPair.first());
-		}
-		
-		return parser1CoderToolset;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<CoderFilters> getDecoderFilters(String groupId, String artifactId) throws IllegalArgumentException {
-		return this.decoders.getFilters(groupId, artifactId);
-		
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<CoderFilters> getEncoderFilters(String groupId, String artifactId) throws IllegalArgumentException {
-		return this.encoders.getFilters(groupId, artifactId);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DroolsController getDroolsController(String topic, Object encodedClass) throws IllegalArgumentException {
-		return this.encoders.getDroolsController(topic, encodedClass);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<DroolsController> getDroolsControllers(String topic, Object encodedClass) throws IllegalArgumentException {
-		return this.encoders.getDroolsControllers(topic, encodedClass);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("MultiplexorEventProtocolCoder [decoders=").append(decoders).append(", encoders=")
-				.append(encoders).append("]");
-		return builder.toString();
-	}
-}
-
-/**
- * This protocol Coder that does its best attempt to decode/encode, selecting the best
- * class and best fitted json parsing tools.
- */
-abstract class GenericEventProtocolCoder  {
-	private static Logger  logger = LoggerFactory.getLogger(GenericEventProtocolCoder.class);	
-	
-	/**
-	 * Mapping topic:controller-id -> <protocol-decoder-toolset-pair> 
-	 * where protocol-coder-toolset-pair contains both a jackson-protocol-coder-toolset
-	 * and a gson-protocol-coder-toolset.   The first value of the pair will the 
-	 * protocol coder toolset most likely to be successful with the encoding or decoding,
-	 * and consequently the second value will be the less likely.
-	 */
-	protected final HashMap<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>> coders = 
-			new HashMap<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
-	
-	/**
-	 * Mapping topic + classname -> Protocol Set 
-	 */
-	protected final HashMap<String, List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>> reverseCoders = 
-			new HashMap<String, List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>>();
-	
-	protected boolean multipleToolsetRetries = false;
-	
-	GenericEventProtocolCoder(boolean multipleToolsetRetries) {
-		this.multipleToolsetRetries = multipleToolsetRetries;
-	}
-	
-	/**
-	 * Index a new coder
-	 *  
-	 * @param groupId of the controller
-	 * @param artifactId of the controller
-	 * @param topic the topic 
-	 * @param eventClass the event class
-	 * @param protocolFilter filters to selectively choose a particular decoder
-	 * when there are multiples
-	 * 
-	 * @throw IllegalArgumentException if an invalid parameter is passed
-	 */
-	public void add(String groupId, String artifactId, 
-			        String topic, 
-			        String eventClass, 
-			        JsonProtocolFilter protocolFilter, 
-			        CustomGsonCoder customGsonCoder, 
-			        CustomJacksonCoder customJacksonCoder,
-			        int modelClassLoaderHash)
-		   throws IllegalArgumentException {
-		if (groupId == null || groupId.isEmpty()) {			
-			throw new IllegalArgumentException("Invalid group id");
-		}
-		
-		if (artifactId == null || artifactId.isEmpty())
-			throw new IllegalArgumentException("Invalid artifact id");
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		if (eventClass == null) {
-			throw new IllegalArgumentException("Invalid Event Class");
-		}
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		String reverseKey = this.reverseCodersKey(topic, eventClass);
-		
-		synchronized(this) {
-			if (coders.containsKey(key)) {				
-				Pair<ProtocolCoderToolset, ProtocolCoderToolset> toolsets = coders.get(key);
-				
-				logger.info("{}: adding coders for existing {}: ", this, key, toolsets.first());
-				
-				toolsets.first().addCoder(eventClass, protocolFilter, modelClassLoaderHash);
-				toolsets.second().addCoder(eventClass, protocolFilter, modelClassLoaderHash);
-				
-				if (!reverseCoders.containsKey(reverseKey)) {
-					logger.info("{}: adding new reverse coders (multiple classes case) for {}:{}: {}",
-							    this, reverseKey, key, toolsets.first());
-					
-					List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> reverseMappings =
-							new ArrayList<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
-					reverseMappings.add(toolsets);
-					reverseCoders.put(reverseKey, reverseMappings);
-				}
-				return;
-			}
-		
-			GsonProtocolCoderToolset gsonCoderTools = 
-										new GsonProtocolCoderToolset
-														(topic, key, 
-														 groupId, artifactId, 
-														 eventClass, protocolFilter,
-														 customGsonCoder,
-														 modelClassLoaderHash);
-			
-			JacksonProtocolCoderToolset jacksonCoderTools = 
-										new JacksonProtocolCoderToolset
-														(topic, key, 
-														 groupId, artifactId, 
-														 eventClass, protocolFilter,
-														 customJacksonCoder,
-														 modelClassLoaderHash);
-			
-			// Use Gson as the first priority encoding/decoding toolset, and Jackson
-			// as second.  This is because it has been observed that they can diverge
-			// somewhat in the encoding/decoding data types, which can produce json
-			// that may result incompatible with what some network elements are 
-			// expecting.   As decoding takes place, this element will reconfigure
-			// itself to set the jackson one as the favoured one first, if errors
-			// are detected in the gson encoding
-			
-			Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = 
-					new Pair<ProtocolCoderToolset,ProtocolCoderToolset>(gsonCoderTools, 
-							                                            jacksonCoderTools);
-			
-			logger.info("{}: adding coders for new {}: {}", this, key, coderTools.first());
-			
-			coders.put(key, coderTools);
-			
-			if (reverseCoders.containsKey(reverseKey)) {
-				// There is another controller (different group id/artifact id/topic)
-				// that shares the class and the topic.
-				
-				List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> toolsets = 
-															reverseCoders.get(reverseKey);
-				boolean present = false;
-				for (Pair<ProtocolCoderToolset,ProtocolCoderToolset> parserSet: toolsets) {
-					// just doublecheck
-					present = parserSet.first().getControllerId().equals(key);
-					if (present) {
-						/* anomaly */
-						logger.error("{}: unexpected toolset reverse mapping found for {}:{}: {}", 
-								     this, reverseKey, key, parserSet.first());
-					}
-				}
-				
-				if (present) {
-					return;
-				} else {
-					logger.info("{}: adding coder set for {}: {} ", this, 
-							    reverseKey, coderTools.getFirst());
-					toolsets.add(coderTools);
-				}
-			} else {
-				List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> toolsets =
-					new ArrayList<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
-				toolsets.add(coderTools);
-				
-				logger.info("{}: adding toolset for reverse key {}: {}", this, reverseKey, toolsets);
-				reverseCoders.put(reverseKey, toolsets);
-			}
-			
-		}
-	}
-
-	/**
-	 * produces key for indexing toolset entries
-	 * 
-	 * @param group group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @return index key
-	 */
-	protected String codersKey(String groupId, String artifactId, String topic) {
-		return groupId + ":" + artifactId + ":" + topic;
-	}
-	
-	/**
-	 * produces a key for the reverse index
-	 * 
-	 * @param topic topic 
-	 * @param eventClass coded class
-	 * @return reverse index key
-	 */
-	protected String reverseCodersKey(String topic, String eventClass) {
-		return topic + ":" + eventClass;
-	}
-	
-	/**
-	 * remove coder 
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	public void remove(String groupId, String artifactId, String topic) 
-		   throws IllegalArgumentException {
-		
-		if (groupId == null || groupId.isEmpty())
-			throw new IllegalArgumentException("Invalid group id");
-		
-		if (artifactId == null || artifactId.isEmpty())
-			throw new IllegalArgumentException("Invalid artifact id");
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		
-		synchronized(this) {
-			if (coders.containsKey(key)) {
-				Pair<ProtocolCoderToolset, ProtocolCoderToolset> p = coders.remove(key);
-				
-				logger.info("{}: removed toolset for {}: {}", this, key, p.getFirst());
-				
-				for (CoderFilters codeFilter : p.first().getCoders()) {
-					String className = codeFilter.getCodedClass();
-					String reverseKey = this.reverseCodersKey(topic, className);
-					if (this.reverseCoders.containsKey(reverseKey) ) {
-						List<Pair<ProtocolCoderToolset, ProtocolCoderToolset>> toolsets = 
-																this.reverseCoders.get(reverseKey);
-						Iterator<Pair<ProtocolCoderToolset, ProtocolCoderToolset>> toolsetsIter = 
-																				toolsets.iterator();
-						while (toolsetsIter.hasNext()) {
-							Pair<ProtocolCoderToolset, ProtocolCoderToolset> toolset = toolsetsIter.next();
-							if (toolset.first().getControllerId().equals(key)) {
-								logger.info("{}: removed coder from toolset for {} from reverse mapping {}: ", 
-										    this, reverseKey);
-								toolsetsIter.remove();
-							}
-						}
-						
-						if (this.reverseCoders.get(reverseKey).isEmpty()) {
-							logger.info("{}: removing reverse mapping for {}: ", this, reverseKey);						
-							this.reverseCoders.remove(reverseKey);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * does it support coding?
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @return true if its is codable
-	 */
-	public boolean isCodingSupported(String groupId, String artifactId, String topic) {
-		
-		if (groupId == null || groupId.isEmpty())
-			throw new IllegalArgumentException("Invalid group id");
-		
-		if (artifactId == null || artifactId.isEmpty())
-			throw new IllegalArgumentException("Invalid artifact id");
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		synchronized(this) {
-			return (coders.containsKey(key));
-		}
-	}
-	
-	/**
-	 * decode a json string into an Object
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @param json json string to convert to object
-	 * @return the decoded object
-	 * @throws IllegalArgumentException if invalid argument is provided
-	 * @throws UnsupportedOperationException if the operation cannot be performed
-	 */
-	public Object decode(String groupId, String artifactId, String topic, String json) 
-			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
-		
-		if (!isCodingSupported(groupId, artifactId, topic))
-			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic) + " for encoding");
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
-		try {
-			Object event = coderTools.first().decode(json);
-			if (event != null)
-				return event;
-		} catch (Exception e) {
-			logger.debug("{}, cannot decode {}", this, json, e);
-		}
-		
-		if (multipleToolsetRetries) {
-			// try the less favored toolset
-			try {
-				Object event = coderTools.second().decode(json);
-				if (event != null) {
-					// change the priority of the toolset
-					synchronized(this) {
-						ProtocolCoderToolset first = coderTools.first();
-						ProtocolCoderToolset second = coderTools.second();
-						coderTools.first(second);
-						coderTools.second(first);
-					}
-					
-					return event;
-				}
-			} catch (Exception e) {
-				throw new UnsupportedOperationException(e);
-			}
-		} 
-		
-		throw new UnsupportedOperationException("Cannot decode neither with gson or jackson");
-	}
-
-	/**
-	 * encode an object into a json string
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @param event object to convert to string
-	 * @return the json string
-	 * @throws IllegalArgumentException if invalid argument is provided
-	 * @throws UnsupportedOperationException if the operation cannot be performed
-	 */
-	public String encode(String groupId, String artifactId, String topic, Object event) 
-			throws IllegalArgumentException, UnsupportedOperationException {
-		
-		if (!isCodingSupported(groupId, artifactId, topic))
-			throw new IllegalArgumentException
-				("Unsupported:" + codersKey(groupId, artifactId, topic));
-		
-		if (event == null)
-			throw new IllegalArgumentException("Unsupported topic:" + topic);
-		
-		// reuse the decoder set, since there must be affinity in the model
-		String key = this.codersKey(groupId, artifactId, topic);
-		return this.encodeInternal(key, event);
-	}
-	
-	/**
-	 * encode an object into a json string
-	 * 
-	 * @param key identifier
-	 * @param event object to convert to string
-	 * @return the json string
-	 * @throws IllegalArgumentException if invalid argument is provided
-	 * @throws UnsupportedOperationException if the operation cannot be performed
-	 */
-	protected String encodeInternal(String key, Object event) 
-			throws IllegalArgumentException, UnsupportedOperationException {
-		
-		logger.debug("{}: encode for {}: {}", this, key, event);
-		
-		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
-		try {
-			String json = coderTools.first().encode(event);
-			if (json != null && !json.isEmpty())
-				return json;
-		} catch (Exception e) {
-			logger.warn("{}: cannot encode (first) for {}: {}", this, key, event, e);
-		}
-		
-		if (multipleToolsetRetries) {
-			// try the less favored toolset
-			try {
-				String json = coderTools.second().encode(event);
-				if (json != null) {
-					// change the priority of the toolset
-					synchronized(this) {
-						ProtocolCoderToolset first = coderTools.first();
-						ProtocolCoderToolset second = coderTools.second();
-						coderTools.first(second);
-						coderTools.second(first);
-					}
-					
-					return json;
-				}
-			} catch (Exception e) {
-				logger.error("{}: cannot encode (second) for {}: {}", this, key, event, e);
-				throw new UnsupportedOperationException(e);
-			}
-		}
-		
-		throw new UnsupportedOperationException("Cannot decode neither with gson or jackson");
-	}
-	
-	/**
-	 * encode an object into a json string
-	 * 
-	 * @param topic topic
-	 * @param event object to convert to string
-	 * @return the json string
-	 * @throws IllegalArgumentException if invalid argument is provided
-	 * @throws UnsupportedOperationException if the operation cannot be performed
-	 */
-	public String encode(String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException, UnsupportedOperationException {
-		
-		if (event == null)
-			throw new IllegalArgumentException("Invalid encoded class");
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid topic");
-		
-		List<DroolsController> droolsControllers = droolsCreators(topic, event);
-		
-		if (droolsControllers.isEmpty())	
-			throw new IllegalArgumentException("no drools controller has been found");
-		
-		if (droolsControllers.size() > 1) {
-			logger.warn("{}: multiple drools-controller {} for {}:{} ", this, topic,
-						droolsControllers, event.getClass().getCanonicalName());		
-			// continue
-		}
-		
-		String key = codersKey(droolsControllers.get(0).getGroupId(), droolsControllers.get(0).getArtifactId(), topic);
-		return this.encodeInternal(key, event);
-	}
-	
-	/**
-	 * encode an object into a json string
-	 * 
-	 * @param topic topic
-	 * @param encodedClass object to convert to string
-	 * @return the json string
-	 * @throws IllegalArgumentException if invalid argument is provided
-	 * @throws UnsupportedOperationException if the operation cannot be performed
-	 */
-	public String encode(String topic, Object encodedClass, DroolsController droolsController) 
-			throws IllegalArgumentException, IllegalArgumentException, UnsupportedOperationException {
-		
-		if (encodedClass == null)
-			throw new IllegalArgumentException("Invalid encoded class");
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid topic");
-		
-		String key = codersKey(droolsController.getGroupId(), droolsController.getArtifactId(), topic);
-		return this.encodeInternal(key, encodedClass);
-	}
-
-	/**
-	 * @param topic
-	 * @param encodedClass
-	 * @param reverseKey
-	 * @return
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 */
-	protected List<DroolsController> droolsCreators(String topic, Object encodedClass)
-			throws IllegalStateException, IllegalArgumentException {
-		
-		List<DroolsController> droolsControllers = new ArrayList<DroolsController>();
-		
-		String reverseKey = this.reverseCodersKey(topic, encodedClass.getClass().getCanonicalName());
-		if (!this.reverseCoders.containsKey(reverseKey)) {
-			logger.warn("{}: no reverse mapping for {}", this, reverseKey);
-			return droolsControllers;
-		}
-		
-		List<Pair<ProtocolCoderToolset, ProtocolCoderToolset>> 
-					toolsets = this.reverseCoders.get(reverseKey);
-		
-		// There must be multiple toolset pairs associated with <topic,classname> reverseKey
-		// case 2 different controllers use the same models and register the same encoder for
-		// the same topic.  This is assumed not to occur often but for the purpose of encoding
-		// but there should be no side-effects.  Ownership is crosscheck against classname and 
-		// classloader reference.
-		
-		if (toolsets == null || toolsets.isEmpty())
-			throw new IllegalStateException("No Encoders toolsets available for topic "+ topic +
-					                        " encoder " + encodedClass.getClass().getCanonicalName());
-		
-		for (Pair<ProtocolCoderToolset, ProtocolCoderToolset> encoderSet : toolsets) {
-			// figure out the right toolset
-			String groupId = encoderSet.first().getGroupId();
-			String artifactId = encoderSet.first().getArtifactId();
-			List<CoderFilters> coders = encoderSet.first().getCoders();
-			for (CoderFilters coder : coders) {
-				if (coder.getCodedClass().equals(encodedClass.getClass().getCanonicalName())) {
-					DroolsController droolsController = 
-							DroolsController.factory.get(groupId, artifactId, "");
-					if (droolsController.ownsCoder(encodedClass.getClass(), coder.getModelClassLoaderHash())) {
-						droolsControllers.add(droolsController);
-					}
-				}
-			}
-		}
-		
-		if (droolsControllers.isEmpty())
-			throw new IllegalStateException("No Encoders toolsets available for "+ topic +
-		                                    ":" + encodedClass.getClass().getCanonicalName());
-		
-		return droolsControllers;
-	}
-
-
-	/**
-	 * get all filters by maven coordinates and topic
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @return list of coders
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	public List<CoderFilters> getFilters(String groupId, String artifactId, String topic) 
-			throws IllegalArgumentException {
-		
-		if (!isCodingSupported(groupId, artifactId, topic))
-			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic));
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
-		return coderTools.first().getCoders();
-	}
-	
-	/**
-	 * get all coders by maven coordinates and topic
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @return list of coders
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	public Pair<ProtocolCoderToolset,ProtocolCoderToolset> getCoders(String groupId, String artifactId, String topic) 
-			throws IllegalArgumentException {
-		
-		if (!isCodingSupported(groupId, artifactId, topic))
-			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic));
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
-		return coderTools;
-	}
-	
-	/**
-	 * get all coders by maven coordinates and topic
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @return list of coders
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	public List<CoderFilters> getFilters(String groupId, String artifactId) 
-			throws IllegalArgumentException {
-		
-		if (groupId == null || groupId.isEmpty())
-			throw new IllegalArgumentException("Invalid group id");
-		
-		if (artifactId == null || artifactId.isEmpty())
-			throw new IllegalArgumentException("Invalid artifact id");
-		
-		String key = this.codersKey(groupId, artifactId, "");
-		
-		List<CoderFilters> codersFilters = new ArrayList<CoderFilters>();
-		for (Map.Entry<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>> entry : coders.entrySet()) {
-			if (entry.getKey().startsWith(key)) {
-				codersFilters.addAll(entry.getValue().first().getCoders());
-			}
-		}
-		
-		return codersFilters;
-	}
-	
-	/**
-	 * get all coders by maven coordinates and topic
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @return list of coders
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	public List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> getCoders(String groupId, String artifactId) 
-			throws IllegalArgumentException {
-		
-		if (groupId == null || groupId.isEmpty())
-			throw new IllegalArgumentException("Invalid group id");
-		
-		if (artifactId == null || artifactId.isEmpty())
-			throw new IllegalArgumentException("Invalid artifact id");
-		
-		String key = this.codersKey(groupId, artifactId, "");
-		
-		List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> coderToolset = new ArrayList<Pair<ProtocolCoderToolset,ProtocolCoderToolset>>();
-		for (Map.Entry<String, Pair<ProtocolCoderToolset,ProtocolCoderToolset>> entry : coders.entrySet()) {
-			if (entry.getKey().startsWith(key)) {
-				coderToolset.add(entry.getValue());
-			}
-		}
-		
-		return coderToolset;
-	}
-
-
-	/**
-	 * get all filters by maven coordinates, topic, and classname
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @param topic topic
-	 * @param classname
-	 * @return list of coders
-	 * @throws IllegalArgumentException if invalid input
-	 */
-	public CoderFilters getFilters(String groupId, String artifactId, String topic, String classname)
-			throws IllegalArgumentException {
-		
-		if (!isCodingSupported(groupId, artifactId, topic))
-			throw new IllegalArgumentException("Unsupported:" + codersKey(groupId, artifactId, topic));
-		
-		if (classname == null || classname.isEmpty())
-			throw new IllegalArgumentException("classname must be provided");
-		
-		String key = this.codersKey(groupId, artifactId, topic);
-		Pair<ProtocolCoderToolset,ProtocolCoderToolset> coderTools = coders.get(key);
-		return coderTools.first().getCoder(classname);
-	}
-	
-	/**
-	 * get coded based on class and topic
-	 * 
-	 * @param topic
-	 * @param codedClass
-	 * @return
-	 * @throws IllegalArgumentException
-	 */
-	public List<CoderFilters> getReverseFilters(String topic, String codedClass)
-			throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Unsupported");
-		
-		if (codedClass == null)
-			throw new IllegalArgumentException("class must be provided");
-		
-		String key = this.reverseCodersKey(topic, codedClass);
-		List<Pair<ProtocolCoderToolset,ProtocolCoderToolset>> toolsets = this.reverseCoders.get(key);
-		if (toolsets == null)
-			throw new IllegalArgumentException("No Coder found for " + key);
-		
-		
-		List<CoderFilters> coders = new ArrayList<CoderFilters>();
-		for (Pair<ProtocolCoderToolset,ProtocolCoderToolset> toolset: toolsets) {
-			coders.addAll(toolset.first().getCoders());
-		}
-		
-		return coders;
-	}
-	
-	/**
-	 * returns group and artifact id of the creator of the encoder
-	 * 
-	 * @param topic
-	 * @param fact
-	 * @return
-	 * @throws IllegalArgumentException
-	 */
-	DroolsController getDroolsController(String topic, Object fact)
-			throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Unsupported");
-		
-		if (fact == null)
-			throw new IllegalArgumentException("class must be provided");
-		
-		List<DroolsController> droolsControllers = droolsCreators(topic, fact);
-		
-		if (droolsControllers.isEmpty())	
-			throw new IllegalArgumentException("Invalid Topic: " + topic);
-		
-		if (droolsControllers.size() > 1) {
-			logger.warn("{}: multiple drools-controller {} for {}:{} ", this,
-				        droolsControllers, topic, fact.getClass().getCanonicalName());
-			// continue
-		}
-		return droolsControllers.get(0);
-	}
-	
-	/**
-	 * returns group and artifact id of the creator of the encoder
-	 * 
-	 * @param topic
-	 * @param fact
-	 * @return
-	 * @throws IllegalArgumentException
-	 */
-	List<DroolsController> getDroolsControllers(String topic, Object fact)
-			throws IllegalArgumentException {
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Unsupported");
-		
-		if (fact == null)
-			throw new IllegalArgumentException("class must be provided");
-		
-		List<DroolsController> droolsControllers = droolsCreators(topic, fact);
-		if (droolsControllers.size() > 1) {
-			// unexpected
-			logger.warn("{}: multiple drools-controller {} for {}:{} ", this,
-					    droolsControllers, topic, fact.getClass().getCanonicalName());		
-			// continue
-		}
-		return droolsControllers;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("GenericEventProtocolCoder [coders=").append(coders.keySet()).append(", reverseCoders=")
-				.append(reverseCoders.keySet()).append("]");
-		return builder.toString();
-	}
-}
-
-class EventProtocolDecoder extends GenericEventProtocolCoder {
-
-	public EventProtocolDecoder(){super(false);}
-	
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("EventProtocolDecoder [toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-	
-}
-	
-class EventProtocolEncoder extends GenericEventProtocolCoder {
-	
-	public EventProtocolEncoder(){super(false);}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("EventProtocolEncoder [toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-}
\ No newline at end of file
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java
deleted file mode 100644
index 7831e7b8..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/JsonProtocolFilter.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.coders;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openecomp.policy.drools.utils.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-/**
- * JSON Protocol Filter.  Evaluates an JSON string and evaluates if it
- * passes its filters.
- */
-public class JsonProtocolFilter {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(JsonProtocolFilter.class);
-	
-	/**
-	 * Helper class to collect Filter information
-	 */
-	public static class FilterRule {
-		/**
-		 * Field name
-		 */
-		protected String name;
-		
-		/**
-		 * Field Value regex
-		 */
-		protected String regex;
-		
-		/**
-		 * Filter Constructor
-		 * 
-		 * @param name field name
-		 * @param regex field regex value
-		 */
-		public FilterRule(String name, String regex) {
-			this.name = name;
-			this.regex = regex;
-		}
-
-		/**
-		 * Default constructor (for serialization only)
-		 */
-		public FilterRule() {
-			super();
-		}
-
-		/**
-		 * gets name
-		 * 
-		 * @return
-		 */
-		public String getName() {
-			return name;
-		}
-
-		/**
-		 * gets regex
-		 * 
-		 * @return
-		 */
-		public String getRegex() {
-			return regex;
-		}
-
-		/**
-		 * sets field name
-		 * @param name field name
-		 */
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		/**
-		 * sets regex name
-		 * @param regex
-		 */
-		public void setRegex(String regex) {
-			this.regex = regex;
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("Filter [name=").append(name).append(", regex=").append(regex).append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * all the filters to be applied
-	 */
-	protected List<FilterRule> rules = new ArrayList<FilterRule>();
-	
-	/**
-	 * 
-	 * @param rawFilters raw filter initialization
-	 * 
-	 * @throws IllegalArgumentException an invalid input has been provided
-	 */
-	public static JsonProtocolFilter fromRawFilters(List<Pair<String, String>> rawFilters) 
-		throws IllegalArgumentException {
-		
-		if (rawFilters == null) {
-			throw new IllegalArgumentException("No raw filters provided");
-		}
-		
-		List<FilterRule> filters = new ArrayList<FilterRule>();
-		for (Pair<String, String> filterPair: rawFilters) {
-			if  (filterPair.first() == null || filterPair.first().isEmpty()) {
-				continue;
-			}
-			
-			filters.add(new FilterRule(filterPair.first(), filterPair.second()));
-		}
-		return new JsonProtocolFilter(filters);
-	}
-	
-	/**
-	 * Create a Protocol Filter
-	 * 
-	 * @throws IllegalArgumentException an invalid input has been provided
-	 */
-	public JsonProtocolFilter() throws IllegalArgumentException {}
-	
-	/**
-	 * 
-	 * @param rawFilters raw filter initialization
-	 * 
-	 * @throws IllegalArgumentException an invalid input has been provided
-	 */
-	public JsonProtocolFilter(List<FilterRule> filters) throws IllegalArgumentException {
-		this.rules = filters;
-	}
-
-	/**
-	 * are there any filters?
-	 * 
-	 * @return true if there are filters, false otherwise
-	 */
-	public boolean isRules() {
-		return !this.rules.isEmpty();
-	}
-
-	/**
-	 * accept a JSON string as conformant it if passes all filters
-	 * 
-	 * @param json json is a JSON object
-	 * @return true if json string is conformant
-	 * 
-	 * @throws IllegalArgumentException an invalid input has been provided
-	 */
-	public synchronized boolean accept(JsonElement json) throws IllegalArgumentException {
-		if (json == null) {
-			throw new IllegalArgumentException("no JSON provided");
-		}
-		
-		if (rules.isEmpty()) {
-			return true;
-		}
-		
-		try {
-			if (!json.isJsonObject()) {
-				return false;
-			}
-			
-			JsonObject event = json.getAsJsonObject();
-			for (FilterRule filter: rules) {
-				if (filter.regex == null || 
-					filter.regex.isEmpty() ||  
-					filter.regex.equals(".*")) {
-					
-					// Only check for presence
-					if (!event.has(filter.name)) {
-						return false;
-					}
-				} else {
-					JsonElement field = event.get(filter.name);
-					if (field == null) {
-						return false;
-					}
-					
-					String fieldValue = field.getAsString();
-					if (!fieldValue.matches(filter.regex)) {
-						return false;
-					}
-				}
-			}
-			return true;
-		} catch (Exception e) {
-			throw new IllegalArgumentException(e);
-		}
-	}
-	
-	/**
-	 * accept a JSON string as conformant it if passes all filters
-	 * 
-	 * @param json json string
-	 * @return true if json string is conformant
-	 * 
-	 * @throws IllegalArgumentException an invalid input has been provided
-	 */
-	public synchronized boolean accept(String json) throws IllegalArgumentException {
-		if (json == null || json.isEmpty()) {
-			throw new IllegalArgumentException("no JSON provided");
-		}
-		
-		if (rules.isEmpty()) {
-			return true;
-		}
-		
-		try {
-			JsonElement element = new JsonParser().parse(json);
-			if (element == null || !element.isJsonObject()) {
-				return false;
-			}
-			
-			return this.accept(element.getAsJsonObject());
-		} catch (IllegalArgumentException ile) {
-			throw ile;
-		} catch (Exception e) {
-			logger.info("{}: cannot accept {} because of {}", 
-					    this, json, e.getMessage(), e);
-			throw new IllegalArgumentException(e);			
-		}
-	}
-
-	public List<FilterRule> getRules() {
-		return rules;
-	}
-
-	public synchronized void setRules(List<FilterRule> rulesFilters) {
-		this.rules = rulesFilters;
-	}
-	
-	public synchronized void deleteRules(String name) {
-		for (FilterRule rule : new ArrayList<>(this.rules)) {
-		    if (rule.name.equals(name)) {
-		    	this.rules.remove(rule);
-		    }
-		}
-	}
-	
-	public List<FilterRule> getRules(String name) {
-		ArrayList<FilterRule> temp = new ArrayList<>();
-		for (FilterRule rule : new ArrayList<>(this.rules)) {
-		    if (rule.name.equals(name)) {
-		    	temp.add(rule);
-		    }
-		}
-		return temp;
-	}
-	
-	public synchronized void deleteRule(String name, String regex) {
-		for (FilterRule rule : new ArrayList<>(this.rules)) {
-		    if (rule.name.equals(name) && rule.regex.equals(regex)) {
-		    	this.rules.remove(rule);
-		    }
-		}
-	}
-	
-	public synchronized void addRule(String name, String regex) {
-		for (FilterRule rule : new ArrayList<>(this.rules)) {
-		    if (rule.name.equals(name) && rule.regex.equals(regex)) {
-		    	return;
-		    }
-		}
-		
-		this.rules.add(new FilterRule(name,regex));
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("JsonProtocolFilter [rules=").append(rules).append("]");
-		return builder.toString();
-	}
-
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java
deleted file mode 100644
index bf7a43f3..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/ProtocolCoderToolset.java
+++ /dev/null
@@ -1,683 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.coders;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.openecomp.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-/**
- * Protocol Coding/Decoding Toolset
- */
-public abstract class ProtocolCoderToolset {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(ProtocolCoderToolset.class);
-	
-	/**
-	 * topic
-	 */
-	protected final String topic;
-	
-	/**
-	 * controller id
-	 */
-	protected final String controllerId;
-	
-	/**
-	 * group id
-	 */
-	protected final String groupId;
-	
-	/**
-	 * artifact id
-	 */
-	protected final String artifactId;
-	
-	/**
-	 * Protocols and associated Filters
-	 */
-	protected final List<CoderFilters> coders = new ArrayList<CoderFilters>();
-	
-	/**
-	 * Tree model (instead of class model) generic parsing to be able to inspect elements
-	 */
-	protected JsonParser filteringParser = new JsonParser();
-
-	/**
-	 * custom coder
-	 */
-	protected CustomCoder customCoder;
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param topic the topic
-	 * @param controllerId the controller id
-	 * @param codedClass the decoded class
-	 * @param filters list of filters that apply to the
-	 * selection of this decodedClass in case of multiplicity
-	 * @throws IllegalArgumentException if invalid data has been passed in
-	 */
-	public ProtocolCoderToolset(String topic, 
-								String controllerId, 
-			                    String groupId,
-			                    String artifactId,
-			                    String codedClass, 
-			                    JsonProtocolFilter filters, 
-						        CustomCoder customCoder,
-						        int modelClassLoaderHash)
-		throws IllegalArgumentException {
-		
-		if (topic == null || controllerId == null || 
-			groupId == null || artifactId == null ||
-			codedClass == null || filters == null ||
-			topic.isEmpty() || controllerId.isEmpty()) {
-			// TODO
-			throw new IllegalArgumentException("Invalid input");
-		}
-		
-		this.topic = topic;
-		this.controllerId = controllerId;
-		this.groupId = groupId;
-		this.artifactId = artifactId;
-		this.coders.add(new CoderFilters(codedClass, filters, modelClassLoaderHash));
-		this.customCoder = customCoder;
-	}
-	
-	/**
-	 * gets the coder + filters associated with this class name
-	 * 
-	 * @param classname class name
-	 * @return the decoder filters or null if not found
-	 */
-	public CoderFilters getCoder(String classname) {
-		for (CoderFilters decoder: this.coders) {
-			if (decoder.factClass.equals(classname)) {
-				return decoder;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * get all coder filters in use
-	 * 
-	 * @return coder filters
-	 */
-	public List<CoderFilters> getCoders() {
-		return this.coders;
-	}
-
-	/**
-	 * add coder or replace it exists
-	 * 
-	 * @param eventClass decoder
-	 * @param filter filter
-	 */
-	public void addCoder(String eventClass, JsonProtocolFilter filter, int modelClassLoaderHash) {
-		synchronized(this) {
-			for (CoderFilters coder: this.coders) {
-				if (coder.factClass.equals(eventClass)) {
-					// this is a better check than checking pointers, just
-					// in case classloader is different and this is just an update
-					coder.factClass = eventClass;
-					coder.filter = filter;
-					coder.modelClassLoaderHash = modelClassLoaderHash;
-					return;
-				}
-			}
-		}
-		
-		this.coders.add(new CoderFilters(eventClass, filter, modelClassLoaderHash));
-	}
-	
-	/**
-	 * remove coder
-	 * 
-	 * @param eventClass decoder
-	 * @param filter filter
-	 */
-	public void removeCoders(String eventClass) {
-		synchronized(this) {
-			Iterator<CoderFilters> codersIt = this.coders.iterator();
-			while (codersIt.hasNext()) {
-				CoderFilters coder = codersIt.next();
-				if (coder.factClass.equals(eventClass)) {
-					codersIt.remove();
-				}
-			}
-		}
-	}
-
-	/**
-	 * gets the topic
-	 * 
-	 * @return the topic
-	 */
-	public String getTopic() {return topic;}
-	
-	/**
-	 * gets the controller id
-	 * 
-	 * @return the controller id
-	 */
-	public String getControllerId() {return controllerId;}
-
-	/**
-	 * @return the groupId
-	 */
-	public String getGroupId() {
-		return groupId;
-	}
-
-	/**
-	 * @return the artifactId
-	 */
-	public String getArtifactId() {
-		return artifactId;
-	}
-
-	/**
-	 * @return the customCoder
-	 */
-	public CustomCoder getCustomCoder() {
-		return customCoder;
-	}
-
-	/**
-	 * @param customCoder the customCoder to set
-	 */
-	public void setCustomCoder(CustomCoder customCoder) {
-		this.customCoder = customCoder;
-	}
-
-	/**
-	 * performs filtering on a json string
-	 * 
-	 * @param json json string
-	 * @return the decoder that passes the filter, otherwise null
-	 * @throws UnsupportedOperationException can't filter
-	 * @throws IllegalArgumentException invalid input
-	 */
-	protected CoderFilters filter(String json) 
-			throws UnsupportedOperationException, IllegalArgumentException, IllegalStateException {
-		
-
-		// 1. Get list of decoding classes for this controller Id and topic
-		// 2. If there are no classes, return error
-		// 3. Otherwise, from the available classes for decoding, pick the first one that
-		//    passes the filters	
-		
-		// Don't parse if it is not necessary
-		
-		if (this.coders.isEmpty()) {
-			// TODO this is an error
-			throw new IllegalStateException("No coders available");
-		}
-		
-		if (this.coders.size() == 1) {
-			JsonProtocolFilter filter = this.coders.get(0).getFilter();
-			if (!filter.isRules()) {
-				return this.coders.get(0);
-			}
-		}
-		
-		JsonElement event;
-		try {
-			event = this.filteringParser.parse(json);
-		} catch (Exception e) {
-			throw new UnsupportedOperationException(e);
-		}
-		
-		for (CoderFilters decoder: this.coders) {
-			try {
-				boolean accepted = decoder.getFilter().accept(event);
-				if (accepted) {
-					return decoder;
-				} 
-			} catch (Exception e) {
-				logger.info("{}: unexpected failure accepting {} because of {}", 
-						    this, event, e.getMessage(), e);
-				// continue
-			}
-		}
-		
-		return null;
-	}
-
-	/**
-	 * Decode json into a POJO object
-	 * @param json json string
-	 * 
-	 * @return a POJO object for the json string
-	 * @throws IllegalArgumentException if an invalid parameter has been received
-	 * @throws UnsupportedOperationException if parsing into POJO is not possible
-	 */
-	public abstract Object decode(String json) 
-			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException;
-	
-	/**
-	 * Encodes a POJO object into a JSON String
-	 * 
-	 * @param event JSON POJO event to be converted to String
-	 * @return JSON string version of POJO object
-	 * @throws IllegalArgumentException if an invalid parameter has been received
-	 * @throws UnsupportedOperationException if parsing into POJO is not possible
-	 */
-	public abstract String encode(Object event) 
-			throws IllegalArgumentException, UnsupportedOperationException;
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("ProtocolCoderToolset [topic=").append(topic).append(", controllerId=").append(controllerId)
-				.append(", groupId=").append(groupId).append(", artifactId=").append(artifactId).append(", coders=")
-				.append(coders).append(", filteringParser=").append(filteringParser).append(", customCoder=")
-				.append(customCoder).append("]");
-		return builder.toString();
-	}
-}
-
-/**
- * Tools used for encoding/decoding using Jackson
- */
-class JacksonProtocolCoderToolset extends ProtocolCoderToolset {
-	private static Logger  logger = LoggerFactory.getLogger(JacksonProtocolCoderToolset.class);	
-	/**
-	 * decoder
-	 */
-	@JsonIgnore
-	protected final ObjectMapper decoder = new ObjectMapper();
-	
-	/**
-	 * encoder
-	 */
-	@JsonIgnore
-	protected final ObjectMapper encoder = new ObjectMapper();
-	
-	/**
-	 * Toolset to encode/decode tools associated with a topic
-	 * 
-	 * @param topic topic
-	 * @param decodedClass decoded class of an event
-	 * @param filter 
-	 */
-	public JacksonProtocolCoderToolset(String topic, String controllerId, 
-									   String groupId, String artifactId,
-			                           String decodedClass, 
-			                           JsonProtocolFilter filter,
-			                           CustomJacksonCoder customJacksonCoder,
-			                           int modelClassLoaderHash) {
-		super(topic, controllerId, groupId, artifactId, decodedClass, filter, customJacksonCoder, modelClassLoaderHash);
-		decoder.registerModule(new JavaTimeModule());
-		decoder.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
-				          false);
-	}
-	
-	/**
-	 * gets the Jackson decoder
-	 * 
-	 * @return the Jackson decoder
-	 */
-	@JsonIgnore
-	protected ObjectMapper getDecoder() {return decoder;}
-	
-	/**
-	 * gets the Jackson encoder
-	 * 
-	 * @return the Jackson encoder
-	 */
-	@JsonIgnore
-	protected ObjectMapper getEncoder() {return encoder;}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object decode(String json) 
-			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
-
-		// 0. Use custom coder if available
-		
-		if (this.customCoder != null) {
-			throw new UnsupportedOperationException
-					("Jackon Custom Decoder is not supported at this time");
-		}
-		
-		DroolsController droolsController = 
-				DroolsController.factory.get(groupId, artifactId, "");
-		if (droolsController == null) {
-			logger.warn("{}: no drools-controller to process {}", this, json);
-			throw new IllegalStateException("no drools-controller to process event");
-		}
-		
-		CoderFilters decoderFilter = filter(json);
-		if (decoderFilter == null) {
-			logger.debug("{}: no decoder to process {}", this, json);
-			throw new UnsupportedOperationException("no decoder to process event");
-		}
-		
-		Class<?> decoderClass;
-		try {
-			decoderClass = 
-					droolsController.fetchModelClass(decoderFilter.getCodedClass());
-			if (decoderClass ==  null) {
-				logger.warn("{}: cannot fetch application class {}", this, decoderFilter.getCodedClass());
-				throw new IllegalStateException("cannot fetch application class " +  decoderFilter.getCodedClass());				
-			}
-		} catch (Exception e) {
-			logger.warn("{}: cannot fetch application class {} because of {}", this, 
-					    decoderFilter.getCodedClass(), e.getMessage());
-			throw new UnsupportedOperationException("cannot fetch application class " +  decoderFilter.getCodedClass(), e);
-		}
-		
-
-		try {
-			Object fact = this.decoder.readValue(json, decoderClass);
-			return fact;
-		} catch (Exception e) {
-			logger.warn("{} cannot decode {} into {} because of {}",
-					    this, json, decoderClass.getName(), e.getMessage(), e);
-			throw new UnsupportedOperationException("cannont decode into " + decoderFilter.getCodedClass(), e);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String encode(Object event) 
-			throws IllegalArgumentException, UnsupportedOperationException {
-		
-		// 0. Use custom coder if available
-		
-		if (this.customCoder != null) {
-			throw new UnsupportedOperationException
-					("Jackon Custom Encoder is not supported at this time");
-		}
-		
-		try {
-			String encodedEvent = this.encoder.writeValueAsString(event);
-			return encodedEvent;			
-		} catch (JsonProcessingException e) {
-			logger.error("{} cannot encode {} because of {}", this, event, e.getMessage(), e);
-			throw new UnsupportedOperationException("event cannot be encoded");
-		}
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("JacksonProtocolCoderToolset [toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-
-}
-
-/**
- * Tools used for encoding/decoding using Jackson
- */
-class GsonProtocolCoderToolset extends ProtocolCoderToolset {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger  logger = LoggerFactory.getLogger(GsonProtocolCoderToolset.class);
-	
-	/**
-	 * Formatter for JSON encoding/decoding
-	 */
-	@JsonIgnore
-	public static DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
-	
-	@JsonIgnore
-	public static DateTimeFormatter zuluFormat = DateTimeFormatter.ISO_INSTANT;
-	
-	/**
-	 * Adapter for ZonedDateTime
-	 */
-
-	public static class GsonUTCAdapter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
-
-		public ZonedDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context)
-				throws JsonParseException {
-			try {
-				return ZonedDateTime.parse(element.getAsString(), format);
-			} catch (Exception e) {
-				logger.info("GsonUTCAdapter: cannot parse {} because of {}", 
-						    element, e.getMessage(), e);
-			}
-			return null;
-		}
-
-		public JsonElement serialize(ZonedDateTime datetime, Type type, JsonSerializationContext context) {
-			return new JsonPrimitive(datetime.format(format));
-		}	
-	}
-	
-	public static class GsonInstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
-
-		@Override
-		public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-				throws JsonParseException {
-			return Instant.ofEpochMilli(json.getAsLong());
-		}
-
-		@Override
-		public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
-			return new JsonPrimitive(src.toEpochMilli());
-		}
-		
-	}
-
-	
-	/**
-	 * decoder
-	 */
-	@JsonIgnore
-	protected final Gson decoder = new GsonBuilder().disableHtmlEscaping().
-													 registerTypeAdapter(ZonedDateTime.class, new GsonUTCAdapter()).
-													 create();
-	
-	/**
-	 * encoder
-	 */
-	@JsonIgnore
-	protected final Gson encoder = new GsonBuilder().disableHtmlEscaping().
-													 registerTypeAdapter(ZonedDateTime.class, new GsonUTCAdapter()).
-													 create();
-	
-	/**
-	 * Toolset to encode/decode tools associated with a topic
-	 * 
-	 * @param topic topic
-	 * @param decodedClass decoded class of an event
-	 * @param filter 
-	 */
-	public GsonProtocolCoderToolset(String topic, String controllerId, 
-					   				String groupId, String artifactId,
-					   				String decodedClass, 
-					   				JsonProtocolFilter filter,
-							        CustomGsonCoder customGsonCoder,
-							        int modelClassLoaderHash) {
-		super(topic, controllerId, groupId, artifactId, decodedClass, filter, customGsonCoder, modelClassLoaderHash);
-	}
-	
-	/**
-	 * gets the Gson decoder
-	 * 
-	 * @return the Gson decoder
-	 */
-	@JsonIgnore
-	protected Gson getDecoder() {return decoder;}
-	
-	/**
-	 * gets the Gson encoder
-	 * 
-	 * @return the Gson encoder
-	 */
-	@JsonIgnore
-	protected Gson getEncoder() {return encoder;}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object decode(String json) 
-			throws IllegalArgumentException, UnsupportedOperationException, IllegalStateException {
-	
-		DroolsController droolsController = 
-				DroolsController.factory.get(groupId, artifactId, "");
-		if (droolsController == null) {
-			logger.warn("{}: no drools-controller to process {}", this, json);
-			throw new IllegalStateException("no drools-controller to process event");
-		}
-		
-		CoderFilters decoderFilter = filter(json);
-		if (decoderFilter == null) {
-			logger.debug("{}: no decoder to process {}", this, json);
-			throw new UnsupportedOperationException("no decoder to process event");
-		}
-		
-		Class<?> decoderClass;
-		try {
-			decoderClass = 
-					droolsController.fetchModelClass(decoderFilter.getCodedClass());
-			if (decoderClass ==  null) {
-				logger.warn("{}: cannot fetch application class {}", this, decoderFilter.getCodedClass());
-				throw new IllegalStateException("cannot fetch application class " +  decoderFilter.getCodedClass());				
-			}
-		} catch (Exception e) {
-			logger.warn("{}: cannot fetch application class {} because of {}", this, 
-				    decoderFilter.getCodedClass(), e.getMessage());
-			throw new UnsupportedOperationException("cannot fetch application class " +  decoderFilter.getCodedClass(), e);
-		}
-		
-		if (this.customCoder != null) {
-			try {
-				Class<?> gsonClassContainer = 
-						droolsController.fetchModelClass(this.customCoder.getClassContainer());
-				Field gsonField = gsonClassContainer.getField(this.customCoder.staticCoderField);
-				Object gsonObject = gsonField.get(null);
-				Method fromJsonMethod = gsonObject.getClass().
-						                     getDeclaredMethod
-						                     	("fromJson", new Class[]{String.class, Class.class});
-				Object fact = fromJsonMethod.invoke(gsonObject, json, decoderClass);
-				return fact;
-			} catch (Exception e) {
-				logger.warn("{}: cannot fetch application class {} because of {}", this, 
-					        decoderFilter.getCodedClass(), e.getMessage());
-				throw new UnsupportedOperationException("cannot fetch application class " +  decoderFilter.getCodedClass(), e);
-			}			
-		} else {
-			try {
-				Object fact = this.decoder.fromJson(json, decoderClass);
-				return fact;
-			} catch (Exception e) {
-				logger.warn("{} cannot decode {} into {} because of {}",
-					    this, json, decoderClass.getName(), e.getMessage(), e);
-				throw new UnsupportedOperationException("cannont decode into " + decoderFilter.getCodedClass(), e);
-			}			
-		}
-	}
-
-
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String encode(Object event) 
-			throws IllegalArgumentException, UnsupportedOperationException {	
-		
-		DroolsController droolsController = 
-				DroolsController.factory.get(groupId, artifactId, null);
-		if (droolsController == null) {
-			logger.info("{}: no drools-controller to process {} (continue)", this, event);
-			throw new IllegalStateException("custom-coder but no drools-controller");
-		}
-		
-		if (this.customCoder != null) {
-			try {
-				Class<?> gsonClassContainer = 
-						droolsController.fetchModelClass(this.customCoder.getClassContainer());
-				Field gsonField = gsonClassContainer.getField(this.customCoder.staticCoderField);
-				Object gsonObject = gsonField.get(null);
-				Method toJsonMethod = gsonObject.getClass().
-						                     getDeclaredMethod
-						                     	("toJson", new Class[]{Object.class});
-				String encodedJson = (String) toJsonMethod.invoke(gsonObject, event);
-				return encodedJson;
-			} catch (Exception e) {
-				logger.warn("{} cannot custom-encode {} because of {}", this, event, e.getMessage(), e);
-				throw new UnsupportedOperationException("event cannot be encoded", e);
-			}			
-		} else {
-			try {
-				String encodedEvent = this.encoder.toJson(event);
-				return encodedEvent;			
-			} catch (Exception e) {
-				logger.warn("{} cannot encode {} because of {}", this, event, e.getMessage(), e);
-				throw new UnsupportedOperationException("event cannot be encoded", e);
-			}		
-		}
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("GsonProtocolCoderToolset [toString()=").append(super.toString()).append("]");
-		return builder.toString();
-	}
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
deleted file mode 100644
index 3c112573..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/coders/TopicCoderFilterConfiguration.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.coders;
-
-import java.util.List;
-
-public class TopicCoderFilterConfiguration {
-
-	/**
-	 * Custom coder, contains class and static field to access parser that the controller
-	 * desires to use instead of the framework provided parser
-	 */
-	public static abstract class CustomCoder {
-		protected String className;
-		protected String staticCoderField;
-		
-		/**
-		 * create custom coder from raw string in the following format
-		 * (typically embedded in a property file):
-		 * 
-		 * Note this is to support decoding/encoding of partial structures that are
-		 * only known by the model.
-		 * 
-		 * @param rawCustomCoder with format: <class-containing-custom-coder>,<static-coder-field>
-		 */
-		public CustomCoder(String rawCustomCoder) throws IllegalArgumentException {			
-			if (rawCustomCoder != null && !rawCustomCoder.isEmpty()) {
-				
-				this.className = rawCustomCoder.substring(0,rawCustomCoder.indexOf(","));
-				if (this.className == null || this.className.isEmpty()) {
-					throw new IllegalArgumentException("No classname to create CustomCoder cannot be created");
-				}
-				
-				this.staticCoderField = rawCustomCoder.substring(rawCustomCoder.indexOf(",")+1);
-				if (this.staticCoderField == null || this.staticCoderField.isEmpty()) {
-					throw new IllegalArgumentException
-						("No staticCoderField to create CustomCoder cannot be created for class " +
-						 className);
-				}
-
-			}
-		}
-		/**
-		 * @param classContainer
-		 * @param staticCoderField
-		 */
-		public CustomCoder(String className, String staticCoderField) throws IllegalArgumentException {
-			if (className == null || className.isEmpty()) {
-				throw new IllegalArgumentException("No classname to create CustomCoder cannot be created");
-			}
-			
-			if (staticCoderField == null || staticCoderField.isEmpty()) {
-				throw new IllegalArgumentException
-					("No staticCoderField to create CustomCoder cannot be created for class " +
-					 className);
-			}
-			
-			this.className = className;
-			this.staticCoderField = staticCoderField;
-		}
-
-		/**
-		 * @return the className
-		 */
-		public String getClassContainer() {
-			return className;
-		}
-
-		/**
-		 * @param className the className to set
-		 */
-		public void setClassContainer(String className) {
-			this.className = className;
-		}
-
-		/**
-		 * @return the staticCoderField
-		 */
-		public String getStaticCoderField() {
-			return staticCoderField;
-		}
-
-		/**
-		 * @param staticCoderField the staticGson to set
-		 */
-		public void setStaticCoderField(String staticCoderField) {
-			this.staticCoderField = staticCoderField;
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("CustomCoder [className=").append(className).append(", staticCoderField=")
-					.append(staticCoderField).append("]");
-			return builder.toString();
-		}
-	}
-	
-	public static class CustomGsonCoder extends CustomCoder {
-	
-		public CustomGsonCoder(String className, String staticCoderField) {
-				super(className, staticCoderField);
-		}
-
-		public CustomGsonCoder(String customGson) throws IllegalArgumentException {
-			super(customGson);
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("CustomGsonCoder [toString()=").append(super.toString()).append("]");
-			return builder.toString();
-		}
-
-	}
-	
-	public static class CustomJacksonCoder extends CustomCoder {
-		
-		public CustomJacksonCoder(String className, String staticCoderField) {
-				super(className, staticCoderField);
-		}
-		
-		public CustomJacksonCoder(String customJackson) throws IllegalArgumentException {
-			super(customJackson);
-		}
-		
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("CustomJacksonCoder [toString()=").append(super.toString()).append("]");
-			return builder.toString();
-		}
-
-	}
-
-	/**
-	 * Coder/Decoder class and Filter container.   The decoder class is potential,
-	 * in order to be operational needs to be fetched from an available
-	 * class loader.
-	 *
-	 */
-	public static class PotentialCoderFilter {
-
-		/**
-		 * decoder class (pending from being able to be fetched and found 
-		 * in some class loader)
-		 */
-		protected String codedClass;
-		
-		/**
-		 * filters to apply to the selection of the decodedClass;
-		 */
-		protected JsonProtocolFilter filter;
-		
-		/**
-		 * constructor
-		 * 
-		 * @param codedClass decoder class
-		 * @param filter filters to apply
-		 */
-		public PotentialCoderFilter(String codedClass, JsonProtocolFilter filter) {
-			this.codedClass = codedClass;
-			this.filter = filter;
-		}
-
-		/**
-		 * @return the decodedClass
-		 */
-		public String getCodedClass() {
-			return codedClass;
-		}
-
-		/**
-		 * @param decodedClass the decodedClass to set
-		 */
-		public void setCodedClass(String decodedClass) {
-			this.codedClass = decodedClass;
-		}
-
-		/**
-		 * @return the filter
-		 */
-		public JsonProtocolFilter getFilter() {
-			return filter;
-		}
-
-		/**
-		 * @param filter the filter to set
-		 */
-		public void setFilter(JsonProtocolFilter filter) {
-			this.filter = filter;
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder builder = new StringBuilder();
-			builder.append("PotentialCoderFilter [codedClass=").append(codedClass).append(", filter=").append(filter)
-					.append("]");
-			return builder.toString();
-		}
-	}
-	
-	/**
-	 * the source topic
-	 */
-	protected final String topic;
-	
-	/**
-	 * List of decoder -> filters
-	 */
-	protected final List<PotentialCoderFilter> coderFilters;
-	
-	/**
-	 * custom gson coder that this controller prefers to use instead of the framework ones
-	 */
-	protected CustomGsonCoder customGsonCoder;
-	
-	/**
-	 * custom jackson coder that this controller prefers to use instead of the framework ones
-	 */
-	protected CustomJacksonCoder customJacksonCoder;
-
-	/**
-	 * Constructor 
-	 * 
-	 * @param decoderFilters list of decoders and associated filters
-	 * @param topic the topic
-	 */
-	public TopicCoderFilterConfiguration(String topic, List<PotentialCoderFilter> decoderFilters,
-                                         CustomGsonCoder customGsonCoder, 
-                                         CustomJacksonCoder customJacksonCoder) {
-		this.coderFilters = decoderFilters;
-		this.topic = topic;
-		this.customGsonCoder = customGsonCoder;
-		this.customJacksonCoder = customJacksonCoder;
-	}
-
-	/**
-	 * @return the topic
-	 */
-	public String getTopic() {
-		return topic;
-	}
-
-	/**
-	 * @return the decoderFilters
-	 */
-	public List<PotentialCoderFilter> getCoderFilters() {
-		return coderFilters;
-	}
-	
-	/**
-	 * @return the customGsonCoder
-	 */
-	public CustomGsonCoder getCustomGsonCoder() {
-		return customGsonCoder;
-	}
-
-	/**
-	 * @param customGsonCoder the customGsonCoder to set
-	 */
-	public void setCustomGsonCoder(CustomGsonCoder customGsonCoder) {
-		this.customGsonCoder = customGsonCoder;
-	}
-
-	/**
-	 * @return the customJacksonCoder
-	 */
-	public CustomJacksonCoder getCustomJacksonCoder() {
-		return customJacksonCoder;
-	}
-
-	/**
-	 * @param customJacksonCoder the customJacksonCoder to set
-	 */
-	public void setCustomJacksonCoder(CustomJacksonCoder customJacksonCoder) {
-		this.customJacksonCoder = customJacksonCoder;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("TopicCoderFilterConfiguration [topic=").append(topic).append(", coderFilters=")
-				.append(coderFilters).append(", customGsonCoder=").append(customGsonCoder)
-				.append(", customJacksonCoder=").append(customJacksonCoder).append("]");
-		return builder.toString();
-	}
-
-
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java
deleted file mode 100644
index 98af02ee..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/ControllerConfiguration.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.configuration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-/**
- * Drools Related Information
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ControllerConfiguration {
-
-	public static final String CONFIG_CONTROLLER_OPERATION_CREATE = "create";
-	public static final String CONFIG_CONTROLLER_OPERATION_UPDATE = "update";
-	public static final String CONFIG_CONTROLLER_OPERATION_LOCK = "lock";
-	public static final String CONFIG_CONTROLLER_OPERATION_UNLOCK = "unlock";
-	
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("name")
-    private String name;
-    /**
-     * Set of operations that can be applied to a controller: create, lock
-     * (Required)
-     * 
-     */
-    @JsonProperty("operation")
-    private String operation;
-    /**
-     * Maven Related Information
-     * 
-     */
-    @JsonProperty("drools")
-    private DroolsConfiguration drools;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-    protected final static Object NOT_FOUND_VALUE = new Object();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ControllerConfiguration() {
-    }
-
-    /**
-     * 
-     * @param name
-     * @param drools
-     * @param operation
-     */
-    public ControllerConfiguration(String name, String operation, DroolsConfiguration drools) {
-        this.name = name;
-        this.operation = operation;
-        this.drools = drools;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @return
-     *     The name
-     */
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     * @param name
-     *     The name
-     */
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ControllerConfiguration withName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    /**
-     * Set of operations that can be applied to a controller: create, lock
-     * (Required)
-     * 
-     * @return
-     *     The operation
-     */
-    @JsonProperty("operation")
-    public String getOperation() {
-        return operation;
-    }
-
-    /**
-     * Set of operations that can be applied to a controller: create, lock
-     * (Required)
-     * 
-     * @param operation
-     *     The operation
-     */
-    @JsonProperty("operation")
-    public void setOperation(String operation) {
-        this.operation = operation;
-    }
-
-    public ControllerConfiguration withOperation(String operation) {
-        this.operation = operation;
-        return this;
-    }
-
-    /**
-     * Maven Related Information
-     * 
-     * @return
-     *     The drools
-     */
-    @JsonProperty("drools")
-    public DroolsConfiguration getDrools() {
-        return drools;
-    }
-
-    /**
-     * Maven Related Information
-     * 
-     * @param drools
-     *     The drools
-     */
-    @JsonProperty("drools")
-    public void setDrools(DroolsConfiguration drools) {
-        this.drools = drools;
-    }
-
-    public ControllerConfiguration withDrools(DroolsConfiguration drools) {
-        this.drools = drools;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public ControllerConfiguration withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-    protected boolean declaredProperty(String name, Object value) {
-        switch (name) {
-            case "name":
-                if (value instanceof String) {
-                    setName(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"name\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            case "operation":
-                if (value instanceof String) {
-                    setOperation(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"operation\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            case "drools":
-                if (value instanceof DroolsConfiguration) {
-                    setDrools(((DroolsConfiguration) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"drools\" is of type \"org.openecomp.policy.drools.protocol.configuration.Drools\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
-        switch (name) {
-            case "name":
-                return getName();
-            case "operation":
-                return getOperation();
-            case "drools":
-                return getDrools();
-            default:
-                return notFoundValue;
-        }
-    }
-
-    @SuppressWarnings({
-        "unchecked"
-    })
-    public<T >T get(String name) {
-        Object value = declaredPropertyOrNotFound(name, ControllerConfiguration.NOT_FOUND_VALUE);
-        if (ControllerConfiguration.NOT_FOUND_VALUE!= value) {
-            return ((T) value);
-        } else {
-            return ((T) getAdditionalProperties().get(name));
-        }
-    }
-
-    public void set(String name, Object value) {
-        if (!declaredProperty(name, value)) {
-            getAdditionalProperties().put(name, ((Object) value));
-        }
-    }
-
-    public ControllerConfiguration with(String name, Object value) {
-        if (!declaredProperty(name, value)) {
-            getAdditionalProperties().put(name, ((Object) value));
-        }
-        return this;
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(name).append(operation).append(drools).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof ControllerConfiguration) == false) {
-            return false;
-        }
-        ControllerConfiguration rhs = ((ControllerConfiguration) other);
-        return new EqualsBuilder().append(name, rhs.name).append(operation, rhs.operation).append(drools, rhs.drools).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java
deleted file mode 100644
index 87cf2348..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/DroolsConfiguration.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.configuration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-
-/**
- * Maven Related Information
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class DroolsConfiguration {
-
-    /**
-     * Maven Artifact ID
-     * (Required)
-     * 
-     */
-    @JsonProperty("artifactId")
-    private String artifactId;
-    /**
-     * Maven Group ID
-     * (Required)
-     * 
-     */
-    @JsonProperty("groupId")
-    private String groupId;
-    /**
-     * Maven Version
-     * (Required)
-     * 
-     */
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-    protected final static Object NOT_FOUND_VALUE = new Object();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public DroolsConfiguration() {
-    }
-
-    /**
-     * 
-     * @param groupId
-     * @param artifactId
-     * @param version
-     */
-    public DroolsConfiguration(String artifactId, String groupId, String version) {
-        this.artifactId = artifactId;
-        this.groupId = groupId;
-        this.version = version;
-    }
-
-    /**
-     * Maven Artifact ID
-     * (Required)
-     * 
-     * @return
-     *     The artifactId
-     */
-    @JsonProperty("artifactId")
-    public String getArtifactId() {
-        return artifactId;
-    }
-
-    /**
-     * Maven Artifact ID
-     * (Required)
-     * 
-     * @param artifactId
-     *     The artifactId
-     */
-    @JsonProperty("artifactId")
-    public void setArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-    }
-
-    public DroolsConfiguration withArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-        return this;
-    }
-
-    /**
-     * Maven Group ID
-     * (Required)
-     * 
-     * @return
-     *     The groupId
-     */
-    @JsonProperty("groupId")
-    public String getGroupId() {
-        return groupId;
-    }
-
-    /**
-     * Maven Group ID
-     * (Required)
-     * 
-     * @param groupId
-     *     The groupId
-     */
-    @JsonProperty("groupId")
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public DroolsConfiguration withGroupId(String groupId) {
-        this.groupId = groupId;
-        return this;
-    }
-
-    /**
-     * Maven Version
-     * (Required)
-     * 
-     * @return
-     *     The version
-     */
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Maven Version
-     * (Required)
-     * 
-     * @param version
-     *     The version
-     */
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public DroolsConfiguration withVersion(String version) {
-        this.version = version;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public DroolsConfiguration withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-    protected boolean declaredProperty(String name, Object value) {
-        switch (name) {
-            case "artifactId":
-                if (value instanceof String) {
-                    setArtifactId(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"artifactId\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            case "groupId":
-                if (value instanceof String) {
-                    setGroupId(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"groupId\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            case "version":
-                if (value instanceof String) {
-                    setVersion(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"version\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
-        switch (name) {
-            case "artifactId":
-                return getArtifactId();
-            case "groupId":
-                return getGroupId();
-            case "version":
-                return getVersion();
-            default:
-                return notFoundValue;
-        }
-    }
-
-    @SuppressWarnings({
-        "unchecked"
-    })
-    public<T >T get(String name) {
-        Object value = declaredPropertyOrNotFound(name, DroolsConfiguration.NOT_FOUND_VALUE);
-        if (DroolsConfiguration.NOT_FOUND_VALUE!= value) {
-            return ((T) value);
-        } else {
-            return ((T) getAdditionalProperties().get(name));
-        }
-    }
-
-    public void set(String name, Object value) {
-        if (!declaredProperty(name, value)) {
-            getAdditionalProperties().put(name, ((Object) value));
-        }
-    }
-
-    public DroolsConfiguration with(String name, Object value) {
-        if (!declaredProperty(name, value)) {
-            getAdditionalProperties().put(name, ((Object) value));
-        }
-        return this;
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(artifactId).append(groupId).append(version).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof DroolsConfiguration) == false) {
-            return false;
-        }
-        DroolsConfiguration rhs = ((DroolsConfiguration) other);
-        return new EqualsBuilder().append(artifactId, rhs.artifactId).append(groupId, rhs.groupId).append(version, rhs.version).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java b/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java
deleted file mode 100644
index 65de6656..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/protocol/configuration/PdpdConfiguration.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.protocol.configuration;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-
-/**
- * ENGINE-CONFIGURATION
- * <p>
- * 
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class PdpdConfiguration {
-	
-	/**
-	 * Controller Entity ID
-	 */
-	public static final String CONFIG_ENTITY_CONTROLLER = "controller";
-
-    /**
-     * Unique Transaction ID.   This is an UUID.
-     * (Required)
-     * 
-     */
-    @JsonProperty("requestID")
-    private String requestID;
-    /**
-     * Set of entities on which configuration can be performed: controller
-     * (Required)
-     * 
-     */
-    @JsonProperty("entity")
-    private String entity;
-    /**
-     * Controller Information, only applicable when the entity is set to controller
-     * 
-     */
-    @JsonProperty("controllers")
-    private List<ControllerConfiguration> controllers = new ArrayList<ControllerConfiguration>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-    protected final static Object NOT_FOUND_VALUE = new Object();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public PdpdConfiguration() {
-    }
-
-    /**
-     * 
-     * @param controller
-     * @param requestID
-     * @param entity
-     */
-    public PdpdConfiguration(String requestID, String entity, List<ControllerConfiguration> controllers) {
-        this.requestID = requestID;
-        this.entity = entity;
-        this.controllers = controllers;
-    }
-
-    /**
-     * Unique Transaction ID.   This is an UUID.
-     * (Required)
-     * 
-     * @return
-     *     The requestID
-     */
-    @JsonProperty("requestID")
-    public String getRequestID() {
-        return requestID;
-    }
-
-    /**
-     * Unique Transaction ID.   This is an UUID.
-     * (Required)
-     * 
-     * @param requestID
-     *     The requestID
-     */
-    @JsonProperty("requestID")
-    public void setRequestID(String requestID) {
-        this.requestID = requestID;
-    }
-
-    public PdpdConfiguration withRequestID(String requestID) {
-        this.requestID = requestID;
-        return this;
-    }
-
-    /**
-     * Set of entities on which configuration can be performed: controller
-     * (Required)
-     * 
-     * @return
-     *     The entity
-     */
-    @JsonProperty("entity")
-    public String getEntity() {
-        return entity;
-    }
-
-    /**
-     * Set of entities on which configuration can be performed: controller
-     * (Required)
-     * 
-     * @param entity
-     *     The entity
-     */
-    @JsonProperty("entity")
-    public void setEntity(String entity) {
-        this.entity = entity;
-    }
-
-    public PdpdConfiguration withEntity(String entity) {
-        this.entity = entity;
-        return this;
-    }
-
-    /**
-     * Controller Information, only applicable when the entity is set to controller
-     * 
-     * @return
-     *     The controller
-     */
-    @JsonProperty("controller")
-    public List<ControllerConfiguration> getControllers() {
-        return controllers;
-    }
-
-    /**
-     * Controller Information, only applicable when the entity is set to controller
-     * 
-     * @param controller
-     *     The controller
-     */
-    @JsonProperty("controller")
-    public void setControllers(List<ControllerConfiguration> controllers) {
-        this.controllers = controllers;
-    }
-
-    public PdpdConfiguration withController(List<ControllerConfiguration> controllers) {
-        this.controllers = controllers;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public PdpdConfiguration withAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-        return this;
-    }
-
-    @SuppressWarnings("unchecked")
-	protected boolean declaredProperty(String name, Object value) {
-        switch (name) {
-            case "requestID":
-                if (value instanceof String) {
-                    setRequestID(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"requestID\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            case "entity":
-                if (value instanceof String) {
-                    setEntity(((String) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"entity\" is of type \"java.lang.String\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            case "controllers":
-                if (value instanceof List) {
-                    setControllers(((List<ControllerConfiguration> ) value));
-                } else {
-                    throw new IllegalArgumentException(("property \"controllers\" is of type \"java.util.List<org.openecomp.policy.drools.protocol.configuration.Controller>\", but got "+ value.getClass().toString()));
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
-        switch (name) {
-            case "requestID":
-                return getRequestID();
-            case "entity":
-                return getEntity();
-            case "controllers":
-                return getControllers();
-            default:
-                return notFoundValue;
-        }
-    }
-
-    @SuppressWarnings({
-        "unchecked"
-    })
-    public<T >T get(String name) {
-        Object value = declaredPropertyOrNotFound(name, PdpdConfiguration.NOT_FOUND_VALUE);
-        if (PdpdConfiguration.NOT_FOUND_VALUE!= value) {
-            return ((T) value);
-        } else {
-            return ((T) getAdditionalProperties().get(name));
-        }
-    }
-
-    public void set(String name, Object value) {
-        if (!declaredProperty(name, value)) {
-            getAdditionalProperties().put(name, ((Object) value));
-        }
-    }
-
-    public PdpdConfiguration with(String name, Object value) {
-        if (!declaredProperty(name, value)) {
-            getAdditionalProperties().put(name, ((Object) value));
-        }
-        return this;
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(requestID).append(entity).append(controllers).append(additionalProperties).toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof PdpdConfiguration) == false) {
-            return false;
-        }
-        PdpdConfiguration rhs = ((PdpdConfiguration) other);
-        return new EqualsBuilder().append(requestID, rhs.requestID).append(entity, rhs.entity).append(controllers, rhs.controllers).append(additionalProperties, rhs.additionalProperties).isEquals();
-    }
-
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java b/policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java
deleted file mode 100644
index be6c4962..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/server/restful/RestManager.java
+++ /dev/null
@@ -1,2335 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.server.restful;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.DmaapTopicSource;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSink;
-import org.openecomp.policy.drools.event.comm.bus.UebTopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder.CoderFilters;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter;
-import org.openecomp.policy.drools.protocol.coders.JsonProtocolFilter.FilterRule;
-import org.openecomp.policy.drools.protocol.coders.ProtocolCoderToolset;
-import org.openecomp.policy.drools.protocol.configuration.ControllerConfiguration;
-import org.openecomp.policy.drools.protocol.configuration.PdpdConfiguration;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.LoggerContext;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.Info;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
-
-
-/**
- * Telemetry JAX-RS Interface to the PDP-D
- */
-
-@Path("/policy/pdp")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-@Api
-@SwaggerDefinition(
-    info = @Info(
-        description = "PDP-D Telemetry Services",
-        version = "v1.0",
-        title = "PDP-D Telemetry"
-    ),
-    consumes = {MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN},
-    produces = {MediaType.APPLICATION_JSON},
-    schemes = {SwaggerDefinition.Scheme.HTTP},
-    tags = {
-        @Tag(name = "pdp-d-telemetry", description = "Drools PDP Telemetry Operations")
-    }
-)
-public class RestManager {
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(RestManager.class);  
-	
-    @GET
-    @Path("engine")
-    @ApiOperation(
-    	value="Retrieves the Engine Operational Status", 
-    	notes="Top-level abstraction.  Provides a global view of resources",
-    	response=PolicyEngine.class
-    )
-    public Response engine() {    	
-    	return Response.status(Response.Status.OK).entity(PolicyEngine.manager).build();
-    }
-    
-    @DELETE
-    @Path("engine")
-    @ApiOperation(
-        	value="Shuts down the Engine", 
-        	notes="Deleting the engine, the top-level abstraction, equivalenty shuts it down",
-        	response=PolicyEngine.class
-    )
-    public Response engineShutdown() { 
-    	try {
-			PolicyEngine.manager.shutdown();
-		} catch (IllegalStateException e) {
-			logger.error("{}: cannot shutdown {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
-    		return Response.status(Response.Status.BAD_REQUEST).
-			        entity(PolicyEngine.manager).
-			        build();
-		}
-    	
-		return Response.status(Response.Status.OK).
-		                entity(PolicyEngine.manager).
-		                build();
-    }
-    
-    @GET
-    @Path("engine/features")
-    @ApiOperation(
-        	value="Engine Features", 
-        	notes="Provides the list of loaded features using the PolicyEngineFeatureAPI",
-        	responseContainer="List"
-    )
-    public Response engineFeatures() {
-        return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getFeatures()).build();
-    }
-    
-    @GET
-    @Path("engine/features/inventory")
-    @ApiOperation(
-        	value="Engine Detailed Feature Inventory", 
-        	notes="Provides detailed list of loaded features using the PolicyEngineFeatureAPI",
-        	responseContainer="List",
-        	response=PolicyEngineFeatureAPI.class
-    )
-    public Response engineFeaturesInventory() {
-        return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getFeatureProviders()).build();
-    } 
-    
-    @GET
-    @Path("engine/features/{featureName}")
-    @ApiOperation(
-        	value="Engine Feature", 
-        	notes="Provides Details for a given feature Engine Provider",
-        	response=PolicyEngineFeatureAPI.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message = "The feature cannot be found")
-    })
-    public Response engineFeature(@ApiParam(value="Feature Name", required=true)  
-                                  @PathParam("featureName") String featureName) {
-    	try {
-	    	return Response.status(Response.Status.OK).
-			        entity(PolicyEngine.manager.getFeatureProvider(featureName)).build();
-    	} catch(IllegalArgumentException iae) {
-    		return Response.status(Response.Status.NOT_FOUND).
-                    entity(new Error(iae.getMessage())).build();
-    	}
-    }
-    
-    @GET
-    @Path("engine/inputs")
-    @ApiOperation(
-        	value="Engine Input Ports", 
-        	notes="List of input ports",
-        	responseContainer="List"
-    )
-    public Response engineInputs() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Inputs.values())).
-                        build();
-    }
-    
-    @POST
-    @Path("engine/inputs/configuration")
-    @ApiOperation(
-        	value="Engine Input Configuration Requests", 
-        	notes="Feeds a configuration request input into the Engine"
-    )
-    @ApiResponses(value={
-    	@ApiResponse(code=406, message = "The configuration request cannot be honored") 
-    })
-    public Response engineUpdate(
-    		@ApiParam(value="Configuration to apply", required=true) PdpdConfiguration configuration) {
-    	PolicyController controller = null;
-    	boolean success = true;
-		try {
-			success = PolicyEngine.manager.configure(configuration);
-		} catch (Exception e) {
-			success = false;
-			logger.info("{}: cannot configure {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
-		}
-    	
-		if (!success)
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                    entity(new Error("cannot perform operation")).build();
-		else
-			return Response.status(Response.Status.OK).entity(controller).build();
-    }
-    
-    @GET
-    @Path("engine/properties")
-    @ApiOperation(
-        	value="Engine Configuration Properties", 
-        	notes="Used for booststrapping the engine",
-        	response=Properties.class
-    )
-    public Response engineProperties() {
-        return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getProperties()).build();
-    }
-    
-    @GET
-    @Path("engine/switches")
-    @ApiOperation(
-        	value="Engine Control Switches", 
-        	notes="List of the Engine Control Switches",
-        	responseContainer="List"
-    )
-    public Response engineSwitches() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Switches.values())).
-                        build();
-    }
-    
-    @PUT
-    @Path("engine/switches/activation")
-    @ApiOperation(
-        	value="Switches on the Engine Activation Switch", 
-        	notes="Turns on Activation Switch on the Engine. This order entails that the engine " +
-        	      "and controllers are unlocked and started",
-        	response=PolicyEngine.class
-    )
-    public Response engineActivation() {
-    	boolean success = true;
-		try {
-			PolicyEngine.manager.activate();
-		} catch (Exception e) {
-			success = false;
-			logger.info("{}: cannot activate {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
-		}
-    	
-		if (!success)
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                    entity(new Error("cannot perform operation")).build();
-		else
-			return Response.status(Response.Status.OK).entity(PolicyEngine.manager).build();
-    }
-    
-    @DELETE
-    @Path("engine/switches/activation")
-    @ApiOperation(
-        	value="Switches off Engine Activation Switch", 
-        	notes="Turns off the Activation Switch on the Engine. This order entails that the engine " +
-        	      "and controllers are locked (with the exception of those resources defined as unmanaged)",
-        	response=PolicyEngine.class
-    )
-    public Response engineDeactivation() {
-    	boolean success = true;
-		try {
-			PolicyEngine.manager.deactivate();
-		} catch (Exception e) {
-			success = false;
-			logger.info("{}: cannot deactivate {} because of {}", this, PolicyEngine.manager, e.getMessage(), e);
-		}
-    	
-		if (!success)
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                    entity(new Error("cannot perform operation")).build();
-		else
-			return Response.status(Response.Status.OK).entity(PolicyEngine.manager).build();
-    }  
-    
-    @PUT
-    @Path("engine/switches/lock")
-    @ApiOperation(
-        	value="Switches on the Engine Lock Control", 
-        	notes="This switch locks all the engine resources as a whole, except those that are defined unmanaged",
-          	response=PolicyEngine.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response engineLock() {
-    	boolean success = PolicyEngine.manager.lock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(PolicyEngine.manager).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("cannot perform operation")).
-    				        build();
-    }
-    
-    @DELETE
-    @Path("engine/switches/lock")
-    @ApiOperation(
-        	value="Switches off the Lock control", 
-        	notes="This switch locks all the engine resources as a whole, except those that are defined unmanaged",
-          	response=PolicyEngine.class
-    )  
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response engineUnlock() {
-    	boolean success = PolicyEngine.manager.unlock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(PolicyEngine.manager).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("cannot perform operation")).
-    				        build();
-    }
-    
-    @GET
-    @Path("engine/controllers")
-    @ApiOperation(
-        	value="Lists the Policy Controllers Names", 
-        	notes="Unique Policy Controller Identifiers",
-        	responseContainer="List"
-    )
-    public Response controllers() {
-		return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getPolicyControllerIds()).build();
-    }
-    
-    @GET
-    @Path("engine/controllers/inventory")
-    @ApiOperation(
-        	value="Lists the Policy Controllers", 
-        	notes="Detailed list of Policy Controllers",
-        	responseContainer="List",
-        	response=PolicyController.class
-    )
-    public Response controllerInventory() {
-		return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getPolicyControllers()).build();
-    }
-    
-    @POST
-    @Path("engine/controllers")
-    @ApiOperation(
-        	value="Creates and starts a new Policy Controller", 
-        	notes="Controller creation based on properties",
-          	response=PolicyController.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=400, message = "Invalid configuration information has been provided"),
-        @ApiResponse(code=304, message = "The controller already exists"),
-        @ApiResponse(code=406, message = "The administrative state of the system prevents it " +
-                                         "from processing this request"),
-        @ApiResponse(code=206, message = "The controller has been created " +
-                                          "but cannot be started"),
-        @ApiResponse(code=201, message = "The controller has been succesfully created and started")
-    })
-    public Response controllerAdd(@ApiParam(value="Configuration Properties to apply", required = true) 
-                                  Properties config) {
-    	if (config == null)
-    		return Response.status(Response.Status.BAD_REQUEST).
-    				        entity(new Error("A configuration must be provided")).
-    				        build();
-    	
-    	String controllerName = config.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME);
-    	if (controllerName == null || controllerName.isEmpty())
-    		return Response.status(Response.Status.BAD_REQUEST).
-    				        entity(new Error
-    				        			("Configuration must have an entry for " + 
-    				                     PolicyProperties.PROPERTY_CONTROLLER_NAME)).
-    				        build();
-    	
-    	PolicyController controller;
-		try {
-			controller = PolicyController.factory.get(controllerName);
-			if (controller != null)
-				return Response.status(Response.Status.NOT_MODIFIED).
-						        entity(controller).
-						        build();
-		} catch (IllegalArgumentException e) {
-			// This is OK
-		} catch (IllegalStateException e) {
-			logger.info("{}: cannot get policy-controller because of {}", this, e.getMessage(), e);
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not found")).build();
-		}
-    	
-    	try {
-			controller = PolicyEngine.manager.createPolicyController
-					(config.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME), config);
-		} catch (IllegalArgumentException | IllegalStateException e) {
-			logger.warn("{}: cannot create policy-controller because of {}", this, e.getMessage(), e);
-    		return Response.status(Response.Status.BAD_REQUEST).
-							        entity(new Error(e.getMessage())).
-							        build();
-		}
-    	
-    	try {
-			boolean success = controller.start();
-			if (!success) {
-				logger.info("{}: cannot start {}", this, controller);
-				return Response.status(Response.Status.PARTIAL_CONTENT).
-                                       entity(new Error(controllerName + " can't be started")).build();
-			}
-		} catch (IllegalStateException e) {
-			logger.info("{}: cannot start {} because of {}", this, controller, e.getMessage(), e);;
-			return Response.status(Response.Status.PARTIAL_CONTENT).
-                                   entity(controller).build();
-		}
-    	
-		return Response.status(Response.Status.CREATED).
-                entity(controller).
-                build();
-    }  
-    
-    @GET
-    @Path("engine/controllers/features")
-    @ApiOperation(
-        	value="Lists of Feature Providers Identifiers", 
-        	notes="Unique Policy Controller Identifiers",
-        	responseContainer="List"
-    )
-    public Response controllerFeatures() {
-		return Response.status(Response.Status.OK).entity(PolicyEngine.manager.getFeatures()).build();
-    }
-    
-    @GET
-    @Path("engine/controllers/features/inventory")
-    @ApiOperation(
-        	value="Detailed Controllers Feature Inventory", 
-        	notes="Provides detailed list of loaded features using the PolicyControllerFeatureAPI",
-        	responseContainer="List",
-        	response=PolicyControllerFeatureAPI.class
-    )    
-    public Response controllerFeaturesInventory() {
-		return Response.status(Response.Status.OK).
-				        entity(PolicyController.factory.getFeatureProviders()).
-                        build();
-    }
-    
-    @GET
-    @Path("engine/controllers/features/{featureName}")
-    @ApiOperation(
-        	value="Controller Feature", 
-        	notes="Provides Details for a given Policy Controller feature provider",
-        	response=PolicyControllerFeatureAPI.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message = "The feature cannot be found")
-    })    
-    public Response controllerFeature(@ApiParam(value="Feature Name", required=true) 
-                                      @PathParam("featureName") String featureName) {
-    	try {
-	    	return Response.status(Response.Status.OK).
-			                entity(PolicyController.factory.getFeatureProvider(featureName)).
-			                build();
-    	} catch(IllegalArgumentException iae) {
-    		return Response.status(Response.Status.NOT_FOUND).
-                    entity(new Error(iae.getMessage())).build();
-    	}
-    }
-
-    @GET
-    @Path("engine/controllers/{controller}")
-    @ApiOperation(
-        	value="Retrieves a Policy Controller", 
-        	notes="A Policy Controller is a concrete drools application abstraction.  " +
-        	      "It aggregates networking, drools, and other resources," + 
-        	      "as provides operational controls over drools applications",
-        	response=PolicyController.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                                 "this request to be fulfilled")
-    }) 
-    public Response controller(@ApiParam(value="Policy Controller Name", required=true) 
-                               @PathParam("controller") String controllerName) {
-		try {
-    		return Response.status(Response.Status.OK).
-    				        entity(PolicyController.factory.get(controllerName)).
-    				        build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @DELETE
-    @Path("engine/controllers/{controller}")
-    @ApiOperation(
-        	value="Deletes a Policy Controller", 
-        	notes="A Policy Controller is a concrete drools application abstraction.  " +
-          	      "It aggregates networking, drools, and other resources," + 
-          	      "as provides operational controls over drools applications",
-          	response=PolicyController.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                                "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A problem has occurred while deleting the Policy Controller")
-    }) 
-    public Response controllerDelete(@ApiParam(value="Policy Controller Name", required=true) 
-                                     @PathParam("controller") String controllerName) {
-    	
-    	PolicyController controller;
-    	try {
-	    	controller =
-	    			PolicyController.factory.get(controllerName);
-	    	if (controller == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-	    				        entity(new Error(controllerName + "  does not exist")).
-	    				        build();
-		} catch (IllegalArgumentException e) {
-			logger.info("{}: cannot get policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
-			return Response.status(Response.Status.BAD_REQUEST).
-							        entity(new Error(controllerName +  " not found: " + e.getMessage())).
-							        build();
-		} catch (IllegalStateException e) {
-			logger.info("{}: cannot get policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                                   entity(new Error(controllerName + " not acceptable")).build();
-		}
-    	
-    	try {
-			PolicyEngine.manager.removePolicyController(controllerName);
-		} catch (IllegalArgumentException | IllegalStateException e) {
-			logger.info("{}: cannot remove policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
-    		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-							       entity(new Error(e.getMessage())).
-							       build();
-		}
-    	
-		return Response.status(Response.Status.OK).
-                entity(controller).
-                build();
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/properties")
-    @ApiOperation(
-        	value="Retrieves the configuration properties of a Policy Controller", 
-        	notes="Configuration resources used by the controller if Properties format",
-        	response=PolicyController.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    }) 
-    public Response controllerProperties(@ApiParam(value="Policy Controller Name", required=true) 
-                                         @PathParam("controller") String controllerName) {
-		try {
-			PolicyController controller = PolicyController.factory.get(controllerName);
-    		return Response.status(Response.Status.OK).
-    				        entity(controller.getProperties()).
-    				        build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/inputs")
-    @ApiOperation(
-        	value="Policy Controller Input Ports", 
-        	notes="List of input ports",
-        	responseContainer="List"
-    )
-    public Response controllerInputs() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Inputs.values())).
-                        build();
-    }
-    
-    @POST
-    @Path("engine/controllers/{controller}/inputs/configuration")
-    @ApiOperation(
-        	value="Policy Controller Input Configuration Requests", 
-        	notes="Feeds a configuration request input into the given Policy Controller"
-    )
-    @ApiResponses(value={
-    	@ApiResponse(code=400, message = "The configuration request is invalid"),
-    	@ApiResponse(code=406, message = "The configuration request cannot be honored") 
-    })
-    public Response controllerUpdate(@ApiParam(value="Policy Controller Name", required=true) 
-                                     @PathParam("controller") String controllerName,
-                                     @ApiParam(value="Configuration to apply", required=true)
-    		                         ControllerConfiguration controllerConfiguration) {
-    	
-    	if (controllerName == null || controllerName.isEmpty() || 
-    	    controllerConfiguration == null || 
-    	    controllerConfiguration.getName().intern() != controllerName)
-    		return Response.status(Response.Status.BAD_REQUEST).
-    				        entity("A valid or matching controller names must be provided").
-    				        build();
-    	
-    	PolicyController controller;
-    	try {
-    		controller = PolicyEngine.manager.updatePolicyController(controllerConfiguration);
-	    	if (controller == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-	    				        entity(new Error(controllerName + "  does not exist")).
-	    				        build();
-		} catch (IllegalArgumentException e) {
-			logger.info("{}: cannot update policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
-			return Response.status(Response.Status.BAD_REQUEST).
-							        entity(new Error(controllerName +  " not found: " + e.getMessage())).
-							        build();
-		} catch (Exception e) {
-			logger.info("{}: cannot update policy-controller {} because of {}", this, controllerName, e.getMessage(), e);
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                                   entity(new Error(controllerName + " not acceptable")).build();
-		}
-    	
-		return Response.status(Response.Status.OK).
-                entity(controller).
-                build();
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/switches")
-    @ApiOperation(
-        	value="Policy Controller Switches", 
-        	notes="List of the Policy Controller Switches",
-        	responseContainer="List"
-    )
-    public Response controllerSwitches() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Switches.values())).
-                        build();
-    }
-    
-    @PUT
-    @Path("engine/controllers/{controller}/switches/lock")
-    @ApiOperation(
-        	value="Switches on the Policy Controller Lock Control", 
-        	notes="This action on the switch locks the Policy Controller",
-          	response=PolicyController.class
-    )   
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response controllerLock(@ApiParam(value="Policy Controller Name", required=true) 
-                                   @PathParam("controller") String controllerName) {
-    	PolicyController policyController = PolicyController.factory.get(controllerName);
-    	boolean success = policyController.lock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(policyController).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("Controller " + controllerName + " cannot be locked")).
-    				        build();
-    }  
-    
-    @DELETE
-    @Path("engine/controllers/{controller}/switches/lock")
-    @ApiOperation(
-        	value="Switches off the Policy Controller Lock Control", 
-        	notes="This action on the switch unlocks the Policy Controller",
-          	response=PolicyController.class
-    ) 
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response controllerUnlock(@ApiParam(value="Policy Controller Name", required=true) 
-                                     @PathParam("controller") String controllerName) {
-    	PolicyController policyController = PolicyController.factory.get(controllerName);
-    	boolean success = policyController.unlock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(policyController).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("Controller " + controllerName + " cannot be unlocked")).
-    				        build();
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/drools")
-    @ApiOperation(
-        	value="Retrieves the Drools Controller subcomponent of the Policy Controller", 
-        	notes="The Drools Controller provides an abstraction over the Drools subsystem",
-        	response=DroolsController.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    }) 
-    public Response drools(@ApiParam(value="Policy Controller Name", required=true) 
-                           @PathParam("controller") String controllerName) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);			
-			return Response.status(Response.Status.OK).
-	                               entity(drools).
-	                               build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/drools/facts")
-    @ApiOperation(
-        	value="Retrieves Facts Summary information for a given controller", 
-        	notes="Provides the session names, and a count of fact object in the drools working memory",
-        	responseContainer="Map"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response droolsFacts(@ApiParam(value="Policy Controller Name", required=true) 
-                                @PathParam("controller") String controllerName) {
-		try {
-			Map<String,Long> sessionCounts = new HashMap<>(); 
-			DroolsController drools = getDroolsController(controllerName);
-			for (String session : drools.getSessionNames()) {
-				sessionCounts.put(session, drools.factCount(session));
-			}
-			return Response.status(Response.Status.OK).
-	                               entity(sessionCounts).
-	                               build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/drools/facts/{session}")
-    @ApiOperation(
-        	value="Retrieves Fact Types (classnames) for a given controller and its count", 
-        	notes="The fact types are the classnames of the objects inserted in the drools working memory",
-        	responseContainer="Map"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller or session cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response droolsFacts(@ApiParam(value="Policy Controller Name", required=true)
-                                @PathParam("controller") String controllerName,
-                                @ApiParam(value="Drools Session Name", required=true)
-    		                    @PathParam("session") String sessionName) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			return Response.status(Response.Status.OK).
-	                               entity(drools.factClassNames(sessionName)).
-	                               build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error("entity not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + sessionName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/drools/facts/{session}/{factType}")
-    @ApiOperation(
-        	value="Retrieves fact objects of a given type in the drools working memory" +
-                  "for a given controller and session", 
-            notes="The fact types are the classnames of the objects inserted in the drools working memory",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller, session, or fact type cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response droolsFacts(@ApiParam(value="Fact count", required=false)
-                                @DefaultValue("false") @QueryParam("count") boolean count,
-                                @ApiParam(value="Policy Controller Name", required=true)
-    		                    @PathParam("controller") String controllerName,
-                                @ApiParam(value="Drools Session Name", required=true)
-    		                    @PathParam("session") String sessionName,
-                                @ApiParam(value="Drools Fact Type", required=true)
-    		                    @PathParam("factType") String factType) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<Object> facts = drools.facts(sessionName, factType, false);
-			if (!count)
-				return Response.status(Response.Status.OK).entity(facts).build();
-			else
-				return Response.status(Response.Status.OK).entity(facts.size()).build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
-                            		         " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
-                            		         " not acceptable")).
-                            build();
-		}
-    }
-    
-    @DELETE
-    @Path("engine/controllers/{controller}/drools/facts/{session}/{factType}")
-    @ApiOperation(
-        	value="Deletes all the fact objects of a given type from the drools working memory" +
-                  "for a given controller and session.   The objects retracted from the working " +
-        		  "memory are provided in the response.", 
-            notes="The fact types are the classnames of the objects inserted in the drools working memory",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller, session, or fact type, cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A server error has occurred processing this request")
-    })
-    public Response droolsFactsDelete(@ApiParam(value="Policy Controller Name", required=true)
-								      @PathParam("controller") String controllerName,
-								      @ApiParam(value="Drools Session Name", required=true)
-								      @PathParam("session") String sessionName,
-								      @ApiParam(value="Drools Fact Type", required=true)
-								      @PathParam("factType") String factType) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<Object> facts = drools.facts(sessionName, factType, true);
-			return Response.status(Response.Status.OK).entity(facts).build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
-                            		         " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + factType + 
-                            		         " not acceptable")).
-                            build();
-		} catch (Exception e) {
-			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-		                    entity(new Error(e.getMessage())).
-		                    build();			
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/drools/facts/{session}/{query}/{queriedEntity}")
-    @ApiOperation(
-        	value="Gets all the fact objects returned by a DRL query with no parameters from the drools working memory" +
-                  "for a given controller and session", 
-            notes="The DRL query must be defined in the DRL file",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller, session, or query information, cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A server error has occurred processing this request")
-    })
-    public Response droolsFacts(@ApiParam(value="Fact count", required=false)
-                                @DefaultValue("false") @QueryParam("count") boolean count,
-                                @ApiParam(value="Policy Controller Name", required=true)
-                                @PathParam("controller") String controllerName,
-                                @ApiParam(value="Drools Session Name", required=true)
-                                @PathParam("session") String sessionName,
-                                @ApiParam(value="Query Name Present in DRL", required=true)
-                                @PathParam("query") String queryName,
-                                @ApiParam(value="Query Identifier Present in the DRL Query", required=true)
-    		                    @PathParam("queriedEntity") String queriedEntity) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<Object> facts = drools.factQuery(sessionName, queryName, queriedEntity, false);
-			if (!count)
-				return Response.status(Response.Status.OK).entity(facts).build();
-			else
-				return Response.status(Response.Status.OK).entity(facts.size()).build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
-                            		         queriedEntity + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
-                            		         queriedEntity + " not acceptable")).
-                            build();
-		} catch (Exception e) {
-			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-		                    entity(new Error(e.getMessage())).
-		                    build();			
-		}
-    }
-    
-    @POST
-    @Path("engine/controllers/{controller}/drools/facts/{session}/{query}/{queriedEntity}")
-    @ApiOperation(
-        	value="Gets all the fact objects returned by a DRL query with parameters from the drools working memory" +
-                  "for a given controller and session", 
-            notes="The DRL query with parameters must be defined in the DRL file",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller, session, or query information, cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A server error has occurred processing this request")
-    })
-    public Response droolsFacts(@ApiParam(value="Policy Controller Name", required=true)
-                                @PathParam("controller") String controllerName,
-                                @ApiParam(value="Drools Session Name", required=true)
-                                @PathParam("session") String sessionName,
-                                @ApiParam(value="Query Name Present in DRL", required=true)
-                                @PathParam("query") String queryName,
-                                @ApiParam(value="Query Identifier Present in the DRL Query", required=true)
-    		                    @PathParam("queriedEntity") String queriedEntity,
-    		                    @ApiParam(value="Query Parameter Values to pass in the DRL Query", required=false)
-                                List<Object> queryParameters) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<Object> facts;
-			if (queryParameters == null || queryParameters.isEmpty())
-				facts = drools.factQuery(sessionName, queryName, queriedEntity, false);
-			else
-				facts = drools.factQuery(sessionName, queryName, queriedEntity, false, queryParameters.toArray());
-			return Response.status(Response.Status.OK).entity(facts).build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
-                            		         queriedEntity + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
-                            		         queriedEntity + " not acceptable")).
-                            build();
-		} catch (Exception e) {
-			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-		                    entity(new Error(e.getMessage())).
-		                    build();			
-		}
-    }
-    
-    @DELETE
-    @Path("engine/controllers/{controller}/drools/facts/{session}/{query}/{queriedEntity}")
-    @ApiOperation(
-        	value="Deletes all the fact objects returned by a DRL query with parameters from the drools working memory" +
-                  "for a given controller and session", 
-            notes="The DRL query with parameters must be defined in the DRL file",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller, session, or query information, cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A server error has occurred processing this request")
-    })
-    public Response droolsFactsDelete(@ApiParam(value="Policy Controller Name", required=true)
-								      @PathParam("controller") String controllerName,
-								      @ApiParam(value="Drools Session Name", required=true)
-								      @PathParam("session") String sessionName,
-								      @ApiParam(value="Query Name Present in DRL", required=true)
-								      @PathParam("query") String queryName,
-								      @ApiParam(value="Query Identifier Present in the DRL Query", required=true)
-								      @PathParam("queriedEntity") String queriedEntity,
-								      @ApiParam(value="Query Parameter Values to pass in the DRL Query", required=false)
-								      List<Object> queryParameters) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<Object> facts;
-			if (queryParameters == null || queryParameters.isEmpty())
-				facts = drools.factQuery(sessionName, queryName, queriedEntity, true);
-			else
-				facts = drools.factQuery(sessionName, queryName, queriedEntity, true, queryParameters.toArray());			
-			return Response.status(Response.Status.OK).entity(facts).build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
-                            		         queriedEntity + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + sessionName + ":" + queryName + 
-                            		         queriedEntity + " not acceptable")).
-                            build();
-		} catch (Exception e) {
-			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-		                    entity(new Error(e.getMessage())).
-		                    build();			
-		}
-    }
-    
-    @POST
-    @Path("engine/controllers/tools/coders/decoders/filters/rules/{ruleName}")
-    @ApiOperation(
-        	value="Produces a Decoder Rule Filter in a format that the Policy Controller can understand", 
-        	notes="The result can be used with other APIs to attach a filter to a decoder"
-    )
-    public Response rules(@ApiParam(value="Negate regex?", required=true)
-                          @DefaultValue("false") @QueryParam("negate") boolean negate,
-    		              @ApiParam(value="Rule Name", required=true)
-    		              @PathParam("ruleName") String name,
-    		              @ApiParam(value="Regex expression", required=true)
-    		              String regex) {   	
-    	String literalRegex = Pattern.quote(regex);
-    	if (negate)
-    		literalRegex = "^(?!" + literalRegex + "$).*";
-    	
-		return Response.status(Status.OK).
-				        entity(new JsonProtocolFilter.FilterRule(name,literalRegex)).
-				        build();
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders")
-    @ApiOperation(
-        	value="Gets all the decoders used by a controller", 
-            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
-        	      "subscribed network topics into specific (fact) objects. " +
-        	      "The deserialized (fact) object will typically be inserted in the drools working " +
-        	      " memory of the controlled drools application.",
-        	responseContainer="List",
-        	response=ProtocolCoderToolset.class
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoders(@ApiParam(value="Policy Controller Name", required=true)
-                             @PathParam("controller") String controllerName) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<ProtocolCoderToolset> decoders = EventProtocolCoder.manager.getDecoders
-														(drools.getGroupId(), drools.getArtifactId());			
-			return Response.status(Response.Status.OK).
-	                               entity(decoders).
-	                               build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders/filters")
-    @ApiOperation(
-        	value="Gets all the filters used by a controller", 
-            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
-          	      "subscribed network topics into specific (fact) objects. " +
-          	      "The deserialized (fact) object will typically be inserted in the drools working " +
-          	      " memory of the controlled drools application." +
-                  "Acceptance filters are used to filter out undesired network messages for the given controller",
-        	responseContainer="List",
-        	response=CoderFilters.class
-    )
-    @ApiResponses(value = { 
-    	@ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilters(@ApiParam(value="Policy Controller Name", required=true)
-                                   @PathParam("controller") String controllerName) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			List<CoderFilters> filters = EventProtocolCoder.manager.getDecoderFilters
-														(drools.getGroupId(), drools.getArtifactId());
-			return Response.status(Response.Status.OK).
-		                    entity(filters).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders/{topic}")
-    @ApiOperation(
-        	value="Gets all the decoders in use by a controller for a networked topic", 
-            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
-          	      "subscribed network topics into specific (fact) objects. " +
-          	      "The deserialized (fact) object will typically be inserted in the drools working " +
-          	      " memory of the controlled drools application.",
-        	responseContainer="List",
-        	response=ProtocolCoderToolset.class
-    )
-    @ApiResponses(value = { 
-    	@ApiResponse(code=404, message="The controller or topic cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoder(@ApiParam(value="Policy Controller Name", required=true)
-                            @PathParam("controller") String controllerName,
-                            @ApiParam(value="Networked Topic Name", required=true)
-    		                @PathParam("topic") String topic) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-							(drools.getGroupId(), drools.getArtifactId(), topic);
-			return Response.status(Response.Status.OK).
-		                    entity(decoder).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + " not acceptable")).
-                            build();
-		}
-    }    
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters")
-    @ApiOperation(
-        	value="Gets all filters attached to decoders for a given networked topic in use by a controller", 
-            notes="A Policy Controller uses decoders to deserialize incoming network messages from " +
-            	      "subscribed network topics into specific (fact) objects. " +
-            	      "The deserialized (fact) object will typically be inserted in the drools working " +
-            	      " memory of the controlled drools application." +
-                      "Acceptance filters are used to filter out undesired network messages for the given controller",
-          	responseContainer="List",
-        	response=CoderFilters.class
-    )
-    @ApiResponses(value = { 
-    	@ApiResponse(code=404, message="The controller or topic cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilter(@ApiParam(value="Policy Controller Name", required=true)
-							      @PathParam("controller") String controllerName,
-							      @ApiParam(value="Networked Topic Name", required=true)
-							      @PathParam("topic") String topic) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-			ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-												(drools.getGroupId(), drools.getArtifactId(), topic);
-			if (decoder == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(topic + "  does not exist")).
-				        build();
-			else
-				return Response.status(Response.Status.OK).
-	                    entity(decoder.getCoders()).
-	                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}")
-    @ApiOperation(
-        	value="Gets all filters attached to decoders for a given subscribed networked topic " +
-                  "and fact type", 
-            notes="Decoders are associated with networked topics. A Policy Controller manages " +
-        	      "multiple topics and therefore its attached decoders. " + 
-        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
-        	      "Filters are applied on a per fact type (classname).",
-        	responseContainer="List",
-        	response=CoderFilters.class
-    )
-    @ApiResponses(value = { 
-        @ApiResponse(code=404, message="The controller, topic, or fact type cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilter(@ApiParam(value="Policy Controller Name", required=true)
-                                  @PathParam("controller") String controllerName,
-                                  @ApiParam(value="Networked Topic Name", required=true)
-    		                      @PathParam("topic") String topic,
-    		                      @ApiParam(value="Fact Type", required=true)
-    		                      @PathParam("factType") String factClass) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-											(drools.getGroupId(), drools.getArtifactId(), topic);
-			CoderFilters filters = decoder.getCoder(factClass);
-			if (filters == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(topic + ":" + factClass + "  does not exist")).
-				        build();
-			else
-				return Response.status(Response.Status.OK).
-                        entity(filters).
-                        build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @PUT
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}")
-    @ApiOperation(
-        	value="Attaches filters to the decoder for a given networked topic " +
-                  "and fact type", 
-            notes="Decoders are associated with networked topics. A Policy Controller manages " +
-        	      "multiple topics and therefore its attached decoders. " + 
-        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
-        	      "Filters are applied on a per fact type (classname).",
-        	responseContainer="List",
-        	response=CoderFilters.class
-    )
-    @ApiResponses(value = { 
-        @ApiResponse(code=404, message="The controller, topic, fact type, cannot be found, " +
-                                       "or a filter has not been provided"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilter(@ApiParam(value="Policy Controller Name", required=true)
-							      @PathParam("controller") String controllerName,
-							      @ApiParam(value="Topic Name", required=true)
-							      @PathParam("topic") String topic,
-							      @ApiParam(value="Fact Type", required=true)
-							      @PathParam("factType") String factClass,
-							      @ApiParam(value="Configuration Filter", required=true)
-    		                      JsonProtocolFilter configFilters) {
-    	
-    	if (configFilters == null) {
-    		return Response.status(Response.Status.BAD_REQUEST).
-    				        entity(new Error("Configuration Filters not provided")).
-    				        build();
-    	}
-    	
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-											(drools.getGroupId(), drools.getArtifactId(), topic);
-	    	CoderFilters filters = decoder.getCoder(factClass);
-			if (filters == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(topic + ":" + factClass + "  does not exist")).
-				        build();
-			filters.setFilter(configFilters);
-			return Response.status(Response.Status.OK).
-		                    entity(filters).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules")
-    @ApiOperation(
-        	value="Gets the filter rules attached to a topic decoder of a controller", 
-            notes="Decoders are associated with networked topics. A Policy Controller manages " +
-        	      "multiple topics and therefore its attached decoders. " + 
-        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
-        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
-          	responseContainer="List",
-        	response=FilterRule.class
-    )
-    @ApiResponses(value = { 
-        @ApiResponse(code=404, message="The controller, topic, or fact type cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilterRules(@ApiParam(value="Policy Controller Name", required=true)
-									   @PathParam("controller") String controllerName,
-									   @ApiParam(value="Topic Name", required=true)
-									   @PathParam("topic") String topic,
-									   @ApiParam(value="Fact Type", required=true)
-									   @PathParam("factType") String factClass) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-											(drools.getGroupId(), drools.getArtifactId(), topic);
-	    	
-	    	CoderFilters filters = decoder.getCoder(factClass);
-			if (filters == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
-				        build();
-			
-			JsonProtocolFilter filter = filters.getFilter();
-			if (filter == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
-				        build();
-			
-			return Response.status(Response.Status.OK).
-		                    entity(filter.getRules()).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules/{ruleName}")
-    @ApiOperation(
-        	value="Gets a filter rule by name attached to a topic decoder of a controller", 
-            notes="Decoders are associated with networked topics. A Policy Controller manages " +
-        	      "multiple topics and therefore its attached decoders. " + 
-        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
-        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
-        	responseContainer="List",
-        	response=FilterRule.class
-    )
-    @ApiResponses(value = { 
-        @ApiResponse(code=404, message="The controller, topic, fact type, or rule name cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilterRules(@ApiParam(value="Policy Controller Name", required=true)
-									   @PathParam("controller") String controllerName,
-									   @ApiParam(value="Topic Name", required=true)
-									   @PathParam("topic") String topic,
-									   @ApiParam(value="Fact Type", required=true)
-									   @PathParam("factType") String factClass,
-									   @ApiParam(value="Rule Name", required=true)
-    		                           @PathParam("ruleName") String ruleName) {
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-											(drools.getGroupId(), drools.getArtifactId(), topic);
-	    	
-	    	CoderFilters filters = decoder.getCoder(factClass);
-			if (filters == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
-				        build();
-			
-			JsonProtocolFilter filter = filters.getFilter();
-			if (filter == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
-				        build();
-			
-			return Response.status(Response.Status.OK).
-		                    entity(filter.getRules(ruleName)).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + ": " + ruleName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + ":" + ruleName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @DELETE
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules/{ruleName}")
-    @ApiOperation(
-        	value="Deletes a filter rule by name attached to a topic decoder of a controller", 
-            notes="Decoders are associated with networked topics. A Policy Controller manages " +
-        	      "multiple topics and therefore its attached decoders. " + 
-        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
-        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
-        	responseContainer="List",
-        	response=FilterRule.class
-    )
-    @ApiResponses(value = { 
-        @ApiResponse(code=404, message="The controller, topic, fact type, or rule name cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilterRuleDelete(@ApiParam(value="Policy Controller Name", required=true)
-										    @PathParam("controller") String controllerName,
-										    @ApiParam(value="Topic Name", required=true)
-										    @PathParam("topic") String topic,
-										    @ApiParam(value="Fact Type", required=true)
-										    @PathParam("factType") String factClass,
-										    @ApiParam(value="Rule Name", required=true)
-									        @PathParam("ruleName") String ruleName,
-									        @ApiParam(value="Filter Rule", required=true)
-	    		                            FilterRule rule) {
-		
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-											(drools.getGroupId(), drools.getArtifactId(), topic);
-	    	
-	    	CoderFilters filters = decoder.getCoder(factClass);
-			if (filters == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
-				        build();
-			
-			JsonProtocolFilter filter = filters.getFilter();
-			if (filter == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
-				        build();
-			
-			if (rule == null) {
-				filter.deleteRules(ruleName);
-				return Response.status(Response.Status.OK).
-	                    entity(filter.getRules()).
-	                    build();		
-			}
-			
-			if (rule.getName() == null || !rule.getName().equals(ruleName))
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + ":" + ruleName + 
-				        		         " rule name request inconsistencies (" + rule.getName() + ")")).
-				        build();
-			
-			filter.deleteRule(ruleName, rule.getRegex());
-			return Response.status(Response.Status.OK).
-		                    entity(filter.getRules()).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + ": " + ruleName + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + ":" + ruleName + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @PUT
-    @Path("engine/controllers/{controller}/decoders/{topic}/filters/{factType}/rules")
-    @ApiOperation(
-        	value="Places a new filter rule in a topic decoder", 
-            notes="Decoders are associated with networked topics. A Policy Controller manages " +
-        	      "multiple topics and therefore its attached decoders. " + 
-        	      "A Policy Controller uses filters to further specify the fact mapping.  " +
-        	      "Filters are applied on a per fact type and are composed of field matching rules. ",
-        	responseContainer="List",
-        	response=FilterRule.class
-    )
-    @ApiResponses(value = { 
-        @ApiResponse(code=404, message="The controller, topic, or fact type cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decoderFilterRule(@ApiParam(value="Policy Controller Name", required=true)
-									  @PathParam("controller") String controllerName,
-									  @ApiParam(value="Topic Name", required=true)
-									  @PathParam("topic") String topic,
-									  @ApiParam(value="Fact Type", required=true)
-									  @PathParam("factType") String factClass,
-									  @ApiParam(value="Rule Name", required=true)
-									  @PathParam("ruleName") String ruleName,
-									  @ApiParam(value="Filter Rule", required=true)
-									  FilterRule rule) {
-		
-		try {
-			DroolsController drools = getDroolsController(controllerName);
-	    	ProtocolCoderToolset decoder = EventProtocolCoder.manager.getDecoders
-											(drools.getGroupId(), drools.getArtifactId(), topic);
-	    	
-	    	CoderFilters filters = decoder.getCoder(factClass);
-			if (filters == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  does not exist")).
-				        build();
-			
-			JsonProtocolFilter filter = filters.getFilter();
-			if (filter == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass + "  no filters")).
-				        build();
-			
-			if (rule.getName() == null)
-	    		return Response.status(Response.Status.BAD_REQUEST).
-				        entity(new Error(controllerName + ":" + topic + ":" + factClass +  
-				        		         " rule name request inconsistencies (" + rule.getName() + ")")).
-				        build();
-			
-			filter.addRule(rule.getName(), rule.getRegex());
-			return Response.status(Response.Status.OK).
-		                    entity(filter.getRules()).
-		                    build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 factClass + " not acceptable")).
-                            build();
-		}
-    }
-    
-    @POST
-    @Path("engine/controllers/{controller}/decoders/{topic}")
-    @Consumes(MediaType.TEXT_PLAIN)
-    @ApiOperation(
-        	value="Decodes a string into a fact object, and encodes it back into a string", 
-            notes="Tests the decode/encode functions of a controller",
-        	response=CodingResult.class
-    )
-    @ApiResponses(value = { 
-    	@ApiResponse(code=400, message="Bad input has been provided"),
-        @ApiResponse(code=404, message="The controller cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response decode(@ApiParam(value="Policy Controller Name", required=true)
-                           @PathParam("controller") String controllerName,
-                           @ApiParam(value="Topic Name", required=true)
-    					   @PathParam("topic") String topic,
-    					   @ApiParam(value="JSON String to decode", required=true)
-    		               String json) {
-    	
-    	PolicyController policyController;
-		try {
-			policyController = PolicyController.factory.get(controllerName);
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(controllerName + ":" + topic + ":" +
-			                                 " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + ":" + topic + ":" + 
-			                                 " not acceptable")).
-                            build();
-		}
-    	
-    	CodingResult result = new CodingResult();
-		result.decoding = false;
-		result.encoding = false;
-		result.jsonEncoding = null;
-
-		Object event;
-    	try {
-    		event = EventProtocolCoder.manager.decode
-    					(policyController.getDrools().getGroupId(), 
-    					 policyController.getDrools().getArtifactId(), 
-    					 topic, 
-    					 json);
-    		result.decoding = true;
-    	} catch (Exception e) {
-    		return Response.status(Response.Status.BAD_REQUEST).
-			        entity(new Error(e.getMessage())).
-			        build();
-    	}
-    	
-    	try {
-    		result.jsonEncoding = EventProtocolCoder.manager.encode(topic, event);
-    		result.encoding = true;
-    	} catch (Exception e) {
-    		// continue so to propagate decoding results ..
-    	} 
-    	
-		return Response.status(Response.Status.OK).
-                entity(result).
-                build();
-    }
-    
-    @GET
-    @Path("engine/controllers/{controller}/encoders")
-    @ApiOperation(
-        	value="Retrieves the encoder filters of a controller", 
-            notes="The encoders serializes a fact object, typically for network transmission",
-            responseContainer="List",
-        	response=CoderFilters.class
-    )
-    @ApiResponses(value = { 
-    	@ApiResponse(code=400, message="Bad input has been provided"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled")
-    })
-    public Response encoderFilters(@ApiParam(value="Policy Controller Name", required=true)
-                                   @PathParam("controller") String controllerName) {   	
-		List<CoderFilters> encoders;
-		try {
-			PolicyController controller = PolicyController.factory.get(controllerName);
-			DroolsController drools = controller.getDrools();
-			encoders = EventProtocolCoder.manager.getEncoderFilters
-							(drools.getGroupId(), drools.getArtifactId());
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.BAD_REQUEST).
-					               entity(new Error(controllerName +  " not found: " + e.getMessage())).
-					               build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(controllerName + " is not accepting the request")).build();
-		}
-		
-		return Response.status(Response.Status.OK).
-                               entity(encoders).
-                               build();
-    }
-    
-	@GET
-    @Path("engine/topics")
-    @ApiOperation(
-        	value="Retrieves the managed topics", 
-            notes="Network Topics Aggregation",
-        	response=TopicEndpoint.class
-    )
-    public Response topics() {
-		return Response.status(Response.Status.OK).
-				        entity(TopicEndpoint.manager).
-				        build();
-    }
-	
-    @GET
-    @Path("engine/topics/switches")
-    @ApiOperation(
-        	value="Topics Control Switches", 
-        	notes="List of the Topic Control Switches",
-        	responseContainer="List"
-    )
-    public Response topicSwitches() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Switches.values())).
-                        build();
-    }
-    
-    @PUT
-    @Path("engine/topics/switches/lock")
-    @ApiOperation(
-        	value="Locks all the managed topics", 
-        	notes="The operation affects all managed sources and sinks",
-        	response=TopicEndpoint.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response topicsLock() {
-    	boolean success = TopicEndpoint.manager.lock();
-		if (success)
-			return Response.status(Status.OK).
-					        entity(TopicEndpoint.manager).
-					        build();
-		else
-			return Response.status(Status.NOT_ACCEPTABLE).
-					        entity(new Error("cannot perform operation")).
-					        build();
-    }
-    
-    @DELETE
-	@Path("engine/topics/switches/lock")
-    @ApiOperation(
-        	value="Unlocks all the managed topics", 
-        	notes="The operation affects all managed sources and sinks",
-        	response=TopicEndpoint.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-	public Response topicsUnlock() {
-		boolean success = TopicEndpoint.manager.unlock();
-		if (success)
-			return Response.status(Status.OK).
-					        entity(TopicEndpoint.manager).
-					        build();
-		else
-			return Response.status(Status.NOT_ACCEPTABLE).
-					        entity(new Error("cannot perform operation")).
-					        build();
-	}
-    
-	@GET
-    @Path("engine/topics/sources")
-    @ApiOperation(
-        	value="Retrieves the managed topic sources", 
-            notes="Network Topic Sources Agregation",
-            responseContainer="List",
-        	response=TopicSource.class
-    )
-    public Response sources() {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getTopicSources()).
-    			        build();
-    }
-    
-	@GET
-    @Path("engine/topics/sinks")
-    @ApiOperation(
-        	value="Retrieves the managed topic sinks", 
-            notes="Network Topic Sinks Agregation",
-            responseContainer="List",
-        	response=TopicSink.class
-    )
-    public Response sinks() {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getTopicSinks()).
-    			        build();
-    }
-    
-	@GET
-    @Path("engine/topics/sources/ueb")
-    @ApiOperation(
-        	value="Retrieves the UEB managed topic sources", 
-            notes="UEB Topic Sources Agregation",
-            responseContainer="List",
-        	response=UebTopicSource.class
-    )
-    public Response uebSources() {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getUebTopicSources()).
-    			        build();
-    }
-    
-	@GET
-    @Path("engine/topics/sinks/ueb")
-    @ApiOperation(
-        	value="Retrieves the UEB managed topic sinks", 
-            notes="UEB Topic Sinks Agregation",
-            responseContainer="List",
-        	response=UebTopicSource.class
-    )
-    public Response uebSinks() {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getUebTopicSinks()).
-    			        build();
-    }
-    
-	@GET
-    @Path("engine/topics/sources/dmaap")
-    @ApiOperation(
-        	value="Retrieves the DMaaP managed topic sources", 
-            notes="DMaaP Topic Sources Agregation",
-            responseContainer="List",
-        	response=DmaapTopicSource.class
-    )
-    public Response dmaapSources() {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getDmaapTopicSources()).
-    			        build();
-    }
-    
-	@GET
-    @Path("engine/topics/sinks/dmaap")
-    @ApiOperation(
-        	value="Retrieves the DMaaP managed topic sinks", 
-            notes="DMaaP Topic Sinks Agregation",
-            responseContainer="List",
-        	response=DmaapTopicSink.class
-    )
-    public Response dmaapSinks() {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getDmaapTopicSinks()).
-    			        build();
-    }
-    
-    @GET
-    @Path("engine/topics/sources/ueb/{topic}")
-    @ApiOperation(
-        	value="Retrieves an UEB managed topic source", 
-            notes="This is an UEB Network Communicaton Endpoint source of messages for the Engine",
-        	response=UebTopicSource.class
-    )
-    public Response uebSourceTopic(@ApiParam(value="Topic Name", required=true)
-                                   @PathParam("topic") String topic) {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getUebTopicSource(topic)).
-    			        build();
-    }
-    
-    @GET
-    @Path("engine/topics/sinks/ueb/{topic}")
-    @ApiOperation(
-        	value="Retrieves an UEB managed topic sink", 
-            notes="This is an UEB Network Communicaton Endpoint destination of messages from the Engine",
-        	response=UebTopicSink.class
-    )
-    public Response uebSinkTopic(@ApiParam(value="Topic Name", required=true) 
-                                 @PathParam("topic") String topic) {
-    	return Response.status(Response.Status.OK).
-    			        entity(TopicEndpoint.manager.getUebTopicSink(topic)).
-    			        build();
-    }
-    
-    @GET
-    @Path("engine/topics/sources/dmaap/{topic}")
-    @ApiOperation(
-        	value="Retrieves a DMaaP managed topic source", 
-            notes="This is a DMaaP Network Communicaton Endpoint source of messages for the Engine",
-        	response=DmaapTopicSource.class
-    )
-    public Response dmaapSourceTopic(@ApiParam(value="Topic Name", required=true) 
-                                     @PathParam("topic") String topic) {
-    	return Response.status(Response.Status.OK).
-                        entity(TopicEndpoint.manager.getDmaapTopicSource(topic)).
-                        build();
-    }
-    
-    @GET
-    @Path("engine/topics/sinks/dmaap/{topic}")
-    @ApiOperation(
-        	value="Retrieves a DMaaP managed topic sink", 
-            notes="This is a DMaaP Network Communicaton Endpoint destination of messages from the Engine",
-        	response=DmaapTopicSink.class
-    )
-    public Response dmaapSinkTopic(@ApiParam(value="Topic Name", required=true)
-                                   @PathParam("topic") String topic) {
-    	return Response.status(Response.Status.OK).
-		                entity(TopicEndpoint.manager.getDmaapTopicSink(topic)).
-		                build();
-    }
-    
-    @GET
-    @Path("engine/topics/sources/ueb/{topic}/events")
-    @ApiOperation(
-        	value="Retrieves the latest events received by an UEB topic", 
-            notes="This is a UEB Network Communicaton Endpoint source of messages for the Engine",
-            responseContainer="List"
-    )
-    public Response uebSourceEvents(@ApiParam(value="Topic Name", required=true)
-                                    @PathParam("topic") String topic) {
-		return Response.status(Status.OK).
-		                entity(Arrays.asList(TopicEndpoint.manager.getUebTopicSource(topic).getRecentEvents())).
-		                build();
-    }
-    
-    @GET
-    @Path("engine/topics/sinks/ueb/{topic}/events")
-    @ApiOperation(
-        	value="Retrieves the latest events sent from a topic", 
-            notes="This is a UEB Network Communicaton Endpoint sink of messages from the Engine",
-            responseContainer="List"
-    )
-    public Response uebSinkEvents(@ApiParam(value="Topic Name", required=true)
-                                  @PathParam("topic") String topic) {
-		return Response.status(Status.OK).
-				        entity(Arrays.asList(TopicEndpoint.manager.getUebTopicSink(topic).getRecentEvents())).
-				        build();
-    }
-    
-    @GET
-    @Path("engine/topics/sources/dmaap/{topic}/events")
-    @ApiOperation(
-        	value="Retrieves the latest events received by a DMaaP topic", 
-            notes="This is a DMaaP Network Communicaton Endpoint source of messages for the Engine",
-            responseContainer="List"
-    )
-    public Response dmaapSourceEvents(@ApiParam(value="Topic Name", required=true)
-                                      @PathParam("topic") String topic) {   	
-		return Response.status(Status.OK).
-                entity(Arrays.asList(TopicEndpoint.manager.getDmaapTopicSource(topic).getRecentEvents())).
-                build();
-    }
-    
-    @GET
-    @Path("engine/topics/sinks/dmaap/{topic}/events")
-    @ApiOperation(
-        	value="Retrieves the latest events send through a DMaaP topic", 
-            notes="This is a DMaaP Network Communicaton Endpoint destination of messages from the Engine",
-            responseContainer="List"
-    )
-    public Response dmaapSinkEvents(
-                                    @PathParam("topic") String topic) {   	
-		return Response.status(Status.OK).
-                entity(Arrays.asList(TopicEndpoint.manager.getDmaapTopicSink(topic).getRecentEvents())).
-                build();
-    }
-    
-    @GET
-    @Path("engine/topics/sources/ueb/{topic}/switches")
-    @ApiOperation(
-        	value="UEB Topic Control Switches", 
-        	notes="List of the UEB Topic Control Switches",
-        	responseContainer="List"
-    )
-    public Response uebTopicSwitches() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Switches.values())).
-                        build();
-    }
-    
-    @PUT
-    @Path("engine/topics/sources/ueb/{topic}/switches/lock")
-    @ApiOperation(
-        	value="Locks an UEB Source topic", 
-        	response=UebTopicSource.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response uebTopicLock(@ApiParam(value="Topic Name", required=true)
-                                 @PathParam("topic") String topic) {
-    	UebTopicSource source = TopicEndpoint.manager.getUebTopicSource(topic);  	
-    	boolean success = source.lock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(source).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("cannot perform operation on " + topic)).
-    				        build();
-    }
-    
-    @DELETE
-    @Path("engine/topics/sources/ueb/{topic}/switches/lock")
-    @ApiOperation(
-        	value="Unlocks an UEB Source topic", 
-        	response=UebTopicSource.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response uebTopicUnlock(@ApiParam(value="Topic Name", required=true)
-                                   @PathParam("topic") String topic) {
-    	UebTopicSource source = TopicEndpoint.manager.getUebTopicSource(topic);  	
-    	boolean success = source.unlock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(source).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("cannot perform operation on " + topic)).
-    				        build();
-    }
-    
-    @GET
-    @Path("engine/topics/sources/dmaap/{topic}/switches")
-    @ApiOperation(
-        	value="DMaaP Topic Control Switches", 
-        	notes="List of the DMaaP Topic Control Switches",
-        	responseContainer="List"
-    )
-    public Response dmaapTopicSwitches() {  	
-		return Response.status(Response.Status.OK).
-                        entity(Arrays.asList(Switches.values())).
-                        build();
-    }
-    
-    @PUT
-    @Path("engine/topics/sources/dmaap/{topic}/switches/lock")
-    @ApiOperation(
-        	value="Locks an DMaaP Source topic", 
-        	response=DmaapTopicSource.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response dmmapTopicLock(@ApiParam(value="Topic Name", required=true)
-                                   @PathParam("topic") String topic) {
-    	DmaapTopicSource source = TopicEndpoint.manager.getDmaapTopicSource(topic);  	
-    	boolean success = source.lock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(source).
-    				        build();
-    	else
-    		return Response.status(Status.NOT_ACCEPTABLE).
-    				        entity(new Error("cannot perform operation on " + topic)).
-    				        build();
-    }
-    
-    @DELETE
-    @Path("engine/topics/sources/dmaap/{topic}/switches/lock")
-    @ApiOperation(
-        	value="Unlocks an DMaaP Source topic", 
-        	response=DmaapTopicSource.class
-    )
-    @ApiResponses(value = { 
-    		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-    		                               "this request to be fulfilled")
-    })
-    public Response dmaapTopicUnlock(@ApiParam(value="Topic Name", required=true)
-                                     @PathParam("topic") String topic) {
-    	DmaapTopicSource source = TopicEndpoint.manager.getDmaapTopicSource(topic);  	
-    	boolean success = source.unlock();
-    	if (success)
-    		return Response.status(Status.OK).
-    				        entity(source).
-    				        build();
-    	else
-    		return Response.status(Status.SERVICE_UNAVAILABLE).
-    				        entity(new Error("cannot perform operation on " + topic)).
-    				        build();
-    }
-    
-    @PUT
-    @Path("engine/topics/sources/ueb/{topic}/events")
-    @Consumes(MediaType.TEXT_PLAIN)
-    @ApiOperation(
-        	value="Offers an event to an UEB topic for internal processing by the engine", 
-        	notes="The offered event is treated as it was incoming from the network",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The topic information cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A server error has occurred processing this request")
-    })
-    public Response uebOffer(@ApiParam(value="Topic Name", required=true)
-                             @PathParam("topic") String topic,
-                             @ApiParam(value="Network Message", required=true)
-    		                 String json) {
-    	try {
-			UebTopicSource uebReader = TopicEndpoint.manager.getUebTopicSource(topic);
-			boolean success = uebReader.offer(json);
-			if (success)
-				return Response.status(Status.OK).
-						        entity(Arrays.asList(TopicEndpoint.manager.getUebTopicSource(topic).getRecentEvents())).
-						        build();
-			else
-				return Response.status(Status.NOT_ACCEPTABLE).
-						        entity(new Error("Failure to inject event over " + topic)).
-						        build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(topic + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(topic + " not acceptable due to current state")).
-                            build();
-		} catch (Exception e) {
-			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-		                    entity(new Error(e.getMessage())).
-		                    build();			
-		}
-    }
-    
-    @PUT
-    @Path("engine/topics/sources/dmaap/{topic}/events")
-    @Consumes(MediaType.TEXT_PLAIN)
-    @ApiOperation(
-        	value="Offers an event to a DMaaP topic for internal processing by the engine", 
-        	notes="The offered event is treated as it was incoming from the network",
-        	responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=404, message="The topic information cannot be found"),
-		@ApiResponse(code=406, message="The system is an administrative state that prevents " +
-		                               "this request to be fulfilled"),
-		@ApiResponse(code=500, message="A server error has occurred processing this request")
-    })
-    public Response dmaapOffer(@ApiParam(value="Topic Name", required=true)
-                               @PathParam("topic") String topic,
-                               @ApiParam(value="Network Message", required=true)
-    		                   String json) {
-    	try {
-			DmaapTopicSource dmaapReader = TopicEndpoint.manager.getDmaapTopicSource(topic);
-			boolean success = dmaapReader.offer(json);
-			if (success)
-				return Response.status(Status.OK).
-				                entity(Arrays.asList(TopicEndpoint.manager.getDmaapTopicSource(topic).getRecentEvents())).
-				                build();
-			else
-				return Response.status(Status.NOT_ACCEPTABLE).
-						        entity(new Error("Failure to inject event over " + topic)).
-						        build();
-		} catch (IllegalArgumentException e) {
-			return Response.status(Response.Status.NOT_FOUND).
-                            entity(new Error(topic + " not found")).
-                            build();
-		} catch (IllegalStateException e) {
-			return Response.status(Response.Status.NOT_ACCEPTABLE).
-                            entity(new Error(topic + " not acceptable due to current state")).
-                            build();
-		} catch (Exception e) {
-			return Response.status(Response.Status.INTERNAL_SERVER_ERROR).
-		                    entity(new Error(e.getMessage())).
-		                    build();			
-		}
-    }
-    
-    @GET
-    @Path("engine/tools/uuid")
-    @ApiOperation(
-        	value="Produces an UUID", 
-        	notes="UUID generation utility"
-    )
-    @Produces(MediaType.TEXT_PLAIN)
-    public Response uuid() {   	
-		return Response.status(Status.OK).
-		        entity(UUID.randomUUID().toString()).
-		        build();
-    }
-    
-    @GET
-    @Path("engine/tools/loggers")
-    @ApiOperation(
-        	value="all active loggers", 
-            responseContainer="List"
-    )
-    @ApiResponses(value = { 
-		@ApiResponse(code=500, message="logging misconfiguration")
-    })
-    public Response loggers() { 
-    	List<String> names = new ArrayList<String>();
-    	if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
-    		logger.warn("The SLF4J logger factory is not configured for logback");
-    		return Response.status(Status.INTERNAL_SERVER_ERROR).
-    				        entity(names).build();
-    	}
-    		
-    	LoggerContext context = 
-    			(LoggerContext) LoggerFactory.getILoggerFactory();
-    	for (Logger logger: context.getLoggerList()) {
-    		names.add(logger.getName());
-    	}
-    	
-		return Response.status(Status.OK).
-		        entity(names).
-		        build();
-    }
-    
-    @GET
-    @Path("engine/tools/loggers/{logger}")
-    @ApiOperation(
-        	value="logging level of a logger"
-    )
-    @ApiResponses(value = { 
-    	@ApiResponse(code=500, message="logging misconfiguration"),
-		@ApiResponse(code=404, message="logger not found")
-    })
-    public Response loggerName(@ApiParam(value="Logger Name", required=true) 
-                               @PathParam("logger") String loggerName) { 
-    	if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
-    		logger.warn("The SLF4J logger factory is not configured for logback");
-    		return Response.status(Status.INTERNAL_SERVER_ERROR).build();
-    	}
-    	
-    	LoggerContext context = 
-    			(LoggerContext) LoggerFactory.getILoggerFactory();
-    	ch.qos.logback.classic.Logger logger = context.getLogger(loggerName);
-    	if (logger == null) {
-    		return Response.status(Status.NOT_FOUND).build();
-    	}
-    	
-    	String loggerLevel = (logger.getLevel() != null) ? logger.getLevel().toString() : "";   	
-		return Response.status(Status.OK).entity(loggerLevel).build();
-    }
-    
-    @PUT
-    @Path("engine/tools/loggers/{logger}/{level}")
-    @ApiOperation(
-        	value="sets the logger level", 
-        	notes="Please use the SLF4J logger levels"
-    )
-    @ApiResponses(value = { 
-        	@ApiResponse(code=500, message="logging misconfiguration"),
-    		@ApiResponse(code=404, message="logger not found")
-    })
-    public Response loggerName(@ApiParam(value="Logger Name", required=true) 
-                               @PathParam("logger") String loggerName,
-                               @ApiParam(value="Logger Level", required=true) 
-                               @PathParam("level") String loggerLevel) { 
-    	if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
-    		logger.warn("The SLF4J logger factory is not configured for logback");
-    		return Response.status(Status.INTERNAL_SERVER_ERROR).build();
-    	}
-    		
-    	LoggerContext context = 
-    			(LoggerContext) LoggerFactory.getILoggerFactory();
-    	ch.qos.logback.classic.Logger logger = context.getLogger(loggerName);
-    	if (logger == null) {
-    		return Response.status(Status.NOT_FOUND).build();
-    	}
-    	
-    	logger.setLevel(ch.qos.logback.classic.Level.toLevel(loggerLevel));
-		return Response.status(Status.OK).entity(logger.getLevel().toString()).build();
-    }
-    
-    /**
-     * gets the underlying drools controller from the named policy controller
-     * @param controllerName the policy controller name
-     * @return the underlying drools controller
-     * @throws IllegalArgumentException if an invalid controller name has been passed in
-     */
-    protected DroolsController getDroolsController(String controllerName) throws IllegalArgumentException {
-		PolicyController controller = PolicyController.factory.get(controllerName);
-    	if (controller == null)
-    		throw new IllegalArgumentException(controllerName + "  does not exist");
-
-		DroolsController drools = controller.getDrools();
-    	if (drools == null)
-    		throw new IllegalArgumentException(controllerName + "  has no drools configuration");
-    	
-    	return drools;
-    }
-    
-    /*
-     * Helper classes for aggregation of results
-     */
-	
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("rest-telemetry-api []");
-		return builder.toString();
-	}
-
-	/**
-	 * Coding/Encoding Results Aggregation Helper class 
-	 */
-	public static class CodingResult {
-		/**
-		 * serialized output
-		 */
-		
-		public String jsonEncoding;
-		/**
-		 * encoding result
-		 */
-		
-		public Boolean encoding;
-		
-		/**
-		 * decoding result
-		 */
-		public Boolean decoding;
-	}
-	
-	/**
-	 * Generic Error Reporting class 
-	 */
-	public static class Error {
-		public String error;
-
-		public Error(String error) {
-			this.error = error;
-		}
-	}
-	
-	/**
-	 * Feed Ports into Resources
-	 */
-	public enum Inputs {
-		configuration,
-	}
-	
-	/**
-	 * Resource Toggles
-	 */
-	public enum Switches {
-		activation,
-		lock,
-	}
-}
-
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java b/policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java
deleted file mode 100644
index 1bb9a320..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/Main.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.system;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.utils.PropertyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Programmatic entry point to the management layer
- */
-public class Main {
-
-	/**
-	 * logback configuration file system property
-	 */
-	public static final String LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY = "logback.configurationFile";
-	
-	/**
-	 * logback configuration file system property
-	 */
-	public static final String LOGBACK_CONFIGURATION_FILE_DEFAULT = "config/logback.xml";
-	
-	/**
-	 * constructor (hides public default one)
-	 */
-	private Main() {}	
-	
-	/**
-	 * main
-	 * 
-	 * @param args program arguments
-	 */
-	public static void main(String args[]) {
-		
-		/* logging defaults */
-		
-		if (System.getProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY) == null)
-			System.setProperty(LOGBACK_CONFIGURATION_FILE_SYSTEM_PROPERTY, LOGBACK_CONFIGURATION_FILE_DEFAULT);
-		
-		/* 0. boot */
-		
-		PolicyEngine.manager.boot(args);
-		
-		Logger logger = LoggerFactory.getLogger(Main.class);
-		
-		File configDir = new File(SystemPersistence.CONFIG_DIR_NAME);
-		
-		if (!configDir.isDirectory()) {
-			throw new IllegalArgumentException
-						("config directory: " + configDir.getAbsolutePath() + 
-						 " not found");
-		}
-		
-		/* 1. Configure the Engine */
-
-		try {
-			Path policyEnginePath = Paths.get(configDir.toPath().toString(), SystemPersistence.PROPERTIES_FILE_ENGINE);
-			Properties properties = PropertyUtil.getProperties(policyEnginePath.toFile());
-			PolicyEngine.manager.configure(properties);
-		} catch (Exception e) {
-			logger.warn("Main: cannot initialize {} because of {}", PolicyEngine.manager, e.getMessage(), e);
-		}
-		
-		/* 2. Start the Engine with the basic services only (no Policy Controllers) */
-		
-		try {
-			boolean success = PolicyEngine.manager.start();
-			if (!success) {
-				logger.warn("Main: {} has been partially started", PolicyEngine.manager);		
-			}
-		} catch (IllegalStateException e) {
-			logger.warn("Main: cannot start {} (bad state) because of {}", PolicyEngine.manager, e.getMessage(), e);
-		} catch (Exception e) {
-			logger.warn("Main: cannot start {} because of {}", PolicyEngine.manager, e.getMessage(), e);
-			System.exit(1);
-		}
-		
-		/* 3. Create and start the controllers */
-		
-		File[] controllerFiles = configDir.listFiles();
-		for (File config : controllerFiles) {
-
-			if (config.getName().endsWith(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX)) {
-				int idxSuffix = 
-						config.getName().indexOf(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
-				int lastIdxSuffix = 
-						config.getName().lastIndexOf(SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
-				if (idxSuffix != lastIdxSuffix) {
-					throw new IllegalArgumentException
-								("Improper naming of controller properties file: " +
-				                 "Expected <controller-name>" + 
-				                 SystemPersistence.PROPERTIES_FILE_CONTROLLER_SUFFIX);
-				}
-
-				String name = 
-						config.getName().substring(0, lastIdxSuffix);
-				try {
-					Properties properties = PropertyUtil.getProperties(config);
-					PolicyController controller = PolicyEngine.manager.createPolicyController(name, properties);
-					controller.start();
-				} catch (Exception e) {
-					logger.error("Main: cannot instantiate policy-controller {} because of {}", name, e.getMessage(), e);
-				} catch (LinkageError e) {
-					logger.warn("Main: cannot instantiate policy-controller {} (linkage) because of {}", 
-							    name, e.getMessage(), e);
-				}
-			}
-		}
-	}
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java b/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java
deleted file mode 100644
index 15d1acf3..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.system;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-
-/**
- * A Policy Controller is the higher level unit of control.  It corresponds to
- * the ncomp equivalent of a controller.  It provides management of underlying
- * resources associated with the policy controller, which is a) communication
- * infrastructure, and b) policy-core (drools) session infrastructure
- *
- */
-public interface PolicyController extends Startable, Lockable {
-	
-	/**
-	 * name of this Policy Controller
-	 */
-	public String getName();
-	
-	/**
-	 * Get the topic readers of interest for this controller
-	 */
-	public List<? extends TopicSource> getTopicSources();
-	
-	/**
-	 * Get the topic readers of interest for this controller
-	 */
-	public List<? extends TopicSink> getTopicSinks();
-	
-	/**
-	 * Get the Drools Controller
-	 */
-	public DroolsController getDrools();
-	
-	/**
-	 * update maven configuration
-	 * 
-	 * @param newDroolsConfiguration new drools configuration
-	 * @return true if the update was successful, false otherwise
-	 */	
-	public boolean updateDrools(DroolsConfiguration newDroolsConfiguration);
-	
-	/**
-	 * Get the Properties
-	 */
-	public Properties getProperties();
-	
-	/**
-	 * Attempts delivering of an String over communication 
-	 * infrastructure "busType"
-	 * 
-	 * @param eventBus Communication infrastructure identifier
-	 * @param topic topic
-	 * @param event the event object to send
-	 * 
-	 * @return true if successful, false if a failure has occurred.
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted (ie. locked or stopped).
-	 * @throws UnsupportedOperationException when the engine cannot deliver due
-	 *         to the functionality missing (ie. communication infrastructure
-	 *         not supported.
-	 */
-	public boolean deliver(CommInfrastructure busType, String topic, 
-			               Object event)
-			throws IllegalArgumentException, IllegalStateException, 
-			       UnsupportedOperationException;
-	
-	/**
-	 * halts and permanently releases all resources
-	 * @throws IllegalStateException
-	 */
-	public void halt() throws IllegalStateException;
-	
-	/**
-	 * Factory that tracks and manages Policy Controllers
-	 */
-	public static PolicyControllerFactory factory =
-						new IndexedPolicyControllerFactory();
-	
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java b/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java
deleted file mode 100644
index 12a8acdc..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyControllerFactory.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.system;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-import org.openecomp.policy.drools.system.internal.AggregatedPolicyController;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Policy Controller Factory to manage controller creation, destruction,
- * and retrieval for management interfaces
- */
-public interface PolicyControllerFactory {
-	/**
-	 * Build a controller from a properties file
-	 * 
-	 * @param name the global name of this controller
-	 * @param properties input parameters in form of properties for controller
-	 * initialization.
-	 * 
-	 * @return a Policy Controller
-	 * 
-	 * @throws IllegalArgumentException invalid values provided in properties
-	 */
-	public PolicyController build(String name, Properties properties)
-			throws IllegalArgumentException;
-	
-	/**
-	 * patches (updates) a controller from a critical configuration update.
-	 * 
-	 * @param name
-	 * @param configController
-	 * 
-	 * @return a Policy Controller
-	 */
-	public PolicyController patch(String name, DroolsConfiguration configController);
-	
-	/**
-	 * rebuilds (updates) a controller from a configuration update.
-	 * 
-	 * @param controller
-	 * @param configController
-	 * 
-	 * @return a Policy Controller
-	 */
-	public PolicyController patch(PolicyController controller, 
-			                      DroolsConfiguration configController);
-	
-	/**
-	 * get PolicyController from DroolsController
-	 * 
-	 * @param droolsController
-	 * @return
-	 * @throws IllegalArgumentException
-	 * @throws IllegalStateException
-	 */
-	public PolicyController get(DroolsController droolsController) 
-			throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Makes the Policy Controller identified by controllerName not operational, but
-	 * does not delete its associated data
-	 * 
-	 * @param controllerName  name of the policy controller
-	 * @throws IllegalArgumentException invalid arguments
-	 */
-	public void shutdown(String controllerName) throws IllegalArgumentException;;
-	
-	/**
-	 * Makes the Policy Controller identified by controller not operational, but
-	 * does not delete its associated data
-	 * 
-	 * @param controller a Policy Controller
-	 * @throws IllegalArgumentException invalid arguments
-	 */
-	public void shutdown(PolicyController controller) throws IllegalArgumentException;
-	
-	/**
-	 * Releases all Policy Controllers from operation
-	 */
-	public void shutdown();
-
-	/**
-	 * Destroys this Policy Controller
-	 * 
-	 * @param controllerName  name of the policy controller
-	 * @throws IllegalArgumentException invalid arguments
-	 */
-	public void destroy(String controllerName) throws IllegalArgumentException;;
-	
-	/**
-	 * Destroys this Policy Controller
-	 * 
-	 * @param controller a Policy Controller
-	 * @throws IllegalArgumentException invalid arguments
-	 */
-	public void destroy(PolicyController controller) throws IllegalArgumentException;
-	
-	/**
-	 * Releases all Policy Controller resources
-	 */
-	public void destroy();
-	
-	/**
-	 * gets the Policy Controller identified by its name
-	 * 
-	 * @param policyControllerName
-	 * @return
-	 * @throws IllegalArgumentException
-	 * @throws IllegalStateException
-	 */
-	public PolicyController get(String policyControllerName)
-		   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * gets the Policy Controller identified by group and artifact ids
-	 * 
-	 * @param groupId group id
-	 * @param artifactId artifact id
-	 * @return
-	 * @throws IllegalArgumentException
-	 * @throws IllegalStateException
-	 */
-	public PolicyController get(String groupId, String artifactId)
-		   throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * get features attached to the Policy Controllers
-	 * @return list of features
-	 */
-	public List<PolicyControllerFeatureAPI> getFeatureProviders();
-	
-	/**
-	 * get named feature attached to the Policy Controllers
-	 * @return the feature
-	 */
-	public PolicyControllerFeatureAPI getFeatureProvider(String featureName) 
-			throws IllegalArgumentException;
-	
-	/**
-	 * get features attached to the Policy Controllers
-	 * @return list of features
-	 */
-	public List<String> getFeatures();
-	
-	/**
-	 * returns the current inventory of Policy Controllers
-	 * 
-	 * @return a list of Policy Controllers
-	 */
-	public List<PolicyController> inventory();
-}
-
-/**
- * Factory of Policy Controllers indexed by the name of the Policy Controller
- */
-class IndexedPolicyControllerFactory implements PolicyControllerFactory {
-	// get an instance of logger 
-	private static Logger  logger = LoggerFactory.getLogger(PolicyControllerFactory.class);		
-	
-	/**
-	 * Policy Controller Name Index
-	 */
-	protected HashMap<String,PolicyController> policyControllers =
-			new HashMap<String,PolicyController>();
-	
-	/**
-	 * Group/Artifact Ids Index
-	 */
-	protected HashMap<String,PolicyController> coordinates2Controller = 
-			new HashMap<String,PolicyController>();
-	
-	/**
-	 * produces key for indexing controller names
-	 * 
-	 * @param group group id
-	 * @param artifactId artifact id
-	 * @return index key
-	 */
-	protected String toKey(String groupId, String artifactId) {
-		return groupId + ":" + artifactId;
-	}
-		
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized PolicyController build(String name, Properties properties) 
-			throws IllegalArgumentException {
-		
-		if (this.policyControllers.containsKey(name)) {
-			return this.policyControllers.get(name);
-		}
-		
-		/* A PolicyController does not exist */
-		
-		PolicyController controller =
-				new AggregatedPolicyController(name, properties);
-		
-		String coordinates = toKey(controller.getDrools().getGroupId(),
-				                   controller.getDrools().getArtifactId());
-		
-		this.policyControllers.put(name, controller);	
-		
-
-		if (controller.getDrools().isBrained())
-			this.coordinates2Controller.put(coordinates, controller);
-		
-		return controller;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized PolicyController patch(String name, DroolsConfiguration droolsConfig) 
-			throws IllegalArgumentException {
-		
-		if (name == null || name.isEmpty() || !this.policyControllers.containsKey(name)) {
-			throw new IllegalArgumentException("Invalid " + name);
-		}
-		
-		if (droolsConfig == null)
-			throw new IllegalArgumentException("Invalid Drools Configuration");
-		
-		PolicyController controller = this.get(name);
-		
-		if (controller == null) {
-			logger.warn("A POLICY CONTROLLER of name " + name + 
-					    "does not exist for patch operation: " + droolsConfig);
-			
-			throw new IllegalArgumentException("Not a valid controller of name " + name);
-		}
-		
-		this.patch(controller, droolsConfig);
-		
-		if (logger.isInfoEnabled())
-			logger.info("UPDATED drools configuration: " + droolsConfig + " on " + this);
-		
-		return controller;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyController patch(PolicyController controller, DroolsConfiguration droolsConfig) 
-			throws IllegalArgumentException {
-
-		if (controller == null)
-			throw new IllegalArgumentException("Not a valid controller:  null");
-		
-		if (!controller.updateDrools(droolsConfig)) {
-			logger.warn("Cannot update drools configuration: " + droolsConfig + " on " + this);
-			throw new IllegalArgumentException("Cannot update drools configuration Drools Configuration");
-		}
-		
-		if (logger.isInfoEnabled())
-			logger.info("UPDATED drools configuration: " + droolsConfig + " on " + this);
-		
-		String coordinates = toKey(controller.getDrools().getGroupId(),
-				                   controller.getDrools().getArtifactId());
-		
-		if (controller.getDrools().isBrained())
-			this.coordinates2Controller.put(coordinates, controller);
-		
-		return controller;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown(String controllerName) throws IllegalArgumentException {
-		
-		if (controllerName == null || controllerName.isEmpty()) {
-			throw new IllegalArgumentException("Invalid " + controllerName);
-		}
-		
-		synchronized(this) {
-			if (!this.policyControllers.containsKey(controllerName)) {
-				return;
-			}
-					
-			PolicyController controller = this.policyControllers.get(controllerName);
-			this.shutdown(controller);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown(PolicyController controller) throws IllegalArgumentException {		
-		this.unmanage(controller);
-		controller.shutdown();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() {
-		List<PolicyController> controllers = this.inventory();
-		for (PolicyController controller: controllers) {
-			controller.shutdown();
-		}
-		
-		synchronized(this) {
-			this.policyControllers.clear();
-			this.coordinates2Controller.clear();
-		}
-	}
-	
-	/**
-	 * unmanage the controller
-	 * 
-	 * @param controller
-	 * @return
-	 * @throws IllegalArgumentException
-	 */
-	protected void unmanage(PolicyController controller) throws IllegalArgumentException {
-		if (controller == null) {
-			throw new IllegalArgumentException("Invalid Controller");
-		}
-		
-		synchronized(this) {
-			if (!this.policyControllers.containsKey(controller.getName())) {
-				return;
-			}
-			controller = this.policyControllers.remove(controller.getName());
-			
-			String coordinates = toKey(controller.getDrools().getGroupId(),
-                                       controller.getDrools().getArtifactId());
-			this.coordinates2Controller.remove(coordinates);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(String controllerName) throws IllegalArgumentException {
-		
-		if (controllerName == null || controllerName.isEmpty()) {
-			throw new IllegalArgumentException("Invalid " + controllerName);
-		}
-		
-		synchronized(this) {
-			if (!this.policyControllers.containsKey(controllerName)) {
-				return;
-			}
-					
-			PolicyController controller = this.policyControllers.get(controllerName);
-			this.destroy(controller);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy(PolicyController controller) throws IllegalArgumentException {
-		this.unmanage(controller);
-		controller.halt();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void destroy() {
-		List<PolicyController> controllers = this.inventory();
-		for (PolicyController controller: controllers) {
-			controller.halt();
-		}
-		
-		synchronized(this) {
-			this.policyControllers.clear();
-			this.coordinates2Controller.clear();
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyController get(String name) throws IllegalArgumentException, IllegalStateException {
-
-		if (name == null || name.isEmpty()) {
-			throw new IllegalArgumentException("Invalid " + name);
-		}
-		
-		synchronized(this) {
-			if (this.policyControllers.containsKey(name)) {
-				return this.policyControllers.get(name);
-			} else {
-				throw new IllegalArgumentException("Invalid " + name);
-			}
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyController get(String groupId, String artifactId) 
-			throws IllegalArgumentException, IllegalStateException {
-
-		if (groupId == null || groupId.isEmpty() || 
-			artifactId == null || artifactId.isEmpty()) {
-			throw new IllegalArgumentException("Invalid group/artifact ids");
-		}
-		
-		synchronized(this) {
-			String key = toKey(groupId,artifactId);
-			if (this.coordinates2Controller.containsKey(key)) {
-				return this.coordinates2Controller.get(key);
-			} else {
-				throw new IllegalArgumentException("Invalid " + key);
-			}
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyController get(DroolsController droolsController) 
-			throws IllegalArgumentException, IllegalStateException {
-
-		if (droolsController == null) {
-			throw new IllegalArgumentException("No Drools Controller provided");
-		}
-		
-		synchronized(this) {
-			String key = toKey(droolsController.getGroupId(), droolsController.getArtifactId());
-			if (this.coordinates2Controller.containsKey(key)) {
-				return this.coordinates2Controller.get(key);
-			} else {
-				logger.error("Drools Controller not associated with Policy Controller " + droolsController + ":" + this);
-				throw new IllegalStateException("Drools Controller not associated with Policy Controller " + droolsController + ":" + this);
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<PolicyController> inventory() {
-		 List<PolicyController> controllers = 
-				 new ArrayList<PolicyController>(this.policyControllers.values());
-		 return controllers;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override 
-	public List<String> getFeatures() {
-		List<String> features = new ArrayList<String>();
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			features.add(feature.getName());
-		}
-		return features;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<PolicyControllerFeatureAPI> getFeatureProviders() {
-		return PolicyControllerFeatureAPI.providers.getList();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyControllerFeatureAPI getFeatureProvider(String featureName) throws IllegalArgumentException {
-		if (featureName == null || featureName.isEmpty())
-			throw new IllegalArgumentException("A feature name must be provided");
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			if (feature.getName().equals(featureName))
-				return feature;
-		}
-		
-		throw new IllegalArgumentException("Invalid Feature Name: " + featureName);
-	}
-}
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java
deleted file mode 100644
index 02479ec8..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/PolicyEngine.java
+++ /dev/null
@@ -1,1461 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.system;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.jmx.PdpJmxListener;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.Topic.CommInfrastructure;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.Lockable;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.properties.Startable;
-import org.openecomp.policy.drools.protocol.coders.EventProtocolCoder;
-import org.openecomp.policy.drools.protocol.configuration.ControllerConfiguration;
-import org.openecomp.policy.drools.protocol.configuration.PdpdConfiguration;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-/**
- * Policy Engine, the top abstraction for the Drools PDP Policy Engine.
- * It abstracts away a Drools PDP Engine from management purposes.
- * This is the best place to looking at the code from a top down approach. 
- * Other managed entities can be obtained from the PolicyEngine, hierarchically. 
- * <br>
- * PolicyEngine 1 --- * PolicyController 1 --- 1 DroolsController 1 --- 1 PolicyContainer 1 --- * PolicySession
- * <br>
- * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 UebTopicReader
- * <br>
- * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 DmaapTopicReader
- * <br>
- * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 DmaapTopicWriter
- * <br>
- * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 RestTopicReader
- * <br>
- * PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 RestTopicWriter
- * <br>
- * PolicyEngine 1 --- 1 ManagementServer
- */
-public interface PolicyEngine extends Startable, Lockable, TopicListener {
-	
-	/**
-	 * Default Config Server Port
-	 */
-	public static final int CONFIG_SERVER_DEFAULT_PORT = 9696;
-	
-	/**
-	 * Default Config Server Hostname
-	 */
-	public static final String CONFIG_SERVER_DEFAULT_HOST = "localhost";
-	
-	/**
-	 * Boot the engine
-	 * 
-	 * @param cliArgs command line arguments
-	 */
-	public void boot(String cliArgs[]);
-	
-	/**
-	 * configure the policy engine according to the given properties
-	 * 
-	 * @param properties Policy Engine properties
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 */
-	public void configure(Properties properties)  throws IllegalArgumentException;
-
-	/**
-	 * registers a new Policy Controller with the Policy Engine
-	 * initialized per properties.
-	 * 
-	 * @param controller name
-	 * @param properties properties to initialize the Policy Controller
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted.
-	 * @return the newly instantiated Policy Controller
-	 */
-	public PolicyController createPolicyController(String name, Properties properties)
-		throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * updates the Policy Engine with the given configuration
-	 * 
-	 * @param configuration the configuration
-	 * @return success or failure
-	 * @throws IllegalArgumentException if invalid argument provided
-	 * @throws IllegalStateException if the system is in an invalid state
-	 */
-	public boolean configure(PdpdConfiguration configuration)
-		throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * updates a set of Policy Controllers with configuration information
-	 * 
-	 * @param configuration
-	 * @return
-	 * @throws IllegalArgumentException
-	 * @throws IllegalStateException
-	 */
-	public List<PolicyController> updatePolicyControllers(List<ControllerConfiguration> configuration)
-		throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * updates an already existing Policy Controller with configuration information
-	 * 
-	 * @param configuration configuration
-	 * 
-	 * @return the updated Policy Controller
-	 * @throws IllegalArgumentException in the configuration is invalid
-	 * @throws IllegalStateException if the controller is in a bad state
-	 * @throws Exception any other reason
-	 */
-	public PolicyController updatePolicyController(ControllerConfiguration configuration)
-		throws Exception;
-
-	/**
-	 * removes the Policy Controller identified by its name from the Policy Engine
-	 * 
-	 * @param name name of the Policy Controller
-	 * @return the removed Policy Controller
-	 */
-	public void removePolicyController(String name);
-	
-	/**
-	 * removes a Policy Controller from the Policy Engine
-	 * @param controller the Policy Controller to remove from the Policy Engine
-	 */
-	public void removePolicyController(PolicyController controller);
-
-	/**
-	 * returns a list of the available Policy Controllers
-	 * 
-	 * @return list of Policy Controllers
-	 */
-	public List<PolicyController> getPolicyControllers();
-	
-
-	/**
-	 * get policy controller names
-	 * 
-	 * @return list of controller names
-	 */
-	public List<String> getPolicyControllerIds();
-	
-	/**
-	 * get unmanaged sources
-	 * 
-	 * @return unmanaged sources
-	 */
-	public List<TopicSource> getSources();
-	
-	/**
-	 * get unmanaged sinks
-	 * 
-	 * @return unmanaged sinks
-	 */
-	public List<TopicSink> getSinks();
-	
-	/**
-	 * get unmmanaged http servers list
-	 * @return http servers
-	 */
-	public List<HttpServletServer> getHttpServers();
-	
-	/**
-	 * get properties configuration
-	 * 
-	 * @return properties objects
-	 */
-	public Properties getProperties();
-	
-	/**
-	 * get features attached to the Policy Engine
-	 * @return list of features
-	 */
-	public List<PolicyEngineFeatureAPI> getFeatureProviders();
-	
-	/**
-	 * get named feature attached to the Policy Engine
-	 * @return the feature
-	 */
-	public PolicyEngineFeatureAPI getFeatureProvider(String featureName) 
-			throws IllegalArgumentException;
-	
-	/**
-	 * get features attached to the Policy Engine
-	 * @return list of features
-	 */
-	public List<String> getFeatures();
-	
-	/**
-	 * Attempts the dispatching of an "event" object
-	 * 
-	 * @param topic topic
-	 * @param event the event object to send
-	 * 
-	 * @return true if successful, false if a failure has occurred.
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted (ie. locked or stopped).
-	 */
-	public boolean deliver(String topic, Object event)
-			throws IllegalArgumentException, IllegalStateException;
-	
-	/**
-	 * Attempts the dispatching of an "event" object over communication 
-	 * infrastructure "busType"
-	 * 
-	 * @param eventBus Communication infrastructure identifier
-	 * @param topic topic
-	 * @param event the event object to send
-	 * 
-	 * @return true if successful, false if a failure has occurred.
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted (ie. locked or stopped).
-	 * @throws UnsupportedOperationException when the engine cannot deliver due
-	 *         to the functionality missing (ie. communication infrastructure
-	 *         not supported.
-	 */
-	public boolean deliver(String busType, String topic, Object event)
-			throws IllegalArgumentException, IllegalStateException, 
-			       UnsupportedOperationException;
-	
-	/**
-	 * Attempts the dispatching of an "event" object over communication 
-	 * infrastructure "busType"
-	 * 
-	 * @param eventBus Communication infrastructure enum
-	 * @param topic topic
-	 * @param event the event object to send
-	 * 
-	 * @return true if successful, false if a failure has occurred.
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted (ie. locked or stopped).
-	 * @throws UnsupportedOperationException when the engine cannot deliver due
-	 *         to the functionality missing (ie. communication infrastructure
-	 *         not supported.
-	 */
-	public boolean deliver(CommInfrastructure busType, String topic, Object event)
-			throws IllegalArgumentException, IllegalStateException, 
-			       UnsupportedOperationException;
-	
-	/**
-	 * Attempts delivering of an String over communication 
-	 * infrastructure "busType"
-	 * 
-	 * @param eventBus Communication infrastructure identifier
-	 * @param topic topic
-	 * @param event the event object to send
-	 * 
-	 * @return true if successful, false if a failure has occurred.
-	 * @throws IllegalArgumentException when invalid or insufficient 
-	 *         properties are provided
-	 * @throws IllegalStateException when the engine is in a state where
-	 *         this operation is not permitted (ie. locked or stopped).
-	 * @throws UnsupportedOperationException when the engine cannot deliver due
-	 *         to the functionality missing (ie. communication infrastructure
-	 *         not supported.
-	 */
-	public boolean deliver(CommInfrastructure busType, String topic, 
-			               String event)
-			throws IllegalArgumentException, IllegalStateException, 
-			       UnsupportedOperationException;
-	
-	/**
-	 * Invoked when the host goes into the active state.
-	 */
-	public void activate();
-
-	/**
-	 * Invoked when the host goes into the standby state.
-	 */
-	public void deactivate();
-	
-	/**
-	 * Policy Engine Manager
-	 */
-	public final static PolicyEngine manager = new PolicyEngineManager();
-}
-
-/**
- * Policy Engine Manager Implementation
- */
-class PolicyEngineManager implements PolicyEngine {
-	/**
-	 * logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(PolicyEngineManager.class);  	
-	
-	/**
-	 * Is the Policy Engine running?
-	 */
-	protected boolean alive = false;
-	
-	/**
-	 * Is the engine locked? 
-	 */
-	protected boolean locked = false;	
-	
-	/**
-	 * Properties used to initialize the engine
-	 */
-	protected Properties properties;
-	
-	/**
-	 * Policy Engine Sources
-	 */
-	protected List<? extends TopicSource> sources = new ArrayList<>();
-	
-	/**
-	 * Policy Engine Sinks
-	 */
-	protected List<? extends TopicSink> sinks = new ArrayList<>();
-	
-	/**
-	 * Policy Engine HTTP Servers
-	 */
-	protected List<HttpServletServer> httpServers = new ArrayList<HttpServletServer>();
-	
-	/**
-	 * gson parser to decode configuration requests
-	 */
-	protected Gson decoder = new GsonBuilder().disableHtmlEscaping().create();
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized void boot(String cliArgs[]) {
-		
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeBoot(this, cliArgs))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-boot failure because of {}",  
-				             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		try {
-			PolicyContainer.globalInit(cliArgs);
-		} catch (Exception e) {
-			logger.error("{}: cannot init policy-container because of {}", this, e.getMessage(), e);
-		}
-		
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterBoot(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-boot failure because of {}",  
-				             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized void configure(Properties properties) throws IllegalArgumentException {
-		
-		if (properties == null) {
-			logger.warn("No properties provided");
-			throw new IllegalArgumentException("No properties provided");
-		}
-		
-		/* policy-engine dispatch pre configure hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeConfigure(this, properties))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-configure failure because of {}",  
-				             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		this.properties = properties;
-		
-		try {
-			this.sources = TopicEndpoint.manager.addTopicSources(properties);
-			for (TopicSource source: this.sources) {
-				source.register(this);
-			}
-		} catch (Exception e) {
-			logger.error("{}: add-sources failed", this, e);
-		}
-		
-		try {
-			this.sinks = TopicEndpoint.manager.addTopicSinks(properties);
-		} catch (IllegalArgumentException e) {
-			logger.error("{}: add-sinks failed", this, e);
-		}
-		
-		try {
-			this.httpServers = HttpServletServer.factory.build(properties);
-		} catch (IllegalArgumentException e) {
-			logger.error("{}: add-http-servers failed", this, e);
-		}
-		
-		/* policy-engine dispatch post configure hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterConfigure(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-configure failure because of {}",  
-						     this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized PolicyController createPolicyController(String name, Properties properties) 
-			throws IllegalArgumentException, IllegalStateException {
-		
-		// check if a PROPERTY_CONTROLLER_NAME property is present
-		// if so, override the given name
-		
-		String propertyControllerName = properties.getProperty(PolicyProperties.PROPERTY_CONTROLLER_NAME);
-		if (propertyControllerName != null && !propertyControllerName.isEmpty())  {
-			if (!propertyControllerName.equals(name)) {
-				throw new IllegalStateException("Proposed name (" + name + 
-						                        ") and properties name (" + propertyControllerName + 
-						                        ") don't match");
-			}
-			name = propertyControllerName;
-		}
-		
-		PolicyController controller;
-		for (PolicyControllerFeatureAPI controllerFeature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				controller = controllerFeature.beforeCreate(name, properties);
-				if (controller != null)
-					return controller;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-controller-create failure because of {}",  
-				             this, controllerFeature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		controller = PolicyController.factory.build(name, properties);	
-		if (this.isLocked())
-			controller.lock();
-		
-		// feature hook
-		for (PolicyControllerFeatureAPI controllerFeature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (controllerFeature.afterCreate(controller))
-					return controller;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-controller-create failure because of {}",  
-			                 this, controllerFeature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return controller;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean configure(PdpdConfiguration config) throws IllegalArgumentException, IllegalStateException {
-	
-		if (config == null)
-			throw new IllegalArgumentException("No configuration provided");
-		
-		String entity = config.getEntity();
-		
-		switch (entity) {
-		case PdpdConfiguration.CONFIG_ENTITY_CONTROLLER:
-			/* only this one supported for now */
-			List<ControllerConfiguration> configControllers = config.getControllers();
-			if (configControllers == null || configControllers.isEmpty()) {
-				if (logger.isInfoEnabled())
-					logger.info("No controller configuration provided: " + config);
-				return false;
-			}
-			List<PolicyController> policyControllers = this.updatePolicyControllers(config.getControllers());
-			if (policyControllers == null || policyControllers.isEmpty())
-				return false;
-			else if (policyControllers.size() == configControllers.size())
-				return true;
-			
-			return false;
-		default:
-			String msg = "Configuration Entity is not supported: " + entity;
-			logger.warn(msg);
-			throw new IllegalArgumentException(msg);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<PolicyController> updatePolicyControllers(List<ControllerConfiguration> configControllers)
-			throws IllegalArgumentException, IllegalStateException {
-		
-		List<PolicyController> policyControllers = new ArrayList<PolicyController>();
-		if (configControllers == null || configControllers.isEmpty()) {
-			if (logger.isInfoEnabled())
-				logger.info("No controller configuration provided: " + configControllers);
-			return policyControllers;
-		}
-		
-		for (ControllerConfiguration configController: configControllers) {
-			try {
-				PolicyController policyController = this.updatePolicyController(configController);
-				policyControllers.add(policyController);
-			} catch (Exception e) {
-				logger.error("{}: cannot update-policy-controllers because of {}", this, e.getMessage(), e);
-			}
-		}
-		
-		return policyControllers;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyController updatePolicyController(ControllerConfiguration configController) 
-		   throws Exception {
-		
-		if (configController == null) 
-			throw new IllegalArgumentException("No controller configuration has been provided");
-		
-		String controllerName = configController.getName();	
-		if (controllerName == null || controllerName.isEmpty()) {
-			logger.warn("controller-name  must be provided");
-			throw new IllegalArgumentException("No controller configuration has been provided");
-		}
-		
-		PolicyController policyController = null;
-		try {		
-			String operation = configController.getOperation();
-			if (operation == null || operation.isEmpty()) {
-				logger.warn("operation must be provided");
-				throw new IllegalArgumentException("operation must be provided");
-			}
-			
-			try {
-				policyController = PolicyController.factory.get(controllerName);
-			} catch (IllegalArgumentException e) {
-				// not found
-				logger.warn("Policy Controller " + controllerName + " not found");
-			}
-			
-			if (policyController == null) {
-				
-				if (operation.equalsIgnoreCase(ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_LOCK) ||
-					operation.equalsIgnoreCase(ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_UNLOCK)) {
-					throw new IllegalArgumentException(controllerName + " is not available for operation " + operation);
-				}
-				
-				/* Recovery case */
-				
-				logger.warn("controller " + controllerName + " does not exist.  " +
-				            "Attempting recovery from disk");	
-				
-				Properties properties = 
-						SystemPersistence.manager.getControllerProperties(controllerName);
-				
-				/* 
-				 * returned properties cannot be null (per implementation) 
-				 * assert (properties != null)
-				 */
-				
-				if (properties == null) {
-					throw new IllegalArgumentException(controllerName + " is invalid");
-				}
-				
-				logger.warn("controller " + controllerName + " being recovered. " +
-			                "Reset controller's bad maven coordinates to brainless");
-				
-				/* 
-				 * try to bring up bad controller in brainless mode,
-				 * after having it working, apply the new create/update operation.
-				 */
-				properties.setProperty(PolicyProperties.RULES_GROUPID, DroolsController.NO_GROUP_ID);
-				properties.setProperty(PolicyProperties.RULES_ARTIFACTID, DroolsController.NO_ARTIFACT_ID);
-				properties.setProperty(PolicyProperties.RULES_VERSION, DroolsController.NO_VERSION);
-				
-				policyController = PolicyEngine.manager.createPolicyController(controllerName, properties);
-				
-				/* fall through to do brain update operation*/
-			}
-			
-			switch (operation) {
-			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_CREATE:
-				PolicyController.factory.patch(policyController, configController.getDrools());
-				break;
-			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_UPDATE:
-				policyController.unlock();
-				PolicyController.factory.patch(policyController, configController.getDrools());
-				break;
-			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_LOCK:
-				policyController.lock();
-				break;
-			case ControllerConfiguration.CONFIG_CONTROLLER_OPERATION_UNLOCK:
-				policyController.unlock();
-				break;
-			default:
-				String msg = "Controller Operation Configuration is not supported: " + 
-		                     operation + " for " + controllerName;
-				logger.warn(msg);
-				throw new IllegalArgumentException(msg);
-			}
-			
-			return policyController;
-		} catch (Exception e) {
-			logger.error("{}: cannot update-policy-controller because of {}", this, e.getMessage(), e);
-			throw e;
-		} catch (LinkageError e) {
-			logger.error("{}: cannot update-policy-controllers (rules) because of {}", this, e.getMessage(), e);
-			throw new IllegalStateException(e);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean start() throws IllegalStateException {
-		
-		/* policy-engine dispatch pre start hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeStart(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-start failure because of {}", 
-					         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-			
-		boolean success = true;
-		if (this.locked)
-			throw new IllegalStateException("Engine is locked");
-		
-		this.alive = true;
-
-		/* Start Policy Engine exclusively-owned (unmanaged) http servers */
-		
-		for (HttpServletServer httpServer: this.httpServers) {
-			try {
-				if (!httpServer.waitedStart(5 * 1000L))
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start http-server {} because of {}", this, 
-						     httpServer, e.getMessage(), e);
-			}
-		}
-		
-		/* Start Policy Engine exclusively-owned (unmanaged) sources */
-		
-		for (TopicSource source: this.sources) {
-			try {
-				if (!source.start())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start topic-source {} because of {}", this, 
-					         source, e.getMessage(), e);
-			}
-		}
-		
-		/* Start Policy Engine owned (unmanaged) sinks */
-		
-		for (TopicSink sink: this.sinks) {
-			try {
-				if (!sink.start())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start topic-sink {} because of {}", this, 
-				             sink, e.getMessage(), e);
-			}
-		}
-		
-		/* Start Policy Controllers */
-		
-		List<PolicyController> controllers = PolicyController.factory.inventory();
-		for (PolicyController controller : controllers) {
-			try {
-				if (!controller.start())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start policy-controller {} because of {}", this, 
-			                 controller, e.getMessage(), e);
-				success = false;
-			}
-		}
-		
-		/* Start managed Topic Endpoints */
-		
-		try {
-			if (!TopicEndpoint.manager.start())
-				success = false;			
-		} catch (IllegalStateException e) {
-			logger.warn("{}: Topic Endpoint Manager is in an invalid state because of {}", this, e.getMessage(), e);			
-		}
-		
-		
-		// Start the JMX listener
-		
-		PdpJmxListener.start();
-		
-		/* policy-engine dispatch after start hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterStart(this))
-					return success;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-start failure because of {}",  
-					         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean stop() {
-		
-		/* policy-engine dispatch pre stop hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeStop(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-stop failure because of {}", 
-					     this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		/* stop regardless of the lock state */
-		
-		boolean success = true;
-		if (!this.alive)
-			return true;
-		
-		this.alive = false;			
-	
-		List<PolicyController> controllers = PolicyController.factory.inventory();
-		for (PolicyController controller : controllers) {
-			try {
-				if (!controller.stop())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot stop policy-controller {} because of {}", this, 
-		                     controller, e.getMessage(), e);
-				success = false;
-			}
-		}
-		
-		/* Stop Policy Engine owned (unmanaged) sources */
-		for (TopicSource source: this.sources) {
-			try {
-				if (!source.stop())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start topic-source {} because of {}", this, 
-		                     source, e.getMessage(), e);
-			}
-		}
-		
-		/* Stop Policy Engine owned (unmanaged) sinks */
-		for (TopicSink sink: this.sinks) {
-			try {
-				if (!sink.stop())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start topic-sink {} because of {}", this, 
-	                         sink, e.getMessage(), e);
-			}
-		}
-		
-		/* stop all managed topics sources and sinks */
-		if (!TopicEndpoint.manager.stop())
-			success = false;
-		
-		/* stop all unmanaged http servers */
-		for (HttpServletServer httpServer: this.httpServers) {
-			try {
-				if (!httpServer.stop())
-					success = false;
-			} catch (Exception e) {
-				logger.error("{}: cannot start http-server {} because of {}", this, 
-						     httpServer, e.getMessage(), e);
-			}
-		}		
-		
-		/* policy-engine dispatch pre stop hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterStop(this))
-					return success;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-stop failure because of {}",  
-					         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized void shutdown() throws IllegalStateException {
-		
-		/* policy-engine dispatch pre shutdown hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeShutdown(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-shutdown failure because of {}", 
-					         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-
-		this.alive = false;			
-	
-		/* Shutdown Policy Engine owned (unmanaged) sources */
-		for (TopicSource source: this.sources) {
-			try {
-				source.shutdown();
-			} catch (Exception e) {
-				logger.error("{}: cannot shutdown topic-source {} because of {}", this, 
-	                         source, e.getMessage(), e);
-			}
-		}
-		
-		/* Shutdown Policy Engine owned (unmanaged) sinks */
-		for (TopicSink sink: this.sinks) {
-			try {
-				sink.shutdown();
-			} catch (Exception e) {
-				logger.error("{}: cannot shutdown topic-sink {} because of {}", this, 
-                             sink, e.getMessage(), e);
-			}
-		}
-		
-		/* Shutdown managed resources */
-		PolicyController.factory.shutdown();
-		TopicEndpoint.manager.shutdown();
-		HttpServletServer.factory.destroy();
-		
-		// Stop the JMX listener
-		
-		PdpJmxListener.stop();
-		
-		/* policy-engine dispatch post shutdown hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterShutdown(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-shutdown failure because of {}",  
-				         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-
-		
-		new Thread(new Runnable() {
-		    @Override
-		    public void run() {
-		    	try {
-					Thread.sleep(5000L);
-				} catch (InterruptedException e) {
-					logger.warn("{}: interrupted-exception while shutting down management server: ", this);
-				}		    	
-				
-				/* shutdown all unmanaged http servers */
-				for (HttpServletServer httpServer: getHttpServers()) {
-					try {
-						httpServer.shutdown();
-					} catch (Exception e) {
-						logger.error("{}: cannot shutdown http-server {} because of {}", this, 
-								     httpServer, e.getMessage(), e);
-					}
-				} 
-		    	
-		    	try {
-					Thread.sleep(5000L);
-				} catch (InterruptedException e) {
-					logger.warn("{}: interrupted-exception while shutting down management server: ", this);
-				}
-		    	
-		    	System.exit(0);
-		    }		    
-		}).start();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean isAlive() {
-		return this.alive;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean lock() {
-		
-		/* policy-engine dispatch pre lock hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeLock(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-lock failure because of {}",  
-				         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		if (this.locked)
-			return true;
-		
-		this.locked = true;			
-	
-		boolean success = true;
-		List<PolicyController> controllers = PolicyController.factory.inventory();
-		for (PolicyController controller : controllers) {
-			try {
-				success = controller.lock() && success;
-			} catch (Exception e) {
-				logger.error("{}: cannot lock policy-controller {} because of {}", this, 
-						     controller, e.getMessage(), e);
-				success = false;
-			}
-		}
-		
-		success = TopicEndpoint.manager.lock() && success;	
-			
-		/* policy-engine dispatch post lock hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterLock(this))
-					return success;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-lock failure because of {}",  
-				         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean unlock() {
-		
-		/* policy-engine dispatch pre unlock hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeUnlock(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-unlock failure because of {}",  
-				         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		if (!this.locked)
-			return true;
-		
-		this.locked = false;			
-		
-		boolean success = true;
-		List<PolicyController> controllers = PolicyController.factory.inventory();
-		for (PolicyController controller : controllers) {
-			try {
-				success = controller.unlock() && success;
-			} catch (Exception e) {
-				logger.error("{}: cannot unlock policy-controller {} because of {}", this, 
-					         controller, e.getMessage(), e);
-				success = false;
-			}
-		}
-		
-		success = TopicEndpoint.manager.unlock() && success;
-		
-		/* policy-engine dispatch after unlock hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterUnlock(this))
-					return success;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-unlock failure because of {}",  
-				         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized boolean isLocked() {
-		return this.locked;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void removePolicyController(String name) {
-		PolicyController.factory.destroy(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void removePolicyController(PolicyController controller) {
-		PolicyController.factory.destroy(controller);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<PolicyController> getPolicyControllers() {
-		return PolicyController.factory.inventory();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonProperty("controllers")
-	@Override
-	public List<String> getPolicyControllerIds() {
-		List<String> controllerNames = new ArrayList<String>();
-		for (PolicyController controller: PolicyController.factory.inventory()) {
-			controllerNames.add(controller.getName());
-		}
-		return controllerNames;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	@JsonIgnore
-	public Properties getProperties() {
-		return this.properties;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<TopicSource> getSources() {
-		return (List<TopicSource>) this.sources;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<TopicSink> getSinks() {
-		return (List<TopicSink>) this.sinks;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<HttpServletServer> getHttpServers() {
-		return this.httpServers;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<String> getFeatures() {
-		List<String> features = new ArrayList<String>();
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			features.add(feature.getName());
-		}
-		return features;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@JsonIgnore
-	@Override
-	public List<PolicyEngineFeatureAPI> getFeatureProviders() {
-		return PolicyEngineFeatureAPI.providers.getList();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public PolicyEngineFeatureAPI getFeatureProvider(String featureName) throws IllegalArgumentException {
-		if (featureName == null || featureName.isEmpty())
-			throw new IllegalArgumentException("A feature name must be provided");
-		
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			if (feature.getName().equals(featureName))
-				return feature;
-		}
-		
-		throw new IllegalArgumentException("Invalid Feature Name: " + featureName);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void onTopicEvent(CommInfrastructure commType, String topic, String event) {
-		/* configuration request */
-		try {
-			PdpdConfiguration configuration = this.decoder.fromJson(event, PdpdConfiguration.class);
-			this.configure(configuration);
-		} catch (Exception e) {
-			logger.error("{}: configuration-error due to {} because of {}", 
-					     this, event, e.getMessage(), e);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException {
-		
-		/*
-		 * Note this entry point is usually from the DRL
-		 */
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		if (event == null)
-			throw new IllegalArgumentException("Invalid Event");
-			
-		if (!this.isAlive())
-			throw new IllegalStateException("Policy Engine is stopped");
-		
-		if (this.isLocked())
-			throw new IllegalStateException("Policy Engine is locked");
-		
-		List<? extends TopicSink> sinks = 
-				TopicEndpoint.manager.getTopicSinks(topic);
-		if (sinks == null || sinks.isEmpty() || sinks.size() > 1)
-			throw new IllegalStateException
-				("Cannot ensure correct delivery on topic " + topic + ": " + sinks);		
-
-		return this.deliver(sinks.get(0).getTopicCommInfrastructure(), 
-				            topic, event);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(String busType, String topic, Object event) 
-			throws IllegalArgumentException, IllegalStateException,
-		       UnsupportedOperationException {
-		
-		/*
-		 * Note this entry point is usually from the DRL (one of the reasons
-		 * busType is String.
-		 */
-		
-		if (busType == null || busType.isEmpty())
-			throw new IllegalArgumentException
-				("Invalid Communication Infrastructure");
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		if (event == null)
-			throw new IllegalArgumentException("Invalid Event");
-		
-		boolean valid = false;
-		for (Topic.CommInfrastructure comm: Topic.CommInfrastructure.values()) {
-			if (comm.name().equals(busType)) {
-				valid = true;
-			}
-		}
-		
-		if (!valid)
-			throw new IllegalArgumentException
-				("Invalid Communication Infrastructure: " + busType);
-		
-		
-		if (!this.isAlive())
-			throw new IllegalStateException("Policy Engine is stopped");
-		
-		if (this.isLocked())
-			throw new IllegalStateException("Policy Engine is locked");
-		
-
-		return this.deliver(Topic.CommInfrastructure.valueOf(busType), 
-				            topic, event);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(Topic.CommInfrastructure busType, 
-			               String topic, Object event) 
-		throws IllegalArgumentException, IllegalStateException,
-		       UnsupportedOperationException {
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		if (event == null)
-			throw new IllegalArgumentException("Invalid Event");
-		
-		if (!this.isAlive())
-			throw new IllegalStateException("Policy Engine is stopped");
-		
-		if (this.isLocked())
-			throw new IllegalStateException("Policy Engine is locked");
-		
-		/* Try to send through the controller, this is the
-		 * preferred way, since it may want to apply additional
-		 * processing
-		 */
-		try {
-			DroolsController droolsController = 
-					EventProtocolCoder.manager.getDroolsController(topic, event);
-			PolicyController controller = PolicyController.factory.get(droolsController);
-			if (controller != null)
-				return controller.deliver(busType, topic, event);
-		} catch (Exception e) {
-			logger.warn("{}: cannot find policy-controller to deliver {} over {}:{} because of {}", 
-					    this, event, busType, topic, e.getMessage(), e);
-			
-			/* continue (try without routing through the controller) */
-		}
-		
-		/*
-		 * cannot route through the controller, send directly through
-		 * the topic sink
-		 */
-		try {			
-			String json = EventProtocolCoder.manager.encode(topic, event);
-			return this.deliver(busType, topic, json);
-
-		} catch (Exception e) {
-			logger.warn("{}: cannot deliver {} over {}:{} because of {}", 
-				        this, event, busType, topic, e.getMessage(), e);
-			throw e;
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(Topic.CommInfrastructure busType, 
-			               String topic, String event) 
-		throws IllegalArgumentException, IllegalStateException,
-		       UnsupportedOperationException {
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		if (event == null || event.isEmpty())
-			throw new IllegalArgumentException("Invalid Event");
-		
-		if (!this.isAlive())
-			throw new IllegalStateException("Policy Engine is stopped");
-		
-		if (this.isLocked())
-			throw new IllegalStateException("Policy Engine is locked");
-		
-		try {
-			TopicSink sink = 
-					TopicEndpoint.manager.getTopicSink
-						(busType, topic);
-			
-			if (sink == null)
-				throw new IllegalStateException("Inconsistent State: " + this);
-			
-			return sink.send(event);
-
-		} catch (Exception e) {
-			logger.warn("{}: cannot deliver {} over {}:{} because of {}", 
-			            this, event, busType, topic, e.getMessage(), e);
-			throw e;
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized void activate() {
-		
-		/* policy-engine dispatch pre activate hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeActivate(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-activate failure because of {}",  
-				             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-
-		// activate 'policy-management'
-		for (PolicyController policyController : getPolicyControllers()) {
-			try {
-				policyController.unlock();
-				policyController.start();
-			} catch (Exception e) {
-				logger.error("{}: cannot activate of policy-controller {} because of {}", 
-				             this, policyController,e.getMessage(), e);
-			} catch (LinkageError e) {
-				logger.error("{}: cannot activate (rules compilation) of policy-controller {} because of {}", 
-			                 this, policyController,e.getMessage(), e);
-			}
-		}
-		
-		this.unlock();
-		
-		/* policy-engine dispatch post activate hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterActivate(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-activate failure because of {}",  
-				             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public synchronized void deactivate() {
-		
-		/* policy-engine dispatch pre deactivate hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeDeactivate(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-deactivate failure because of {}",  
-				              this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		this.lock();
-		
-		for (PolicyController policyController : getPolicyControllers()) {
-			try { 
-				policyController.stop();
-			} catch (Exception e) {
-				logger.error("{}: cannot deactivate (stop) policy-controller {} because of {}", 
-			                 this, policyController, e.getMessage(), e);
-			} catch (LinkageError e) {
-				logger.error("{}: cannot deactivate (stop) policy-controller {} because of {}", 
-		                     this, policyController, e.getMessage(), e);
-			}
-		}
-		
-		/* policy-engine dispatch post deactivate hook */
-		for (PolicyEngineFeatureAPI feature : PolicyEngineFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterDeactivate(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-deactivate failure because of {}",  
-				             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("PolicyEngineManager [alive=").append(alive).append(", locked=").append(locked).append("]");
-		return builder.toString();
-	}
-	
-}
-
-
diff --git a/policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java b/policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java
deleted file mode 100644
index f0491624..00000000
--- a/policy-management/src/main/java/org/openecomp/policy/drools/system/internal/AggregatedPolicyController.java
+++ /dev/null
@@ -1,626 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.system.internal;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.openecomp.policy.drools.controller.DroolsController;
-import org.openecomp.policy.drools.event.comm.Topic;
-import org.openecomp.policy.drools.event.comm.TopicEndpoint;
-import org.openecomp.policy.drools.event.comm.TopicListener;
-import org.openecomp.policy.drools.event.comm.TopicSink;
-import org.openecomp.policy.drools.event.comm.TopicSource;
-import org.openecomp.policy.drools.features.PolicyControllerFeatureAPI;
-import org.openecomp.policy.drools.persistence.SystemPersistence;
-import org.openecomp.policy.drools.properties.PolicyProperties;
-import org.openecomp.policy.drools.protocol.configuration.DroolsConfiguration;
-import org.openecomp.policy.drools.system.PolicyController;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * This implementation of the Policy Controller merely aggregates and tracks for
- * management purposes all underlying resources that this controller depends upon.
- */
-public class AggregatedPolicyController implements PolicyController, 
-                                                   TopicListener {
-	
-	/**
-	 * Logger
-	 */
-	private static Logger logger = LoggerFactory.getLogger(AggregatedPolicyController.class); 
-	
-	/**
-	 * identifier for this policy controller
-	 */
-	protected final String name;
-	
-	/**
-	 * Abstracted Event Sources List regardless communication
-	 * technology
-	 */
-	protected final List<? extends TopicSource> sources;
-	
-	/**
-	 * Abstracted Event Sinks List regardless communication
-	 * technology
-	 */
-	protected final List<? extends TopicSink> sinks;
-	
-	/**
-	 * Mapping topics to sinks
-	 */
-	@JsonIgnore
-	protected final HashMap<String, TopicSink> topic2Sinks =
-		new HashMap<String, TopicSink>();
-	
-	/**
-	 * Is this Policy Controller running (alive) ?
-	 * reflects invocation of start()/stop() only
-	 */
-	protected volatile boolean alive;
-	
-	/**
-	 * Is this Policy Controller locked ?
-	 * reflects if i/o controller related operations and start 
-	 * are permitted,
-	 * more specifically: start(), deliver() and onTopicEvent().
-	 * It does not affect the ability to stop the
-	 * underlying drools infrastructure 
-	 */
-	protected volatile boolean locked;
-	
-	/**
-	 * Policy Drools Controller
-	 */
-	protected volatile DroolsController droolsController;
-	
-	/**
-	 * Properties used to initialize controller
-	 */
-	protected final Properties properties;
-	
-	/**
-	 * Constructor version mainly used for bootstrapping at initialization time
-	 * a policy engine controller
-	 * 
-	 * @param name controller name
-	 * @param properties
-	 * 
-	 * @throws IllegalArgumentException when invalid arguments are provided
-	 */
-	public AggregatedPolicyController(String name, Properties properties) 
-			throws IllegalArgumentException {
-		
-		this.name = name;
-		
-		/*
-		 * 1. Register read topics with network infrastructure (ueb, dmaap, rest)
-		 * 2. Register write topics with network infrastructure (ueb, dmaap, rest)
-		 * 3. Register with drools infrastructure
-		 */
-		
-		// Create/Reuse Readers/Writers for all event sources endpoints
-		
-		this.sources = TopicEndpoint.manager.addTopicSources(properties);
-		this.sinks = TopicEndpoint.manager.addTopicSinks(properties);
-		
-		initDrools(properties);		
-		initSinks();		
-		
-		/* persist new properties */
-		SystemPersistence.manager.storeController(name, properties);	
-		this.properties = properties;
-	}
-	
-	/**
-	 * initialize drools layer
-	 * @throws IllegalArgumentException if invalid parameters are passed in
-	 */
-	protected void initDrools(Properties properties) throws IllegalArgumentException {
-		try {
-			// Register with drools infrastructure
-			this.droolsController = DroolsController.factory.build(properties, sources, sinks);
-		} catch (Exception | LinkageError e) {
-			logger.error("{}: cannot init-drools because of {}", this, e.getMessage(), e);
-			throw new IllegalArgumentException(e);
-		}
-	}
-	
-	/**
-	 * initialize sinks
-	 * @throws IllegalArgumentException if invalid parameters are passed in
-	 */
-	protected void initSinks() throws IllegalArgumentException {
-		this.topic2Sinks.clear();
-		for (TopicSink sink: sinks) {
-			this.topic2Sinks.put(sink.getTopic(), sink);
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean updateDrools(DroolsConfiguration newDroolsConfiguration) {
-		
-		DroolsConfiguration oldDroolsConfiguration =
-				new DroolsConfiguration(this.droolsController.getArtifactId(),
-										this.droolsController.getGroupId(), 
-				                        this.droolsController.getVersion());
-		
-		if (oldDroolsConfiguration.getGroupId().equalsIgnoreCase(newDroolsConfiguration.getGroupId()) &&
-			oldDroolsConfiguration.getArtifactId().equalsIgnoreCase(newDroolsConfiguration.getArtifactId()) &&
-			oldDroolsConfiguration.getVersion().equalsIgnoreCase(newDroolsConfiguration.getVersion())) {
-			logger.warn("{}: cannot update-drools: identical configuration {} vs {}", 
-					    this, oldDroolsConfiguration, newDroolsConfiguration);
-			return true;
-		}
-		
-		try {
-			/* Drools Controller created, update initialization properties for restarts */
-			
-			this.properties.setProperty(PolicyProperties.RULES_GROUPID, newDroolsConfiguration.getGroupId());
-			this.properties.setProperty(PolicyProperties.RULES_ARTIFACTID, newDroolsConfiguration.getArtifactId());
-			this.properties.setProperty(PolicyProperties.RULES_VERSION, newDroolsConfiguration.getVersion());
-					
-			SystemPersistence.manager.storeController(name, this.properties);
-			
-			this.initDrools(this.properties);
-			
-			/* set drools controller to current locked status */
-			
-			if (this.isLocked())
-				this.droolsController.lock();
-			else
-				this.droolsController.unlock();
-			
-			/* set drools controller to current alive status */
-			
-			if (this.isAlive())
-				this.droolsController.start();
-			else
-				this.droolsController.stop();
-			
-		} catch (IllegalArgumentException e) {
-			logger.error("{}: cannot update-drools because of {}", this, e.getMessage(), e);
-			return false;
-		}	
-		
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getName() {
-		return this.name;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean start() throws IllegalStateException {		
-		logger.info("{}: start", this);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeStart(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-start failure because of {}",  
-			                 this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		if (this.isLocked())
-			throw new IllegalStateException("Policy Controller " + name  + " is locked");
-
-		synchronized(this) {
-			if (this.alive)
-				return true;
-			
-			this.alive = true;
-		}
-
-		boolean success = this.droolsController.start();
-		
-		// register for events
-		
-		for (TopicSource source: sources) {
-			source.register(this);
-		}
-		
-		for (TopicSink sink: sinks) {
-			try {
-				sink.start();
-			} catch (Exception e) {
-				logger.error("{}: cannot start {} because of {}",  
-		                     this, sink, e.getMessage(), e);
-			}
-		}
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterStart(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-start failure because of {}",  
-		                     this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean stop() {
-		logger.info("{}: stop", this);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeStop(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-stop failure because of {}",  
-		                     this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		/* stop regardless locked state */
-		
-		synchronized(this) {
-			if (!this.alive)
-				return true;
-			
-			this.alive = false;
-		}
-		
-		// 1. Stop registration
-		
-		for (TopicSource source: sources) {
-			source.unregister(this);
-		}
-		
-		boolean success = this.droolsController.stop();
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterStop(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-stop failure because of {}",  
-	                         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void shutdown() throws IllegalStateException {
-		logger.info("{}: shutdown", this);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeShutdown(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-shutdown failure because of {}",  
-	                         this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		this.stop();
-		
-		DroolsController.factory.shutdown(this.droolsController);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterShutdown(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-shutdown failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void halt() throws IllegalStateException {
-		logger.info("{}: halt", this);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeHalt(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-halt failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		this.stop();	
-		DroolsController.factory.destroy(this.droolsController);
-		SystemPersistence.manager.deleteController(this.name);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterHalt(this))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-halt failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void onTopicEvent(Topic.CommInfrastructure commType, 
-			                    String topic, String event) {
-
-		if (logger.isDebugEnabled())
-			logger.debug("{}: event offered from {}:{}: {}", this, commType, topic, event);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeOffer(this, commType, topic, event))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-offer failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		if (this.locked)
-			return;
-		
-		if (!this.alive)
-			return;
-		
-		boolean success = this.droolsController.offer(topic, event);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterOffer(this, commType, topic, event, success))
-					return;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-offer failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean deliver(Topic.CommInfrastructure commType, 
-			               String topic, Object event)
-		throws IllegalArgumentException, IllegalStateException,
-               UnsupportedOperationException {	
-		
-		if (logger.isDebugEnabled())
-			logger.debug("{}: deliver event to {}:{}: {}", this, commType, topic, event);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeDeliver(this, commType, topic, event))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-deliver failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		if (topic == null || topic.isEmpty())
-			throw new IllegalArgumentException("Invalid Topic");
-		
-		if (event == null)
-			throw new IllegalArgumentException("Invalid Event");
-		
-		if (!this.isAlive())
-			throw new IllegalStateException("Policy Engine is stopped");
-		
-		if (this.isLocked())
-			throw new IllegalStateException("Policy Engine is locked");
-		
-		if (!this.topic2Sinks.containsKey(topic)) {
-			logger.warn("{}: cannot deliver event because the sink {}:{} is not registered: {}", 
-					     this, commType, topic, event);
-			throw new IllegalArgumentException("Unsuported topic " + topic + " for delivery");
-		}
-		
-		boolean success = this.droolsController.deliver(this.topic2Sinks.get(topic), event);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterDeliver(this, commType, topic, event, success))
-					return success;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-deliver failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isAlive() {
-		return this.alive;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean lock() {
-		logger.info("{}: lock", this);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeLock(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-lock failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		synchronized(this) {
-			if (this.locked)
-				return true;
-			
-			this.locked = true;
-		}
-		
-		// it does not affect associated sources/sinks, they are
-		// autonomous entities
-		
-		boolean success = this.droolsController.lock();
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterLock(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-lock failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean unlock() {
-		
-		logger.info("{}: unlock", this);
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.beforeUnlock(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} before-unlock failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		synchronized(this) {
-			if (!this.locked)
-				return true;
-			
-			this.locked = false;
-		}
-		
-		boolean success = this.droolsController.unlock();
-		
-		for (PolicyControllerFeatureAPI feature : PolicyControllerFeatureAPI.providers.getList()) {
-			try {
-				if (feature.afterUnlock(this))
-					return true;
-			} catch (Exception e) {
-				logger.error("{}: feature {} after-unlock failure because of {}",  
-                             this, feature.getClass().getName(), e.getMessage(), e);
-			}
-		}
-		
-		return success;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean isLocked() {
-		return this.locked;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSource> getTopicSources() {
-		return this.sources;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public List<? extends TopicSink> getTopicSinks() {
-		return this.sinks;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public DroolsController getDrools() {
-		return this.droolsController;
-	}
-	
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	@JsonIgnore
-	public Properties getProperties() {
-		return this.properties;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("AggregatedPolicyController [name=").append(name).append(", alive=").append(alive).append(", locked=").append(locked)
-				.append(", droolsController=").append(droolsController).append("]");
-		return builder.toString();
-	}
-
-}
-
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index 7b14644f..e21562f7 100644
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -51,7 +51,7 @@
 #        │   │   ├── logback-eelf.xml
 #        │   └── lib/
 #        │   │   └── dependencies/
-#        │   │   │   └── ECOMP-Logging-1.1.0-SNAPSHOT.jar
+#        │   │   │   └── ONAP-Logging-1.1.0-SNAPSHOT.jar
 #        │   │   │   └── eelf-core-1.0.0.jar
 #        │   │   └── feature/
 #        │   │       └── feature-eelf-1.1.0-SNAPSHOT.jar
diff --git a/policy-management/src/main/server-gen/bin/policy-management-controller b/policy-management/src/main/server-gen/bin/policy-management-controller
index d77a870c..a9f8ce0d 100644
--- a/policy-management/src/main/server-gen/bin/policy-management-controller
+++ b/policy-management/src/main/server-gen/bin/policy-management-controller
@@ -22,7 +22,7 @@
 
 SNAME="Policy Management"
 PNAME=policy-management
-CLASS=org.openecomp.policy.drools.system.Main
+CLASS=org.onap.policy.drools.system.Main
 
 
 function start() {
diff --git a/policy-management/src/main/server/config/policy-engine.properties b/policy-management/src/main/server/config/policy-engine.properties
index dbaf72af..70a5dcca 100644
--- a/policy-management/src/main/server/config/policy-engine.properties
+++ b/policy-management/src/main/server/config/policy-engine.properties
@@ -42,6 +42,6 @@ http.server.services.CONFIG.host=${{ENGINE_MANAGEMENT_HOST}}
 http.server.services.CONFIG.port=${{ENGINE_MANAGEMENT_PORT}}
 http.server.services.CONFIG.userName=${{ENGINE_MANAGEMENT_USER}}
 http.server.services.CONFIG.password=${{ENGINE_MANAGEMENT_PASSWORD}}
-http.server.services.CONFIG.restPackages=org.openecomp.policy.drools.server.restful
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
 http.server.services.CONFIG.managed=false
 http.server.services.CONFIG.swagger=true
diff --git a/policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java b/policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java
new file mode 100644
index 00000000..a9b916b1
--- /dev/null
+++ b/policy-management/src/test/java/org/onap/policy/drools/system/test/PolicyEngineTest.java
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-management
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.policy.drools.system.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Properties;
+
+import javax.ws.rs.core.Response;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.policy.drools.http.client.HttpClient;
+import org.onap.policy.drools.http.server.HttpServletServer;
+import org.onap.policy.drools.system.PolicyController;
+import org.onap.policy.drools.system.PolicyEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * PolicyEngine unit tests
+ */
+public class PolicyEngineTest {
+	private static Logger logger = LoggerFactory.getLogger(PolicyEngineTest.class);
+	
+	@BeforeClass
+	public static void startUp() {
+		logger.info("----- TEST: startUp() ---------");
+		
+		Properties engineProperties = new Properties();
+		engineProperties.put("http.server.services", "CONFIG");
+		engineProperties.put("http.server.services.CONFIG.host", "0.0.0.0");
+		engineProperties.put("http.server.services.CONFIG.port", "9696");
+		engineProperties.put("http.server.services.CONFIG.restPackages", "org.onap.policy.drools.server.restful");
+		
+		assertFalse(PolicyEngine.manager.isAlive());
+		
+		PolicyEngine.manager.configure(engineProperties);		
+		assertFalse(PolicyEngine.manager.isAlive());
+		
+		PolicyEngine.manager.start();
+		assertTrue(PolicyEngine.manager.isAlive());
+		assertFalse(PolicyEngine.manager.isLocked());
+		assertTrue(HttpServletServer.factory.get(9696).isAlive());
+	}
+	
+	@AfterClass
+	public static void tearDown() {	
+		logger.info("----- TEST: tearDown() ---------");
+		
+		PolicyEngine.manager.stop();
+		assertFalse(PolicyEngine.manager.isAlive());
+	}
+	
+	@Test
+	public void addController() throws Exception {
+		logger.info("----- TEST: addController() ---------");
+		
+		Properties controllerProperties = new Properties();
+		controllerProperties.put("controller.name", "unnamed");
+		
+		PolicyEngine.manager.createPolicyController("unnamed", controllerProperties);
+		assertTrue(PolicyController.factory.inventory().size() == 1);
+		
+		HttpClient client = HttpClient.factory.build("telemetry", false, false, 
+                                                     "localhost", 9696, "policy/pdp", 
+                                                      null, null, false);
+		Response response = client.get("engine");
+		Object body = HttpClient.getBody(response, Object.class);
+		logger.info("policy-engine: {}", body);
+		
+		assertTrue(response.getStatus() == 200);
+		
+		PolicyController testController = PolicyController.factory.get("unnamed");
+		assertFalse(testController.getDrools().isAlive());
+		assertFalse(testController.getDrools().isLocked());
+	}
+
+}
diff --git a/policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java b/policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java
deleted file mode 100644
index 15a27767..00000000
--- a/policy-management/src/test/java/org/openecomp/policy/drools/system/test/PolicyEngineTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-management
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.drools.system.test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Properties;
-
-import javax.ws.rs.core.Response;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openecomp.policy.drools.http.client.HttpClient;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.system.PolicyController;
-import org.openecomp.policy.drools.system.PolicyEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * PolicyEngine unit tests
- */
-public class PolicyEngineTest {
-	private static Logger logger = LoggerFactory.getLogger(PolicyEngineTest.class);
-	
-	@BeforeClass
-	public static void startUp() {
-		logger.info("----- TEST: startUp() ---------");
-		
-		Properties engineProperties = new Properties();
-		engineProperties.put("http.server.services", "CONFIG");
-		engineProperties.put("http.server.services.CONFIG.host", "0.0.0.0");
-		engineProperties.put("http.server.services.CONFIG.port", "9696");
-		engineProperties.put("http.server.services.CONFIG.restPackages", "org.openecomp.policy.drools.server.restful");
-		
-		assertFalse(PolicyEngine.manager.isAlive());
-		
-		PolicyEngine.manager.configure(engineProperties);		
-		assertFalse(PolicyEngine.manager.isAlive());
-		
-		PolicyEngine.manager.start();
-		assertTrue(PolicyEngine.manager.isAlive());
-		assertFalse(PolicyEngine.manager.isLocked());
-		assertTrue(HttpServletServer.factory.get(9696).isAlive());
-	}
-	
-	@AfterClass
-	public static void tearDown() {	
-		logger.info("----- TEST: tearDown() ---------");
-		
-		PolicyEngine.manager.stop();
-		assertFalse(PolicyEngine.manager.isAlive());
-	}
-	
-	@Test
-	public void addController() throws Exception {
-		logger.info("----- TEST: addController() ---------");
-		
-		Properties controllerProperties = new Properties();
-		controllerProperties.put("controller.name", "unnamed");
-		
-		PolicyEngine.manager.createPolicyController("unnamed", controllerProperties);
-		assertTrue(PolicyController.factory.inventory().size() == 1);
-		
-		HttpClient client = HttpClient.factory.build("telemetry", false, false, 
-                                                     "localhost", 9696, "policy/pdp", 
-                                                      null, null, false);
-		Response response = client.get("engine");
-		Object body = HttpClient.getBody(response, Object.class);
-		logger.info("policy-engine: {}", body);
-		
-		assertTrue(response.getStatus() == 200);
-		
-		PolicyController testController = PolicyController.factory.get("unnamed");
-		assertFalse(testController.getDrools().isAlive());
-		assertFalse(testController.getDrools().isLocked());
-	}
-
-}
diff --git a/policy-management/src/test/resources/logback-test.xml b/policy-management/src/test/resources/logback-test.xml
index e48b9a15..58e3248e 100644
--- a/policy-management/src/test/resources/logback-test.xml
+++ b/policy-management/src/test/resources/logback-test.xml
@@ -8,7 +8,7 @@
         </encoder>
     </appender>
     
-    <logger name="org.openecomp.policy.drools.system.test" level="INFO"/>
+    <logger name="org.onap.policy.drools.system.test" level="INFO"/>
 
     <root level="warn">
         <appender-ref ref="STDOUT"/>
diff --git a/policy-utils/pom.xml b/policy-utils/pom.xml
index 108d66d7..309839d5 100644
--- a/policy-utils/pom.xml
+++ b/policy-utils/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -26,7 +26,7 @@
   <artifactId>policy-utils</artifactId>
 
   <parent>
-    <groupId>org.openecomp.policy.drools-pdp</groupId>
+    <groupId>org.onap.policy.drools-pdp</groupId>
     <artifactId>drools-pdp</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java
new file mode 100644
index 00000000..75a3cd7d
--- /dev/null
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedService.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.utils;
+
+/**
+ * This is a base interface that is used to control the order of a list
+ * of services (features) discovered via 'ServiceLoader'. See
+ * 'OrderedServiceImpl' for more details.
+ */
+public interface OrderedService
+{
+  /**
+   * @return an integer sequence number, which determines the order of a list
+   *	of objects implementing this interface
+   */
+  public int getSequenceNumber();
+  
+  
+  /**
+   * @return the name of the ordered service
+   */
+  public default String getName() {return this.getClass().getName();}
+}
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java
new file mode 100644
index 00000000..88a53313
--- /dev/null
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/OrderedServiceImpl.java
@@ -0,0 +1,156 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.utils;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ServiceLoader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class is a template for building a sorted list of service instances,
+ * which are discovered and created using 'ServiceLoader'. 
+ */
+public class OrderedServiceImpl<T extends OrderedService>
+{
+  // logger
+  private static Logger  logger = LoggerFactory.getLogger(OrderedServiceImpl.class); 
+  
+  // sorted list of instances implementing the service
+  private List<T> implementers = null;
+
+  // 'ServiceLoader' that is used to discover and create the services
+  private ServiceLoader<T> serviceLoader = null; //ServiceLoader.load(T.class);
+
+  /**
+   * Constructor - create the 'ServiceLoader' instance
+   *
+   * @param clazz the class object associated with 'T' (I supposed it could
+   *	be a subclass, but I'm not sure this is useful)
+   */
+  public OrderedServiceImpl(Class<T> clazz)
+  {
+	// This constructor wouldn't be needed if 'T.class' was legal
+	serviceLoader = ServiceLoader.load(clazz);
+  }
+
+  /**
+   * @return the sorted list of services implementing interface 'T' discovered
+   *	by 'ServiceLoader'.
+   */
+  public synchronized List<T> getList()
+  {
+	if (implementers == null)
+	  {
+		rebuildList();
+	  }
+	return(implementers);
+  }
+
+  /**
+   * This method is called by 'getList', but could also be called directly if
+   * we were running with a 'ClassLoader' that supported the dynamic addition
+   * of JAR files. In this case, it could be invoked in order to discover any
+   * new services implementing interface 'T'. This is probably a relatively
+   * expensive operation in terms of CPU and elapsed time, so it is best if it
+   * isn't invoked too frequently.
+   *
+   * @return the sorted list of services implementing interface 'T' discovered
+   *	by 'ServiceLoader'.
+   */
+  @SuppressWarnings("unchecked")
+  public synchronized List<T> rebuildList()
+  {
+	// build a list of all of the current implementors
+	List<T> tmp = new LinkedList<T>();
+	for (T service : serviceLoader)
+	  {
+		tmp.add((T)getSingleton(service));
+	  }
+
+	// Sort the list according to sequence number, and then alphabetically
+	// according to full class name.
+	Collections.sort(tmp, new Comparator<T>()
+					 {
+					   public int compare(T o1, T o2)
+						 {
+						   int s1 = o1.getSequenceNumber();
+						   int s2 = o2.getSequenceNumber();
+						   int rval;
+						   if (s1 < s2)
+							 {
+							   rval = -1;
+							 }
+						   else if (s1 > s2)
+							 {
+							   rval = 1;
+							 }
+						   else
+							 {
+							   rval = o1.getClass().getName().compareTo
+								 (o2.getClass().getName());
+							 }
+						   return(rval);
+						 }
+					 });
+
+	// create an unmodifiable version of this list
+	implementers = Collections.unmodifiableList(tmp);
+	logger.info("***** OrderedServiceImpl implementers:\n {}", implementers);
+	return(implementers);
+  }
+
+  // use this to ensure that we only use one unique instance of each class
+  @SuppressWarnings("rawtypes")
+  static private HashMap<Class,OrderedService> classToSingleton =
+	new HashMap<>();
+
+  /**
+   * If a service implements multiple APIs managed by 'ServiceLoader', a
+   * separate instance is created for each API. This method ensures that
+   * the first instance is used in all of the lists.
+   *
+   * @param service this is the object created by ServiceLoader
+   * @return the object to use in place of 'service'. If 'service' is the first
+   *	object of this class created by ServiceLoader, it is returned. If not,
+   *	the object of this class that was initially created is returned
+   *	instead.
+   */
+  static private synchronized OrderedService
+	getSingleton(OrderedService service)
+  {
+	// see if we already have an instance of this class
+	OrderedService rval = classToSingleton.get(service.getClass());
+	if (rval == null)
+	  {
+		// No previous instance of this class exists -- use the supplied
+		// instance, and place it in the table.
+		rval = service;
+		classToSingleton.put(service.getClass(), service);
+	  }
+	return(rval);
+  }
+}
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java
new file mode 100644
index 00000000..ee0bb6f6
--- /dev/null
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/Pair.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.utils;
+
+public class Pair<F,S> {
+	
+    protected F first;
+    protected S second;
+    
+	public Pair(F first, S second){
+        this.first = first;
+        this.second = second;
+    }
+	
+    public F first() {return this.first;}
+    
+    public S second() {return this.second;}
+    
+    public F getFirst() {return this.first;}
+
+	public S getSecond() {return this.second;}
+    
+    public void first(F first) {this.first = first;}
+    
+    public void second(S second) {this.second = second;}
+    
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("Pair [first=").append(first).append(", second=").append(second).append("]");
+		return builder.toString();
+	}
+}
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
new file mode 100644
index 00000000..9cfe2ed1
--- /dev/null
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/PropertyUtil.java
@@ -0,0 +1,385 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * This class provides utilities to read properties from a properties
+ * file, and optionally get notifications of future changes
+ */
+public class PropertyUtil
+{
+  /**
+   * Read in a properties file
+   * @param file the properties file
+   * @return a Properties object, containing the associated properties
+   * @throws IOException - subclass 'FileNotFoundException' if the file
+   *	does not exist or can't be opened, and 'IOException' if there is
+   *	a problem loading the properties file.
+   */
+  static public Properties getProperties(File file) throws IOException
+  {
+	// create an InputStream (may throw a FileNotFoundException)
+	FileInputStream fis = new FileInputStream(file);
+	try
+	  {
+		// create the properties instance
+		Properties rval = new Properties();
+
+		// load properties (may throw an IOException)
+		rval.load(fis);
+		return(rval);
+	  }
+	finally
+	  {
+		// close input stream
+		fis.close();
+	  }
+  }
+
+  /**
+   * Read in a properties file
+   * @param fileName the properties file
+   * @return a Properties object, containing the associated properties
+   * @throws IOException - subclass 'FileNotFoundException' if the file
+   *	does not exist or can't be opened, and 'IOException' if there is
+   *	a problem loading the properties file.
+   */
+  static public Properties getProperties(String fileName) throws IOException
+  {
+	return(getProperties(new File(fileName)));
+  }
+
+  /* ============================================================ */
+
+  // timer thread used for polling for property file changes
+  private static Timer timer = null;
+
+  /**
+   * This is the callback interface, used for sending notifications of
+   * changes in the properties file.
+   */
+  public interface Listener
+  {
+	/**
+	 * Notification of a properties file change
+	 * @param properties the new properties
+	 * @param the set of property names that have changed, including
+	 *		additions and removals
+	 */
+	void propertiesChanged(Properties properties, Set<String> changedKeys);
+  }
+
+  // this table maps canonical file into a 'ListenerRegistration' instance
+  static private HashMap<File, ListenerRegistration> registrations =
+	new HashMap<File, ListenerRegistration>();
+
+  /**
+   * This is an internal class - one instance of this exists for each
+   * property file that is being monitored. Note that multiple listeners
+   * can be registered for the same file.
+   */
+  private static class ListenerRegistration
+  {
+	// the canonical path of the file being monitored
+	File file;
+
+	// the most recent value of 'file.lastModified()'
+	long lastModified;
+
+	// the most recent set of properties
+	Properties properties;
+
+	// the set of listeners monitoring this file
+	LinkedList<Listener> listeners;
+
+	// the 'TimerTask' instance, used for periodic polling
+	TimerTask timerTask;
+
+	/**
+	 * Constructor - create a 'ListenerRegistration' instance for this
+	 * file, but with no listeners
+	 */
+	ListenerRegistration(File file) throws IOException
+	{
+	  this.file = file;
+
+	  // The initial value of 'lastModified' is set to 0 to ensure that we
+	  // correctly handle the case where the file is modified within the
+	  // same second that polling begins.
+	  lastModified = 0;
+
+	  // fetch current properties
+	  properties = getProperties(file);
+
+	  // no listeners yet
+	  listeners = new LinkedList<Listener>();
+
+	  // add to static table, so this instance can be shared
+	  registrations.put(file, this);
+
+	  if (timer == null)
+		{
+		  // still need to create a timer thread
+		  synchronized(PropertyUtil.class)
+			{
+			  // an additional check is added inside the 'synchronized' block,
+			  // just in case someone beat us to it
+			  if (timer == null)
+				{
+				  timer = new Timer("PropertyUtil-Timer", true);
+				}
+			}
+		}
+
+	  // create and schedule the timer task, so this is periodically polled
+	  timerTask = new TimerTask()
+		{
+		  public void run()
+		  {
+			try
+			  {
+				poll();
+			  }
+			catch (Exception e)
+			  {
+				System.err.println(e);
+			  }
+		  }
+		};
+	  timer.schedule(timerTask, 10000L, 10000L);
+	}
+
+	/**
+	 * Add a listener to the notification list
+	 * @param listener this is the listener to add to the list
+	 * @return the properties at the moment the listener was added to the list
+	 */
+	synchronized Properties addListener(Listener listener)
+	{
+	  listeners.add(listener);
+	  return((Properties)properties.clone());
+	}
+
+	/**
+	 * Remove a listener from the notification list
+	 * @param listener this is the listener to remove
+	 */
+	synchronized void removeListener(Listener listener)
+	{
+	  listeners.remove(listener);
+
+	  // See if we need to remove this 'ListenerRegistration' instance
+	  // from the table. The 'synchronized' block is needed in case
+	  // another listener is being added at about the same time that this
+	  // one is being removed.
+	  synchronized(registrations)
+		{
+		  if (listeners.size() == 0)
+			{
+			  timerTask.cancel();
+			  registrations.remove(file);
+			}
+		}
+	}
+
+	/**
+	 * This method is periodically called to check for property list updates
+	 * @throws IOException if there is an error in reading the properties file
+	 */
+	synchronized void poll() throws IOException
+	{
+	  long timestamp = file.lastModified();
+	  if (timestamp != lastModified)
+		{
+		  // update the record, and send out the notifications
+		  lastModified = timestamp;
+
+		  // Save old set, and initial set of changed properties.
+		  Properties oldProperties = properties;
+		  HashSet<String> changedProperties =
+			new HashSet<String>(oldProperties.stringPropertyNames());
+
+		  // Fetch the list of listeners that we will potentially notify,
+		  // and the new properties. Note that this is in a 'synchronized'
+		  // block to ensure that all listeners receiving notifications
+		  // actually have a newer list of properties than the one
+		  // returned on the initial 'getProperties' call.
+		  properties = getProperties(file);
+		  
+		  Set<String> newPropertyNames = properties.stringPropertyNames();
+		  changedProperties.addAll(newPropertyNames);
+
+		  // At this point, 'changedProperties' is the union of all properties
+		  // in both the old and new properties files. Iterate through all
+		  // of the entries in the new properties file - if the entry
+		  // matches the one in the old file, remove it from
+		  // 'changedProperties'.
+		  for (String name : newPropertyNames)
+			{
+			  if (properties.getProperty(name).equals
+				  (oldProperties.getProperty(name)))
+				{
+				  // Apparently, any property that exists must be of type
+				  // 'String', and can't be null. For this reason, we don't
+				  // need to worry about the case where
+				  // 'properties.getProperty(name)' returns 'null'. Note that
+				  // 'oldProperties.getProperty(name)' may be 'null' if the
+				  // old property does not exist.
+				  changedProperties.remove(name);
+				}
+			}
+
+		  // 'changedProperties' should be correct at this point
+		  if (changedProperties.size() != 0)
+			{
+			  // there were changes - notify everyone in 'listeners'
+			  for (final Listener notify : listeners)
+				{
+				  // Copy 'properties' and 'changedProperties', so it doesn't
+				  // cause problems if the recipient makes changes.
+				  final Properties tmpProperties =
+					(Properties)(properties.clone());
+				  final HashSet<String> tmpChangedProperties =
+					new HashSet<String>(changedProperties);
+
+				  // Do the notification in a separate thread, so blocking
+				  // won't cause any problems.
+				  new Thread()
+				  {
+					public void run()
+					{
+					  notify.propertiesChanged
+						(tmpProperties, tmpChangedProperties);
+					}
+				  }.start();
+				}
+			}
+		}
+	}
+  }
+
+  /**
+   * Read in a properties file, and register for update notifications.
+   * NOTE: it is possible that the first callback will occur while this
+   * method is still in progress. To avoid this problem, use 'synchronized'
+   * blocks around this invocation and in the callback -- that will ensure
+   * that the processing of the initial properties complete before any
+   * updates are processed.
+   *
+   * @param file the properties file
+   * @param notify if not null, this is a callback interface that is used for
+   *	notifications of changes
+   * @return a Properties object, containing the associated properties
+   * @throws IOException - subclass 'FileNotFoundException' if the file
+   *	does not exist or can't be opened, and 'IOException' if there is
+   *	a problem loading the properties file.
+   */
+  static public Properties getProperties(File file, Listener listener)
+	throws IOException
+  {
+	if (listener == null)
+	  {
+		// no listener specified -- just fetch the properties
+		return(getProperties(file));
+	  }
+
+	// Convert the file to a canonical form in order to avoid the situation
+	// where different names refer to the same file.
+	file = file.getCanonicalFile();
+
+	// See if there is an existing registration. The 'synchronized' block
+	// is needed to handle the case where a new listener is added at about
+	// the same time that another one is being removed.
+	synchronized(registrations)
+	  {
+		ListenerRegistration reg = registrations.get(file);
+		if (reg == null)
+		  {
+			// a new registration is needed
+			reg = new ListenerRegistration(file);
+		  }
+		return(reg.addListener(listener));
+	  }
+  }
+
+  /**
+   * Read in a properties file, and register for update notifications.
+   * NOTE: it is possible that the first callback will occur while this
+   * method is still in progress. To avoid this problem, use 'synchronized'
+   * blocks around this invocation and in the callback -- that will ensure
+   * that the processing of the initial properties complete before any
+   * updates are processed.
+   *
+   * @param fileName the properties file
+   * @param notify if not null, this is a callback interface that is used for
+   *	notifications of changes
+   * @return a Properties object, containing the associated properties
+   * @throws IOException - subclass 'FileNotFoundException' if the file
+   *	does not exist or can't be opened, and 'IOException' if there is
+   *	a problem loading the properties file.
+   */
+  static public Properties getProperties(String fileName, Listener listener)
+	throws IOException
+  {
+	return(getProperties(new File(fileName), listener));
+  }
+
+  /**
+   * Stop listenening for updates
+   * @param file the properties file
+   * @param notify if not null, this is a callback interface that was used for
+   *	notifications of changes
+   */
+  static public void stopListening(File file, Listener listener)
+  {
+	if (listener != null)
+	  {
+		ListenerRegistration reg = registrations.get(file);
+		if (reg != null)
+		  {
+			reg.removeListener(listener);
+		  }
+	  }
+  }
+
+  /**
+   * Stop listenening for updates
+   * @param fileName the properties file
+   * @param notify if not null, this is a callback interface that was used for
+   *	notifications of changes
+   */
+  static public void stopListening(String fileName, Listener listener)
+  {
+	stopListening(new File(fileName), listener);
+  }
+
+}
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java
new file mode 100644
index 00000000..eeb7f1f6
--- /dev/null
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/ReflectionUtil.java
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * 
+ */
+package org.onap.policy.drools.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+/**
+ * Reflection utilities
+ *
+ */
+public class ReflectionUtil {
+	
+	protected final static Logger logger = LoggerFactory.getLogger(ReflectionUtil.class);
+	
+	/**
+	 * returns (if exists) a class fetched from a given classloader
+	 * 
+	 * @param classLoader the class loader
+	 * @param className the class name
+	 * @return the actual class
+	 * @throws IllegalArgumentException if an invalid parameter has been passed in
+	 */
+	public static Class<?> fetchClass(ClassLoader classLoader, 
+			                          String className) 
+		throws IllegalArgumentException {
+		if (classLoader == null)
+			throw new IllegalArgumentException("A class loader must be provided");
+		
+		if (className == null)
+			throw new IllegalArgumentException("A class name to be fetched in class loader " +
+		                                       classLoader + " must be provided");
+		
+		try {
+			Class<?> aClass = Class.forName(className, 
+					                        true, 
+					                        classLoader);
+			return aClass;
+		} catch (Exception e) {
+			logger.error("FETCHED-CLASS {} IN {} does NOT EXIST", className, classLoader);
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * 
+	 * @param classLoader target class loader
+	 * @param classname class name to fetch
+	 * @return true if exists
+	 * @throws IllegalArgumentException if an invalid parameter has been passed in
+	 */
+	public static boolean isClass(ClassLoader classLoader, String classname) 
+           throws IllegalArgumentException {
+		return fetchClass(classLoader, classname) != null;
+	}
+	
+	/**
+	 * is a subclass?
+	 * @param parent superclass
+	 * @param presumedSubclass subclass
+	 * @return
+	 */
+	public static boolean isSubclass(Class<?> parent, Class<?> presumedSubclass) {		
+		return (parent.isAssignableFrom(presumedSubclass));
+	}
+
+}
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java
new file mode 100644
index 00000000..530d57a5
--- /dev/null
+++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/Triple.java
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.utils;
+
+public class Triple<F,S,T> {
+	
+    private F first;
+    private S second;
+    private T third;
+    
+    public Triple(F first, S second, T third){
+        this.first = first;
+        this.second = second;
+        this.third = third;
+    }
+    public F first(){ return this.first; }
+    
+    public S second(){ return this.second; }
+    
+    public T third(){ return this.third; }
+    
+    public void first(F first){ this.first = first; }
+    
+    public void second(S second){ this.second = second; }
+    
+    public void third(T third){ this.third = third; }
+}
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java b/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java
deleted file mode 100644
index 0851413c..00000000
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.utils;
-
-/**
- * This is a base interface that is used to control the order of a list
- * of services (features) discovered via 'ServiceLoader'. See
- * 'OrderedServiceImpl' for more details.
- */
-public interface OrderedService
-{
-  /**
-   * @return an integer sequence number, which determines the order of a list
-   *	of objects implementing this interface
-   */
-  public int getSequenceNumber();
-  
-  
-  /**
-   * @return the name of the ordered service
-   */
-  public default String getName() {return this.getClass().getName();}
-}
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java b/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java
deleted file mode 100644
index 72bf7b8b..00000000
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/OrderedServiceImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.utils;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ServiceLoader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class is a template for building a sorted list of service instances,
- * which are discovered and created using 'ServiceLoader'. 
- */
-public class OrderedServiceImpl<T extends OrderedService>
-{
-  // logger
-  private static Logger  logger = LoggerFactory.getLogger(OrderedServiceImpl.class); 
-  
-  // sorted list of instances implementing the service
-  private List<T> implementers = null;
-
-  // 'ServiceLoader' that is used to discover and create the services
-  private ServiceLoader<T> serviceLoader = null; //ServiceLoader.load(T.class);
-
-  /**
-   * Constructor - create the 'ServiceLoader' instance
-   *
-   * @param clazz the class object associated with 'T' (I supposed it could
-   *	be a subclass, but I'm not sure this is useful)
-   */
-  public OrderedServiceImpl(Class<T> clazz)
-  {
-	// This constructor wouldn't be needed if 'T.class' was legal
-	serviceLoader = ServiceLoader.load(clazz);
-  }
-
-  /**
-   * @return the sorted list of services implementing interface 'T' discovered
-   *	by 'ServiceLoader'.
-   */
-  public synchronized List<T> getList()
-  {
-	if (implementers == null)
-	  {
-		rebuildList();
-	  }
-	return(implementers);
-  }
-
-  /**
-   * This method is called by 'getList', but could also be called directly if
-   * we were running with a 'ClassLoader' that supported the dynamic addition
-   * of JAR files. In this case, it could be invoked in order to discover any
-   * new services implementing interface 'T'. This is probably a relatively
-   * expensive operation in terms of CPU and elapsed time, so it is best if it
-   * isn't invoked too frequently.
-   *
-   * @return the sorted list of services implementing interface 'T' discovered
-   *	by 'ServiceLoader'.
-   */
-  @SuppressWarnings("unchecked")
-  public synchronized List<T> rebuildList()
-  {
-	// build a list of all of the current implementors
-	List<T> tmp = new LinkedList<T>();
-	for (T service : serviceLoader)
-	  {
-		tmp.add((T)getSingleton(service));
-	  }
-
-	// Sort the list according to sequence number, and then alphabetically
-	// according to full class name.
-	Collections.sort(tmp, new Comparator<T>()
-					 {
-					   public int compare(T o1, T o2)
-						 {
-						   int s1 = o1.getSequenceNumber();
-						   int s2 = o2.getSequenceNumber();
-						   int rval;
-						   if (s1 < s2)
-							 {
-							   rval = -1;
-							 }
-						   else if (s1 > s2)
-							 {
-							   rval = 1;
-							 }
-						   else
-							 {
-							   rval = o1.getClass().getName().compareTo
-								 (o2.getClass().getName());
-							 }
-						   return(rval);
-						 }
-					 });
-
-	// create an unmodifiable version of this list
-	implementers = Collections.unmodifiableList(tmp);
-	logger.info("***** OrderedServiceImpl implementers:\n {}", implementers);
-	return(implementers);
-  }
-
-  // use this to ensure that we only use one unique instance of each class
-  @SuppressWarnings("rawtypes")
-  static private HashMap<Class,OrderedService> classToSingleton =
-	new HashMap<>();
-
-  /**
-   * If a service implements multiple APIs managed by 'ServiceLoader', a
-   * separate instance is created for each API. This method ensures that
-   * the first instance is used in all of the lists.
-   *
-   * @param service this is the object created by ServiceLoader
-   * @return the object to use in place of 'service'. If 'service' is the first
-   *	object of this class created by ServiceLoader, it is returned. If not,
-   *	the object of this class that was initially created is returned
-   *	instead.
-   */
-  static private synchronized OrderedService
-	getSingleton(OrderedService service)
-  {
-	// see if we already have an instance of this class
-	OrderedService rval = classToSingleton.get(service.getClass());
-	if (rval == null)
-	  {
-		// No previous instance of this class exists -- use the supplied
-		// instance, and place it in the table.
-		rval = service;
-		classToSingleton.put(service.getClass(), service);
-	  }
-	return(rval);
-  }
-}
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java b/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java
deleted file mode 100644
index a5e34695..00000000
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Pair.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.utils;
-
-public class Pair<F,S> {
-	
-    protected F first;
-    protected S second;
-    
-	public Pair(F first, S second){
-        this.first = first;
-        this.second = second;
-    }
-	
-    public F first() {return this.first;}
-    
-    public S second() {return this.second;}
-    
-    public F getFirst() {return this.first;}
-
-	public S getSecond() {return this.second;}
-    
-    public void first(F first) {this.first = first;}
-    
-    public void second(S second) {this.second = second;}
-    
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("Pair [first=").append(first).append(", second=").append(second).append("]");
-		return builder.toString();
-	}
-}
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java b/policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java
deleted file mode 100644
index 1e8dc267..00000000
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/PropertyUtil.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * This class provides utilities to read properties from a properties
- * file, and optionally get notifications of future changes
- */
-public class PropertyUtil
-{
-  /**
-   * Read in a properties file
-   * @param file the properties file
-   * @return a Properties object, containing the associated properties
-   * @throws IOException - subclass 'FileNotFoundException' if the file
-   *	does not exist or can't be opened, and 'IOException' if there is
-   *	a problem loading the properties file.
-   */
-  static public Properties getProperties(File file) throws IOException
-  {
-	// create an InputStream (may throw a FileNotFoundException)
-	FileInputStream fis = new FileInputStream(file);
-	try
-	  {
-		// create the properties instance
-		Properties rval = new Properties();
-
-		// load properties (may throw an IOException)
-		rval.load(fis);
-		return(rval);
-	  }
-	finally
-	  {
-		// close input stream
-		fis.close();
-	  }
-  }
-
-  /**
-   * Read in a properties file
-   * @param fileName the properties file
-   * @return a Properties object, containing the associated properties
-   * @throws IOException - subclass 'FileNotFoundException' if the file
-   *	does not exist or can't be opened, and 'IOException' if there is
-   *	a problem loading the properties file.
-   */
-  static public Properties getProperties(String fileName) throws IOException
-  {
-	return(getProperties(new File(fileName)));
-  }
-
-  /* ============================================================ */
-
-  // timer thread used for polling for property file changes
-  private static Timer timer = null;
-
-  /**
-   * This is the callback interface, used for sending notifications of
-   * changes in the properties file.
-   */
-  public interface Listener
-  {
-	/**
-	 * Notification of a properties file change
-	 * @param properties the new properties
-	 * @param the set of property names that have changed, including
-	 *		additions and removals
-	 */
-	void propertiesChanged(Properties properties, Set<String> changedKeys);
-  }
-
-  // this table maps canonical file into a 'ListenerRegistration' instance
-  static private HashMap<File, ListenerRegistration> registrations =
-	new HashMap<File, ListenerRegistration>();
-
-  /**
-   * This is an internal class - one instance of this exists for each
-   * property file that is being monitored. Note that multiple listeners
-   * can be registered for the same file.
-   */
-  private static class ListenerRegistration
-  {
-	// the canonical path of the file being monitored
-	File file;
-
-	// the most recent value of 'file.lastModified()'
-	long lastModified;
-
-	// the most recent set of properties
-	Properties properties;
-
-	// the set of listeners monitoring this file
-	LinkedList<Listener> listeners;
-
-	// the 'TimerTask' instance, used for periodic polling
-	TimerTask timerTask;
-
-	/**
-	 * Constructor - create a 'ListenerRegistration' instance for this
-	 * file, but with no listeners
-	 */
-	ListenerRegistration(File file) throws IOException
-	{
-	  this.file = file;
-
-	  // The initial value of 'lastModified' is set to 0 to ensure that we
-	  // correctly handle the case where the file is modified within the
-	  // same second that polling begins.
-	  lastModified = 0;
-
-	  // fetch current properties
-	  properties = getProperties(file);
-
-	  // no listeners yet
-	  listeners = new LinkedList<Listener>();
-
-	  // add to static table, so this instance can be shared
-	  registrations.put(file, this);
-
-	  if (timer == null)
-		{
-		  // still need to create a timer thread
-		  synchronized(PropertyUtil.class)
-			{
-			  // an additional check is added inside the 'synchronized' block,
-			  // just in case someone beat us to it
-			  if (timer == null)
-				{
-				  timer = new Timer("PropertyUtil-Timer", true);
-				}
-			}
-		}
-
-	  // create and schedule the timer task, so this is periodically polled
-	  timerTask = new TimerTask()
-		{
-		  public void run()
-		  {
-			try
-			  {
-				poll();
-			  }
-			catch (Exception e)
-			  {
-				System.err.println(e);
-			  }
-		  }
-		};
-	  timer.schedule(timerTask, 10000L, 10000L);
-	}
-
-	/**
-	 * Add a listener to the notification list
-	 * @param listener this is the listener to add to the list
-	 * @return the properties at the moment the listener was added to the list
-	 */
-	synchronized Properties addListener(Listener listener)
-	{
-	  listeners.add(listener);
-	  return((Properties)properties.clone());
-	}
-
-	/**
-	 * Remove a listener from the notification list
-	 * @param listener this is the listener to remove
-	 */
-	synchronized void removeListener(Listener listener)
-	{
-	  listeners.remove(listener);
-
-	  // See if we need to remove this 'ListenerRegistration' instance
-	  // from the table. The 'synchronized' block is needed in case
-	  // another listener is being added at about the same time that this
-	  // one is being removed.
-	  synchronized(registrations)
-		{
-		  if (listeners.size() == 0)
-			{
-			  timerTask.cancel();
-			  registrations.remove(file);
-			}
-		}
-	}
-
-	/**
-	 * This method is periodically called to check for property list updates
-	 * @throws IOException if there is an error in reading the properties file
-	 */
-	synchronized void poll() throws IOException
-	{
-	  long timestamp = file.lastModified();
-	  if (timestamp != lastModified)
-		{
-		  // update the record, and send out the notifications
-		  lastModified = timestamp;
-
-		  // Save old set, and initial set of changed properties.
-		  Properties oldProperties = properties;
-		  HashSet<String> changedProperties =
-			new HashSet<String>(oldProperties.stringPropertyNames());
-
-		  // Fetch the list of listeners that we will potentially notify,
-		  // and the new properties. Note that this is in a 'synchronized'
-		  // block to ensure that all listeners receiving notifications
-		  // actually have a newer list of properties than the one
-		  // returned on the initial 'getProperties' call.
-		  properties = getProperties(file);
-		  
-		  Set<String> newPropertyNames = properties.stringPropertyNames();
-		  changedProperties.addAll(newPropertyNames);
-
-		  // At this point, 'changedProperties' is the union of all properties
-		  // in both the old and new properties files. Iterate through all
-		  // of the entries in the new properties file - if the entry
-		  // matches the one in the old file, remove it from
-		  // 'changedProperties'.
-		  for (String name : newPropertyNames)
-			{
-			  if (properties.getProperty(name).equals
-				  (oldProperties.getProperty(name)))
-				{
-				  // Apparently, any property that exists must be of type
-				  // 'String', and can't be null. For this reason, we don't
-				  // need to worry about the case where
-				  // 'properties.getProperty(name)' returns 'null'. Note that
-				  // 'oldProperties.getProperty(name)' may be 'null' if the
-				  // old property does not exist.
-				  changedProperties.remove(name);
-				}
-			}
-
-		  // 'changedProperties' should be correct at this point
-		  if (changedProperties.size() != 0)
-			{
-			  // there were changes - notify everyone in 'listeners'
-			  for (final Listener notify : listeners)
-				{
-				  // Copy 'properties' and 'changedProperties', so it doesn't
-				  // cause problems if the recipient makes changes.
-				  final Properties tmpProperties =
-					(Properties)(properties.clone());
-				  final HashSet<String> tmpChangedProperties =
-					new HashSet<String>(changedProperties);
-
-				  // Do the notification in a separate thread, so blocking
-				  // won't cause any problems.
-				  new Thread()
-				  {
-					public void run()
-					{
-					  notify.propertiesChanged
-						(tmpProperties, tmpChangedProperties);
-					}
-				  }.start();
-				}
-			}
-		}
-	}
-  }
-
-  /**
-   * Read in a properties file, and register for update notifications.
-   * NOTE: it is possible that the first callback will occur while this
-   * method is still in progress. To avoid this problem, use 'synchronized'
-   * blocks around this invocation and in the callback -- that will ensure
-   * that the processing of the initial properties complete before any
-   * updates are processed.
-   *
-   * @param file the properties file
-   * @param notify if not null, this is a callback interface that is used for
-   *	notifications of changes
-   * @return a Properties object, containing the associated properties
-   * @throws IOException - subclass 'FileNotFoundException' if the file
-   *	does not exist or can't be opened, and 'IOException' if there is
-   *	a problem loading the properties file.
-   */
-  static public Properties getProperties(File file, Listener listener)
-	throws IOException
-  {
-	if (listener == null)
-	  {
-		// no listener specified -- just fetch the properties
-		return(getProperties(file));
-	  }
-
-	// Convert the file to a canonical form in order to avoid the situation
-	// where different names refer to the same file.
-	file = file.getCanonicalFile();
-
-	// See if there is an existing registration. The 'synchronized' block
-	// is needed to handle the case where a new listener is added at about
-	// the same time that another one is being removed.
-	synchronized(registrations)
-	  {
-		ListenerRegistration reg = registrations.get(file);
-		if (reg == null)
-		  {
-			// a new registration is needed
-			reg = new ListenerRegistration(file);
-		  }
-		return(reg.addListener(listener));
-	  }
-  }
-
-  /**
-   * Read in a properties file, and register for update notifications.
-   * NOTE: it is possible that the first callback will occur while this
-   * method is still in progress. To avoid this problem, use 'synchronized'
-   * blocks around this invocation and in the callback -- that will ensure
-   * that the processing of the initial properties complete before any
-   * updates are processed.
-   *
-   * @param fileName the properties file
-   * @param notify if not null, this is a callback interface that is used for
-   *	notifications of changes
-   * @return a Properties object, containing the associated properties
-   * @throws IOException - subclass 'FileNotFoundException' if the file
-   *	does not exist or can't be opened, and 'IOException' if there is
-   *	a problem loading the properties file.
-   */
-  static public Properties getProperties(String fileName, Listener listener)
-	throws IOException
-  {
-	return(getProperties(new File(fileName), listener));
-  }
-
-  /**
-   * Stop listenening for updates
-   * @param file the properties file
-   * @param notify if not null, this is a callback interface that was used for
-   *	notifications of changes
-   */
-  static public void stopListening(File file, Listener listener)
-  {
-	if (listener != null)
-	  {
-		ListenerRegistration reg = registrations.get(file);
-		if (reg != null)
-		  {
-			reg.removeListener(listener);
-		  }
-	  }
-  }
-
-  /**
-   * Stop listenening for updates
-   * @param fileName the properties file
-   * @param notify if not null, this is a callback interface that was used for
-   *	notifications of changes
-   */
-  static public void stopListening(String fileName, Listener listener)
-  {
-	stopListening(new File(fileName), listener);
-  }
-
-}
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java b/policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java
deleted file mode 100644
index 0d82e847..00000000
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/ReflectionUtil.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-/**
- * 
- */
-package org.openecomp.policy.drools.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-/**
- * Reflection utilities
- *
- */
-public class ReflectionUtil {
-	
-	protected final static Logger logger = LoggerFactory.getLogger(ReflectionUtil.class);
-	
-	/**
-	 * returns (if exists) a class fetched from a given classloader
-	 * 
-	 * @param classLoader the class loader
-	 * @param className the class name
-	 * @return the actual class
-	 * @throws IllegalArgumentException if an invalid parameter has been passed in
-	 */
-	public static Class<?> fetchClass(ClassLoader classLoader, 
-			                          String className) 
-		throws IllegalArgumentException {
-		if (classLoader == null)
-			throw new IllegalArgumentException("A class loader must be provided");
-		
-		if (className == null)
-			throw new IllegalArgumentException("A class name to be fetched in class loader " +
-		                                       classLoader + " must be provided");
-		
-		try {
-			Class<?> aClass = Class.forName(className, 
-					                        true, 
-					                        classLoader);
-			return aClass;
-		} catch (Exception e) {
-			logger.error("FETCHED-CLASS {} IN {} does NOT EXIST", className, classLoader);
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * 
-	 * @param classLoader target class loader
-	 * @param classname class name to fetch
-	 * @return true if exists
-	 * @throws IllegalArgumentException if an invalid parameter has been passed in
-	 */
-	public static boolean isClass(ClassLoader classLoader, String classname) 
-           throws IllegalArgumentException {
-		return fetchClass(classLoader, classname) != null;
-	}
-	
-	/**
-	 * is a subclass?
-	 * @param parent superclass
-	 * @param presumedSubclass subclass
-	 * @return
-	 */
-	public static boolean isSubclass(Class<?> parent, Class<?> presumedSubclass) {		
-		return (parent.isAssignableFrom(presumedSubclass));
-	}
-
-}
diff --git a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java b/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java
deleted file mode 100644
index 214d949e..00000000
--- a/policy-utils/src/main/java/org/openecomp/policy/drools/utils/Triple.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.utils;
-
-public class Triple<F,S,T> {
-	
-    private F first;
-    private S second;
-    private T third;
-    
-    public Triple(F first, S second, T third){
-        this.first = first;
-        this.second = second;
-        this.third = third;
-    }
-    public F first(){ return this.first; }
-    
-    public S second(){ return this.second; }
-    
-    public T third(){ return this.third; }
-    
-    public void first(F first){ this.first = first; }
-    
-    public void second(S second){ this.second = second; }
-    
-    public void third(T third){ this.third = third; }
-}
diff --git a/policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java b/policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java
new file mode 100644
index 00000000..9d2aa397
--- /dev/null
+++ b/policy-utils/src/test/java/org/onap/policy/drools/utils/PropertyUtilTest.java
@@ -0,0 +1,201 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-utils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.drools.utils;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PropertyUtilTest
+{
+  private final static Logger logger = LoggerFactory.getLogger(PropertyUtilTest.class);
+
+  private static File directory = null;
+
+  /**
+   * Test Setup -- Create a directory for temporary files
+   */
+  @BeforeClass
+	static public void setup()
+  {
+	logger.info("setup: creating a temporary directory");
+
+	// create a directory for temporary files
+	directory = new File(UUID.randomUUID().toString());
+	directory.mkdir();
+  }
+
+  /**
+   * Test Cleanup -- Remove temporary files
+   */
+  @AfterClass
+	static public void teardown()
+  {
+	logger.info("teardown: remove the temporary directory");
+
+	// the assumption is that we only have one level of temporary files
+	for (File file : directory.listFiles())
+	  {
+		file.delete();
+	  }
+	directory.delete();
+  }
+
+  /**
+   * Utility method to write a properties file
+   *
+   * @param name the file name, relative to the temporary directory
+   * @param the properties to store in the file
+   * @return a File instance associated with the newly-created file
+   * @throws IOException if the file can't be created for some reason
+   */
+  File createFile(String name, Properties p) throws IOException
+  {
+	File file = new File(directory, name);
+	FileOutputStream fos = new FileOutputStream(file);
+	try
+	  {
+		p.store(fos, "Property file '" + name + "'");
+	  }
+	finally
+	  {
+		fos.close();
+	  }
+	return(file);
+  }
+
+  /**
+   * Create a 'PropertyUtil.Listener' subclass, which receives property
+   * file updates. It stores the latest values in an array, and notifies
+   * any thread waiting on this array.
+   *
+   * @param returns this is an array of length 2 -- the first entry will
+   *	contain the 'properties' value, and the second will contain
+   *	'changedKeys'. It is also used to signal any waiting thread
+   *	using 'returns.notifyAll()'.
+   */
+  PropertyUtil.Listener createListenerThread(final Object[] returns)
+  {
+	return(new PropertyUtil.Listener()
+	  {
+		public void propertiesChanged
+		  (Properties properties, Set<String> changedKeys)
+		{
+		  // When a notification is received, store the values in the
+		  // 'returns' array, and signal using the same array.
+		  logger.info("Listener invoked: properties=" + properties
+					  + ", changedKeys=" + changedKeys);
+		  returns[0] = properties;
+		  returns[1] = changedKeys;
+		  synchronized(returns)
+			{
+			  returns.notifyAll();
+			}
+		}
+	  });
+  }
+
+  /**
+   * Test the basic properties file interface.
+   */
+  @Test
+	public void testGetProperties() throws Exception
+  {
+	logger.info("testGetProperties: test the basic properties file interface");
+
+	// copy system properties
+	logger.info("Copy system properties to a file");
+	Properties prop1 = System.getProperties();
+	File file1 = createFile("createAndReadPropertyFile-1", prop1);
+
+	// read in properties, and compare
+	logger.info("Read in properties from new file");
+	Properties prop2 = PropertyUtil.getProperties(file1);
+
+	// they should match
+	assertEquals(prop1, prop2);
+  }
+
+  /**
+   * This tests the 'PropertyUtil.Listener' interface.
+   */
+  @Test
+	public void testListenerInterface() throws Exception
+  {
+	logger.info("testListenerInterface: test receipt of dynamic updates");
+
+	// create initial property file
+	Properties prop1 = new Properties();
+	prop1.setProperty("p1", "p1 value");
+	prop1.setProperty("p2", "p2 value");
+	prop1.setProperty("p3", "p3 value");
+	logger.info("Create initial properties file: " + prop1);
+	File file1 = createFile("createAndReadPropertyFile-2", prop1);
+
+	// create a listener for the notification interface
+	Object[] returns = new Object[2];
+	PropertyUtil.Listener listener = createListenerThread(returns);
+
+	// read it in, and do a comparison
+	Properties prop2 = PropertyUtil.getProperties(file1, listener);
+	logger.info("Read in properties: " + prop2);
+	assertEquals(prop1, prop2);
+	assertEquals(prop2.getProperty("p1"), "p1 value");
+	assertEquals(prop2.getProperty("p2"), "p2 value");
+	assertEquals(prop2.getProperty("p3"), "p3 value");
+
+	// make some changes, and update the file (p3 is left unchanged)
+	prop2.remove("p1");		// remove one property
+	prop2.setProperty("p2", "new p2 value");	// change one property
+	prop2.setProperty("p4", "p4 value");		// add a new property
+	logger.info("Modified properties: " + prop2);
+
+	// now, update the file, and wait for notification
+	synchronized(returns)
+	  {
+		createFile("createAndReadPropertyFile-2", prop2);
+
+		// wait up to 60 seconds, although we should receive notification
+		// in 10 seconds or less (if things are working)
+		returns.wait(60000L);
+	  }
+
+	// verify we have the updates
+	assertEquals(prop2, returns[0]);
+
+	// verify that we have the expected set of keys
+	assertEquals(new TreeSet<String>(Arrays.asList(new String[]{"p1", "p2", "p4"})),
+				 returns[1]);
+  }
+}
diff --git a/policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java b/policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java
deleted file mode 100644
index b45f1b45..00000000
--- a/policy-utils/src/test/java/org/openecomp/policy/drools/utils/PropertyUtilTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-utils
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.drools.utils;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PropertyUtilTest
-{
-  private final static Logger logger = LoggerFactory.getLogger(PropertyUtilTest.class);
-
-  private static File directory = null;
-
-  /**
-   * Test Setup -- Create a directory for temporary files
-   */
-  @BeforeClass
-	static public void setup()
-  {
-	logger.info("setup: creating a temporary directory");
-
-	// create a directory for temporary files
-	directory = new File(UUID.randomUUID().toString());
-	directory.mkdir();
-  }
-
-  /**
-   * Test Cleanup -- Remove temporary files
-   */
-  @AfterClass
-	static public void teardown()
-  {
-	logger.info("teardown: remove the temporary directory");
-
-	// the assumption is that we only have one level of temporary files
-	for (File file : directory.listFiles())
-	  {
-		file.delete();
-	  }
-	directory.delete();
-  }
-
-  /**
-   * Utility method to write a properties file
-   *
-   * @param name the file name, relative to the temporary directory
-   * @param the properties to store in the file
-   * @return a File instance associated with the newly-created file
-   * @throws IOException if the file can't be created for some reason
-   */
-  File createFile(String name, Properties p) throws IOException
-  {
-	File file = new File(directory, name);
-	FileOutputStream fos = new FileOutputStream(file);
-	try
-	  {
-		p.store(fos, "Property file '" + name + "'");
-	  }
-	finally
-	  {
-		fos.close();
-	  }
-	return(file);
-  }
-
-  /**
-   * Create a 'PropertyUtil.Listener' subclass, which receives property
-   * file updates. It stores the latest values in an array, and notifies
-   * any thread waiting on this array.
-   *
-   * @param returns this is an array of length 2 -- the first entry will
-   *	contain the 'properties' value, and the second will contain
-   *	'changedKeys'. It is also used to signal any waiting thread
-   *	using 'returns.notifyAll()'.
-   */
-  PropertyUtil.Listener createListenerThread(final Object[] returns)
-  {
-	return(new PropertyUtil.Listener()
-	  {
-		public void propertiesChanged
-		  (Properties properties, Set<String> changedKeys)
-		{
-		  // When a notification is received, store the values in the
-		  // 'returns' array, and signal using the same array.
-		  logger.info("Listener invoked: properties=" + properties
-					  + ", changedKeys=" + changedKeys);
-		  returns[0] = properties;
-		  returns[1] = changedKeys;
-		  synchronized(returns)
-			{
-			  returns.notifyAll();
-			}
-		}
-	  });
-  }
-
-  /**
-   * Test the basic properties file interface.
-   */
-  @Test
-	public void testGetProperties() throws Exception
-  {
-	logger.info("testGetProperties: test the basic properties file interface");
-
-	// copy system properties
-	logger.info("Copy system properties to a file");
-	Properties prop1 = System.getProperties();
-	File file1 = createFile("createAndReadPropertyFile-1", prop1);
-
-	// read in properties, and compare
-	logger.info("Read in properties from new file");
-	Properties prop2 = PropertyUtil.getProperties(file1);
-
-	// they should match
-	assertEquals(prop1, prop2);
-  }
-
-  /**
-   * This tests the 'PropertyUtil.Listener' interface.
-   */
-  @Test
-	public void testListenerInterface() throws Exception
-  {
-	logger.info("testListenerInterface: test receipt of dynamic updates");
-
-	// create initial property file
-	Properties prop1 = new Properties();
-	prop1.setProperty("p1", "p1 value");
-	prop1.setProperty("p2", "p2 value");
-	prop1.setProperty("p3", "p3 value");
-	logger.info("Create initial properties file: " + prop1);
-	File file1 = createFile("createAndReadPropertyFile-2", prop1);
-
-	// create a listener for the notification interface
-	Object[] returns = new Object[2];
-	PropertyUtil.Listener listener = createListenerThread(returns);
-
-	// read it in, and do a comparison
-	Properties prop2 = PropertyUtil.getProperties(file1, listener);
-	logger.info("Read in properties: " + prop2);
-	assertEquals(prop1, prop2);
-	assertEquals(prop2.getProperty("p1"), "p1 value");
-	assertEquals(prop2.getProperty("p2"), "p2 value");
-	assertEquals(prop2.getProperty("p3"), "p3 value");
-
-	// make some changes, and update the file (p3 is left unchanged)
-	prop2.remove("p1");		// remove one property
-	prop2.setProperty("p2", "new p2 value");	// change one property
-	prop2.setProperty("p4", "p4 value");		// add a new property
-	logger.info("Modified properties: " + prop2);
-
-	// now, update the file, and wait for notification
-	synchronized(returns)
-	  {
-		createFile("createAndReadPropertyFile-2", prop2);
-
-		// wait up to 60 seconds, although we should receive notification
-		// in 10 seconds or less (if things are working)
-		returns.wait(60000L);
-	  }
-
-	// verify we have the updates
-	assertEquals(prop2, returns[0]);
-
-	// verify that we have the expected set of keys
-	assertEquals(new TreeSet<String>(Arrays.asList(new String[]{"p1", "p2", "p4"})),
-				 returns[1]);
-  }
-}
diff --git a/pom.xml b/pom.xml
index 91ebb245..8529f9dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine - Drools PDP
+  ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -22,13 +22,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.openecomp.policy.drools-pdp</groupId>
+	<groupId>org.onap.policy.drools-pdp</groupId>
 	<artifactId>drools-pdp</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Policy Engine - Drools PDP</name>
 
-	<description>The ECOMP Policy Engine drools-based PDP Project</description>
+	<description>The ONAP Policy Engine drools-based PDP Project</description>
 
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -74,35 +74,35 @@
 
 	<repositories>
 		<repository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
+			<id>onap-snapshots</id>
+			<name>ONAP Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshots.path}</url>
 		</repository>
 		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
+			<id>onap-releases</id>
+			<name>ONAP Release Repository</name>
 			<url>${nexusproxy}/${releases.path}</url>
 		</repository>
 		<repository>
-			<id>ecomp-staging</id>
-			<name>OpenECOMP Staging Repository</name>
+			<id>onap-staging</id>
+			<name>ONAP Staging Repository</name>
 			<url>${nexusproxy}/${staging.path}</url>
 		</repository>
 	</repositories>
 
 	<distributionManagement>
 		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP Release Repository</name>
+			<id>onap-releases</id>
+			<name>ONAP Release Repository</name>
 			<url>${nexusproxy}/${releases.path}</url>
 		</repository>
 		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP Snapshot Repository</name>
+			<id>onap-snapshots</id>
+			<name>ONAP Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshots.path}</url>
 		</snapshotRepository>
 		<site>
-			<id>ecomp-site</id>
+			<id>onap-site</id>
 			<url>dav:${nexusproxy}${sitePath}</url>
 		</site>
 	</distributionManagement>
@@ -194,7 +194,7 @@
 				<configuration>
 					<nexusUrl>${nexusproxy}</nexusUrl>
 					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
+					<serverId>onap-staging</serverId>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -305,7 +305,7 @@
 					<configuration>
 						<dumpOnExit>true</dumpOnExit>
 						<includes>
-							<include>org.openecomp.*</include>
+							<include>org.onap.*</include>
 						</includes>
 					</configuration>
 					<executions>
-- 
cgit 1.2.3-korg