Copy policy-endpoints from drools-pdp to common

Removed policy-endpoints, and 3 classes from policy-core. Replaced
refenences to the deleted classes with references to the corresponding
classes in policy-common

Issue-ID: POLICY-967
Change-Id: I547cde4894424b8f40b7ddd4e2342ebb729cb588
Signed-off-by: mmis <michael.morris@ericsson.com>

4 files changed, 676 insertions, 1023 deletions

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
index 4806df04..1e8a2882 100644
--- 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
@@ -34,831 +34,668 @@ 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.onap.policy.common.capabilities.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.
+ * 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
-  private static KieServices kieServices = KieServices.Factory.get();
-
-  // set of all 'PolicyContainer' instances
-  private static HashSet<PolicyContainer> containers =
-	new HashSet<>();
-
-  // maps feature objects to per-PolicyContainer data
-  private ConcurrentHashMap<Object, Object> adjuncts =
-	new ConcurrentHashMap<>();
-
-  // '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<>();
-
-  // 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;
-  
-  private static final String ERROR_STRING = "ERROR: Feature API: ";
-
-  /**
-   * 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)
-  {
-	ReleaseId newReleaseId = releaseId;
-	if (newReleaseId.getVersion().contains(","))
-	  {
-		// this is actually a comma-separated list of release ids
-		newReleaseId = loadArtifact(newReleaseId.getGroupId(),
-								 newReleaseId.getArtifactId(),
-								 newReleaseId.getVersion());
-	  }
-	else
-	  {
-		kieContainer = kieServices.newKieContainer(newReleaseId);
-	  }
-	synchronized(containers)
-	  {
-		if(newReleaseId != null){
-		   logger.info("Add a new kieContainer in containers: releaseId: " + newReleaseId.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_STRING
-								 + 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_STRING
-									 + 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)
-  {
-
-	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_STRING
-							 + 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());
+public class PolicyContainer implements Startable {
+    // get an instance of logger
+    private static Logger logger = LoggerFactory.getLogger(PolicyContainer.class);
+    // 'KieServices' singleton
+    private static KieServices kieServices = KieServices.Factory.get();
+
+    // set of all 'PolicyContainer' instances
+    private static HashSet<PolicyContainer> containers = new HashSet<>();
+
+    // maps feature objects to per-PolicyContainer data
+    private ConcurrentHashMap<Object, Object> adjuncts = new ConcurrentHashMap<>();
+
+    // '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<>();
+
+    // 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;
+
+    private static final String ERROR_STRING = "ERROR: Feature API: ";
+
+    /**
+     * 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));
     }
 
-	// stop all session threads
-	for (PolicySession session : sessions.values())
-	  {
-		session.stopThread();
-	  }
-
-	// update the version
-	Results results = kieContainer.updateToVersion(releaseId);
-
-	// restart all session threads, and notify the sessions
-	for (PolicySession session : sessions.values())
-	  {
-		session.startThread();
-		session.updated();
-	  }
-
-	return results;
-  }
-
-  /**
-   * @return all existing 'PolicyContainer' instances
-   */
-  public static Collection<PolicyContainer> getPolicyContainers()
-  {
-	synchronized(containers)
-	  {
-		return new HashSet<>(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().isEmpty())
-	  {
-		start();
-	  }
-
-	// return current set of PolicySessions
-	synchronized(sessions)
-	  {
-		return new HashSet<>(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 && scanner == null && version != null
-		&& ("LATEST".equals(version) || "RELEASE".equals(version)
-			|| 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())
-			{
-			  @Override
-			  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}
-   */
-  @Override
-  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}
-   */
-  @Override
-  public synchronized boolean stop()
-  {
-	if (isStarted)
-	  {
-		Collection<PolicySession> localSessions;
-
-		synchronized (sessions)
-		  {
-			// local set containing all of the sessions
-			localSessions = new HashSet<>(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_STRING
-								 + feature.getClass().getName(), e);
-				  }
-			  }
-		  }
-		isStarted = false;
-	  }
-	return true;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  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}
-   */
-  @Override
-  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<>(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_STRING
-							 + 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.
-   */
-  public static 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.
-   */
-  public static 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_STRING
-						 + 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);
-	  }
-  }
+    /**
+     * 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) {
+        ReleaseId newReleaseId = releaseId;
+        if (newReleaseId.getVersion().contains(",")) {
+            // this is actually a comma-separated list of release ids
+            newReleaseId =
+                    loadArtifact(newReleaseId.getGroupId(), newReleaseId.getArtifactId(), newReleaseId.getVersion());
+        } else {
+            kieContainer = kieServices.newKieContainer(newReleaseId);
+        }
+        synchronized (containers) {
+            if (newReleaseId != null) {
+                logger.info("Add a new kieContainer in containers: releaseId: " + newReleaseId.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_STRING + 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_STRING + 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) {
+
+        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_STRING + 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());
+        }
+
+        // stop all session threads
+        for (PolicySession session : sessions.values()) {
+            session.stopThread();
+        }
+
+        // update the version
+        Results results = kieContainer.updateToVersion(releaseId);
+
+        // restart all session threads, and notify the sessions
+        for (PolicySession session : sessions.values()) {
+            session.startThread();
+            session.updated();
+        }
+
+        return results;
+    }
+
+    /**
+     * @return all existing 'PolicyContainer' instances
+     */
+    public static Collection<PolicyContainer> getPolicyContainers() {
+        synchronized (containers) {
+            return new HashSet<>(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().isEmpty()) {
+            start();
+        }
+
+        // return current set of PolicySessions
+        synchronized (sessions) {
+            return new HashSet<>(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 && scanner == null && version != null
+                && ("LATEST".equals(version) || "RELEASE".equals(version) || 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()) {
+                    @Override
+                    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}
+     */
+    @Override
+    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}
+     */
+    @Override
+    public synchronized boolean stop() {
+        if (isStarted) {
+            Collection<PolicySession> localSessions;
+
+            synchronized (sessions) {
+                // local set containing all of the sessions
+                localSessions = new HashSet<>(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_STRING + feature.getClass().getName(), e);
+                    }
+                }
+            }
+            isStarted = false;
+        }
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    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}
+     */
+    @Override
+    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<>(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_STRING + 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.
+     */
+    public static 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.
+     */
+    public static 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_STRING + 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/properties/Lockable.java b/policy-core/src/main/java/org/onap/policy/drools/properties/DroolsProperties.java
index ee1e7400..dad9d946 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/properties/Lockable.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/properties/DroolsProperties.java
@@ -20,26 +20,23 @@
 
 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();
+public interface DroolsProperties {
+
+    /* Controller Properties */
+
+    public static final String PROPERTY_CONTROLLER_NAME = "controller.name";
+
+    /* 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/PolicyProperties.java b/policy-core/src/main/java/org/onap/policy/drools/properties/PolicyProperties.java
deleted file mode 100644
index 4cb5ef43..00000000
--- a/policy-core/src/main/java/org/onap/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.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
deleted file mode 100644
index 6fa2e58b..00000000
--- a/policy-core/src/main/java/org/onap/policy/drools/properties/Startable.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * policy-core
- * ================================================================================
- * Copyright (C) 2017-2018 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();
-	
-	/**
-	 * 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();
-	
-	/**
-	 * 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();
-	
-	/**
-	 * is it alive?
-	 * @return boolean.  true if alive, otherwise false
-	 */
-	public boolean isAlive();
-}