[POLICY-8] cleaned up unused code

Change-Id: Ifebf67db574e1c4eadf9d50ca0f178ab7ddba033
Signed-off-by: Jorge Hernandez <jh1730@att.com>

12 files changed, 0 insertions, 2319 deletions

diff --git a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/IntegrityAuditIntegrationTest.java b/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/IntegrityAuditIntegrationTest.java
deleted file mode 100644
index c57e3e97..00000000
--- a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/IntegrityAuditIntegrationTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * 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.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.im.PMStandbyStateChangeNotifier;
-import org.openecomp.policy.drools.persistence.DroolsPdpEntity;
-import org.openecomp.policy.drools.persistence.DroolsPdpImpl;
-import org.openecomp.policy.drools.persistence.DroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.DroolsPersistenceProperties;
-import org.openecomp.policy.drools.persistence.JpaDroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.PersistenceFeature;
-import org.openecomp.policy.drools.persistence.XacmlPersistenceProperties;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
-
-/*
- * Cloned from StandbyStateManagement.java in support of US673632.
- * See MultiSite_v1-10.ppt, slide 38
- */
-public class IntegrityAuditIntegrationTest {
-		
-	
-	public static final String INTEGRITY_MONITOR_PROPERTIES_FILE="src/test/server/config/IntegrityMonitor.properties";
-		
-	/*
-	 * Sleep 5 seconds after each test to allow interrupt (shutdown) recovery.
-	 */
-	private long interruptRecoveryTime = 5000;
-	
-	/*
-	 * See the IntegrityMonitor.getJmxUrl() method for the rationale behind this jmx related processing.
-	 */
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-		
-		PolicyLogger.info("setUpClass: Entering");
-
-		String userDir = System.getProperty("user.dir");
-		PolicyLogger.debug("setUpClass: userDir=" + userDir);
-		System.setProperty("com.sun.management.jmxremote.port", "9980");
-		System.setProperty("com.sun.management.jmxremote.authenticate","false");
-				
-		// Make sure path to config directory is set correctly in PolicyContainer.main
-		// Also make sure we ignore HTTP server failures resulting from port conflicts.
-		PolicyContainer.isUnitTesting = true;
-		
-		/*
-		 * Setting isUnitTesting to true ensures
-		 * 
-		 * 1) That we load test version of properties files
-		 * 
-		 * and
-		 * 
-		 * 2) that we use dbAuditSimulate() method, because all we care about
-		 * for this JUnit testing is that the audits are executed.
-		 */
-		IntegrityAudit.isUnitTesting = true;
-		
-		initializeDb();
-		
-		PolicyLogger.info("setUpClass: Exiting");
-		
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-				
-	}
-
-	@Before
-	public void setUp() throws Exception {
-		
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		
-	}
-
-	
-	/*
-	 * Verifies that audit thread starts successfully.
-	 */
-	//@Ignore
-	@Test
-	public void testAuditInit() throws Exception {
-		
-		PolicyLogger.debug("\n\ntestAuditInit: Entering\n\n");
-
-		PolicyLogger.debug("testAuditInit: Reading IntegrityMonitorProperties");
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				INTEGRITY_MONITOR_PROPERTIES_FILE)));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-		String thisPdpId = IntegrityMonitorProperties
-				.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-		
-		PolicyLogger.debug("testAuditInit: Reading xacmlPersistenceProperties");
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-		
-		PolicyLogger.debug("testAuditInit: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		PolicyLogger.debug("testAuditInit: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		PolicyLogger.debug("testAuditInit: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-		
-		PolicyLogger.debug("testAuditInit: Cleaning up tables");
-		conn.deleteAllSessions();
-		conn.deleteAllPdps();
-		
-		/*
-		 * Insert this PDP as designated.  Initial standby state will be 
-		 * either null or cold standby.   
-		 */
-		PolicyLogger.debug("testAuditInit: Inserting PDP=" + thisPdpId + " as designated");
-		DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, true, 4, new Date());
-		conn.insertPdp(pdp);
-		DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
-		PolicyLogger.debug("testAuditInit: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-		
-		PolicyLogger.debug("testAuditInit: Instantiating stateManagement object");
-		StateManagement sm = new StateManagement(emfXacml, "dummy");
-		sm.deleteAllStateManagementEntities();
-		sm = new StateManagement(emfXacml, thisPdpId);
-		PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
-		sm.addObserver(pmStandbyStateChangeNotifier);
-				
-		PolicyLogger.debug("testAuditInit: Running policy-management.Main class, designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
-		policyManagementRunner.start();
-		
-		PolicyLogger.debug("testAuditInit: Runner started; Sleeping "
-				+ interruptRecoveryTime + "ms before promoting PDP="
-				+ thisPdpId);
-		Thread.sleep(interruptRecoveryTime);
-		
-		IntegrityAudit integrityAudit = PersistenceFeature.getIntegrityAudit();
-		PolicyLogger.debug("testAuditInit: isThreadInitialized=" + integrityAudit.isThreadInitialized());
-		assertTrue("AuditThread not initialized!?",integrityAudit.isThreadInitialized());
-				
-		PolicyLogger.debug("testAuditInit: Stopping auditThread");
-		integrityAudit.stopAuditThread();
-		Thread.sleep(1000);
-		//This will interrupt thread.  However, the thread will not die.  It keeps on ticking and trying to
-		//run the audit.
-		assertTrue("AuditThread not still running after stopAuditThread invoked!?",integrityAudit.isThreadInitialized());
-
-		PolicyLogger.debug("testAuditInit: Stopping policyManagementRunner");
-		policyManagementRunner.stopRunner();
-		
-		PolicyLogger.debug("\n\ntestAuditInit: Exiting\n\n");
-		Thread.sleep(interruptRecoveryTime);
-
-	}	
-	
-    /*
-     * This method initializes and cleans the DB so that PDP-D will be able to 
-     * store IntegrityAuditEntity in the DB.
-     */
-	public static void initializeDb(){
-		
-		PolicyLogger.debug("initializeDb: Entering");
-		
-    	Properties cleanProperties = new Properties();
-    	cleanProperties.put(DroolsPersistenceProperties.DB_DRIVER,"org.h2.Driver");
-    	cleanProperties.put(DroolsPersistenceProperties.DB_URL, "jdbc:h2:file:./sql/drools");
-    	cleanProperties.put(DroolsPersistenceProperties.DB_USER, "sa");
-    	cleanProperties.put(DroolsPersistenceProperties.DB_PWD, "");
-    	//EntityManagerFactory emf = Persistence.createEntityManagerFactory("schemaPU", cleanProperties);
-    	EntityManagerFactory emf = Persistence.createEntityManagerFactory("junitDroolsPU", cleanProperties);
-		
-		EntityManager em = emf.createEntityManager();
-		// Start a transaction
-		EntityTransaction et = em.getTransaction();
-
-		et.begin();
-
-		// Clean up the DB
-		em.createQuery("Delete from IntegrityAuditEntity").executeUpdate();
-
-		// commit transaction
-		et.commit();
-		em.close();
-		
-		PolicyLogger.debug("initializeDb: Exiting");
-	}	
-	
-	private class PolicyManagementRunner extends Thread {
-
-		public void run() {
-			PolicyLogger.info("PolicyManagementRunner.run: Entering");
-			String args[] = { "src/main/server/config" };
-			try {
-				Main.main(args);
-			} catch (Exception e) {
-				PolicyLogger
-						.info("PolicyManagementRunner.run: Exception thrown from Main.main(), message="
-								+ e.getMessage());
-			}
-			PolicyLogger.info("PolicyManagementRunner.run: Exiting");
-		}
-		
-		public void stopRunner() {
-			PolicyEngine.manager.shutdown();
-		}
-
-	}
-	
-}
diff --git a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/StandbyStateManagementTest.java b/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/StandbyStateManagementTest.java
deleted file mode 100644
index b7c3d55e..00000000
--- a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/StandbyStateManagementTest.java
+++ /dev/null
@@ -1,1406 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * 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.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
-import org.apache.commons.lang3.time.DateUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.drools.core.DroolsPDPIntegrityMonitor;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.im.PMStandbyStateChangeNotifier;
-import org.openecomp.policy.drools.persistence.DroolsPdp;
-import org.openecomp.policy.drools.persistence.DroolsPdpEntity;
-import org.openecomp.policy.drools.persistence.DroolsPdpImpl;
-import org.openecomp.policy.drools.persistence.DroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.DroolsPdpsElectionHandler;
-import org.openecomp.policy.drools.persistence.DroolsPersistenceProperties;
-import org.openecomp.policy.drools.persistence.JpaDroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.XacmlPersistenceProperties;
-import org.openecomp.policy.drools.system.Main;
-
-/*
- * All JUnits are designed to run in the local development environment
- * where they have write privileges and can execute time-sensitive
- * tasks.
- * 
- * These tests can be run as JUnits, but there is some issue with running them
- * as part of a "mvn install" build.  Also, they take a very long time to run
- * due to many real time breaks.  Consequently, they are marked as @Ignore and
- * only run from the desktop.
- * 
- */
-public class StandbyStateManagementTest {
-	private static Logger  logger = FlexLogger.getLogger(StandbyStateManagementTest.class);
-	/*
-	 * Currently, the DroolsPdpsElectionHandler.DesignationWaiter is invoked every ten seconds, starting 
-	 * at ten seconds after the minute boundary (e.g. 13:05:10). So, an 80 second sleep should be 
-	 * sufficient to ensure that we wait for the DesignationWaiter to do its job, before 
-	 * checking the results. 
-	 */
-	long sleepTime = 80000;
-	
-	/*
-	 * DroolsPdpsElectionHandler runs every ten seconds, so a 15 second sleep should be 
-	 * plenty to ensure it has time to re-promote this PDP.
-	 */
-	long electionWaitSleepTime = 15000;
-	
-	/*
-	 * Sleep 5 seconds after each test to allow interrupt (shutdown) recovery.
-	 */
-	long interruptRecoveryTime = 5000;
-	
-	private static EntityManagerFactory emfx;
-	private static EntityManagerFactory emfd;
-	private static EntityManager emx;
-	private static EntityManager emd;
-	private static EntityTransaction et;
-
-	/*
-	 * See the IntegrityMonitor.getJmxUrl() method for the rationale behind this jmx related processing.
-	 */
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-		
-		String userDir = System.getProperty("user.dir");
-		logger.debug("setUpClass: userDir=" + userDir);
-		System.setProperty("com.sun.management.jmxremote.port", "9980");
-		System.setProperty("com.sun.management.jmxremote.authenticate","false");
-				
-		// Make sure path to config directory is set correctly in PolicyContainer.main
-		// Also make sure we ignore HTTP server failures resulting from port conflicts.
-		PolicyContainer.isUnitTesting = true;
-		
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-	}
-
-	@Before
-	public void setUp() throws Exception {
-		//Create teh data access for xaml db
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-
-		emfx = Persistence.createEntityManagerFactory("junitXacmlPU", xacmlPersistenceProperties);
-
-		// Create an entity manager to use the DB
-		emx = emfx.createEntityManager();
-		
-		//Create the data access for drools db
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-
-		emfd = Persistence.createEntityManagerFactory("junitDroolsPU", droolsPersistenceProperties);
-
-		// Create an entity manager to use the DB
-		emd = emfd.createEntityManager();
-	}
-
-	@After
-	public void tearDown() throws Exception {
-				
-	}
-	
-	public void cleanXacmlDb(){
-		et = emx.getTransaction();
-		
-		et.begin();
-		// Make sure we leave the DB clean
-		emx.createQuery("DELETE FROM StateManagementEntity").executeUpdate();
-		emx.createQuery("DELETE FROM ResourceRegistrationEntity").executeUpdate();
-		emx.createQuery("DELETE FROM ForwardProgressEntity").executeUpdate();
-		emx.createQuery("DELETE FROM IntegrityAuditEntity").executeUpdate();
-		emx.flush();
-		et.commit();
-	}
-	
-	public void cleanDroolsDb(){
-		et = emd.getTransaction();
-		
-		et.begin();
-		// Make sure we leave the DB clean
-		emd.createQuery("DELETE FROM DroolsPdpEntity").executeUpdate();
-		emd.createQuery("DELETE FROM DroolsSessionEntity").executeUpdate();
-		emd.createQuery("DELETE FROM SessionInfo").executeUpdate();
-		emd.createQuery("DELETE FROM WorkItemInfo").executeUpdate();
-		emd.createQuery("DELETE FROM IntegrityAuditEntity").executeUpdate();
-		emd.flush();
-		et.commit();
-	}
-	
-	/*
-	 * These JUnit tests must be run in an eclipse environment by right-clicking
-	 * StandbyStateManagementTest and selecting "Run As" -> "JUnit Test". If you 
-	 * run them as part of mvn install, they will fail with an error "JUnit The 
-	 * forked VM terminated without saying properly goodbye"
-	 */
-	@Ignore
-	@Test
-	public void runAllTests() throws Exception {
-		//testColdStandby();
-		//testHotStandby1();
-		//testHotStandby2();
-		//testLocking1();
-		//testLocking2();
-		//testSanitizeDesignatedList();
-		//testComputeMostRecentPrimary();
-		//testComputeDesignatedPdp();
-		testPMStandbyStateChangeNotifier();
-	}
-	
-	private void testPMStandbyStateChangeNotifier() throws Exception {
-		logger.debug("\n\ntestPMStandbyStateChangeNotifier: Entering\n\n");
-		cleanXacmlDb();
-
-		logger.debug("testPMStandbyStateChangeNotifier: Reading IntegrityMonitorProperties");
-
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				"src/test/server/config/IntegrityMonitor.properties")));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-
-		logger.debug("testPMStandbyStateChangeNotifier: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testPMStandbyStateChangeNotifier: Reading xacmlPersistenceProperties");
-
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
-		logger.debug("testPMStandbyStateChangeNotifier: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		//Now get the StateManagement instance so we can register our observer
-		StateManagement sm = new StateManagement(emfXacml, "pdp1");
-
-		//Create an instance of the Observer
-		PMStandbyStateChangeNotifier pmNotifier = new PMStandbyStateChangeNotifier();
-
-		//Register the PMStandbyStateChangeNotifier Observer
-		sm.addObserver(pmNotifier);
-
-		//At this point the standbystatus = 'null'
-		sm.lock();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.NULL_VALUE));
-
-		sm.unlock();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.NULL_VALUE));
-
-		//Adding standbystatus=hotstandby
-		sm.demote();
-		System.out.println(pmNotifier.getPreviousStandbyStatus());
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
-		//Now making standbystatus=coldstandby
-		sm.lock();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
-		//standbystatus = hotstandby
-		sm.unlock();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
-		//standbystatus = providingservice
-		sm.promote();
-		//The previousStandbyStatus is not updated until after the delay activation expires
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
-		//Sleep long enough for the delayActivationTimer to run
-		Thread.sleep(5000);
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.PROVIDING_SERVICE));
-
-		//standbystatus = providingservice
-		sm.promote();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.PROVIDING_SERVICE));
-		
-		//standbystatus = coldstandby
-		sm.lock();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
-		//standbystatus = hotstandby
-		sm.unlock();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
-		//standbystatus = hotstandby
-		sm.demote();
-		assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-		
-	}
-	
-	
-	//@Ignore
-	//@Test
-	public void testSanitizeDesignatedList() throws Exception {
-
-		logger.debug("\n\ntestSanitizeDesignatedList: Entering\n\n");
-		
-		/*
-		 * Get a DroolsPdpsConnector
-		 */
-		logger.debug("testSanitizeDesignatedList: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testSanitizeDesignatedList: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector droolsPdpsConnector = new JpaDroolsPdpsConnector(emfDrools);
-		
-		/*
-		 * Create 4 pdpd all not designated
-		 */
-		DroolsPdp pdp1 = new DroolsPdpImpl("pdp1", false, 4, new Date());
-		DroolsPdp pdp2 = new DroolsPdpImpl("pdp2", false, 4, new Date());
-		DroolsPdp pdp3 = new DroolsPdpImpl("pdp3", false, 4, new Date());
-		DroolsPdp pdp4 = new DroolsPdpImpl("pdp4", false, 4, new Date());
-		
-		ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
-		listOfDesignated.add(pdp1);
-		listOfDesignated.add(pdp2);
-		listOfDesignated.add(pdp3);
-		listOfDesignated.add(pdp4);
-		
-		DroolsPDPIntegrityMonitor droolsPDPIntegrityMonitor;
-		try{
-			droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.init("src/test/server/config");
-		}catch(Exception e){
-			//If it already exists, just get it
-			droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
-		}
-		DroolsPdpsElectionHandler droolsPdpsElectionHandler =  new DroolsPdpsElectionHandler(droolsPdpsConnector, pdp1, droolsPDPIntegrityMonitor);
-		
-		listOfDesignated = droolsPdpsElectionHandler.santizeDesignatedList(listOfDesignated);
-		
-		logger.debug("\n\ntestSanitizeDesignatedList: listOfDesignated.size = " + listOfDesignated.size() + "\n\n");
-		
-		assertTrue(listOfDesignated.size()==4);
-		
-		/*
-		 * Now make 2 designated
-		 */
-		pdp1.setDesignated(true);
-		pdp2.setDesignated(true);
-		
-		listOfDesignated = droolsPdpsElectionHandler.santizeDesignatedList(listOfDesignated);
-		
-		logger.debug("\n\ntestSanitizeDesignatedList: listOfDesignated.size after 2 designated = " + listOfDesignated.size() + "\n\n");
-		
-		assertTrue(listOfDesignated.size()==2);
-		assertTrue(listOfDesignated.contains(pdp1));
-		assertTrue(listOfDesignated.contains(pdp2));
-		
-		/*
-		 * Now all are designated.  But, we have to add back the previously non-designated nodes
-		 */
-		pdp3.setDesignated(true);
-		pdp4.setDesignated(true);
-		listOfDesignated.add(pdp3);
-		listOfDesignated.add(pdp4);
-		
-		listOfDesignated = droolsPdpsElectionHandler.santizeDesignatedList(listOfDesignated);
-		
-		logger.debug("\n\ntestSanitizeDesignatedList: listOfDesignated.size after all designated = " + listOfDesignated.size() + "\n\n");
-		
-		assertTrue(listOfDesignated.size()==4);
-		
-	}
-	
-	//@Ignore
-	//@Test
-	public void testComputeMostRecentPrimary() throws Exception {
-
-		logger.debug("\n\ntestComputeMostRecentPrimary: Entering\n\n");
-		
-		/*
-		 * Get a DroolsPdpsConnector
-		 */
-		logger.debug("testComputeMostRecentPrimary: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testComputeMostRecentPrimary: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector droolsPdpsConnector = new JpaDroolsPdpsConnector(emfDrools);
-		
-		/*
-		 * Create 4 pdpd all not designated
-		 */
-		long designatedDateMS = new Date().getTime();
-		DroolsPdp pdp1 = new DroolsPdpImpl("pdp1", false, 4, new Date());
-		pdp1.setDesignatedDate(new Date(designatedDateMS - 2));
-		
-		DroolsPdp pdp2 = new DroolsPdpImpl("pdp2", false, 4, new Date());
-		//oldest
-		pdp2.setDesignatedDate(new Date(designatedDateMS - 3));
-		
-		DroolsPdp pdp3 = new DroolsPdpImpl("pdp3", false, 4, new Date());
-		pdp3.setDesignatedDate(new Date(designatedDateMS - 1));
-
-		DroolsPdp pdp4 = new DroolsPdpImpl("pdp4", false, 4, new Date());
-		//most recent
-		pdp4.setDesignatedDate(new Date(designatedDateMS));
-		
-		ArrayList<DroolsPdp> listOfAllPdps = new ArrayList<DroolsPdp>();
-		listOfAllPdps.add(pdp1);
-		listOfAllPdps.add(pdp2);
-		listOfAllPdps.add(pdp3);
-		listOfAllPdps.add(pdp4);
-				
-		
-		ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
-		listOfDesignated.add(pdp1);
-		listOfDesignated.add(pdp2);
-		listOfDesignated.add(pdp3);
-		listOfDesignated.add(pdp4);
-		
-		
-		/*
-		 * Because the way we sanitize the listOfDesignated, it will always contain all hot standby 
-		 * or all designated members.
-		 */
-		DroolsPDPIntegrityMonitor droolsPDPIntegrityMonitor;
-		try{
-			droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.init("src/test/server/config");
-		}catch(Exception e){
-			//If it already exists, just get it
-			droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
-		}
-		DroolsPdpsElectionHandler droolsPdpsElectionHandler =  new DroolsPdpsElectionHandler(droolsPdpsConnector, pdp1, droolsPDPIntegrityMonitor);
-	
-		DroolsPdp mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-		
-		logger.debug("\n\ntestComputeMostRecentPrimary: mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-		
-		/*
-		 * If all of the pdps are included in the listOfDesignated and none are designated, it will choose 
-		 * the one which has the most recent designated date.
-		 */
-		assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-		
-		/*
-		 * Now let's designate all of those on the listOfDesignated.  It will choose the first one designated
-		 */
-		pdp1.setDesignated(true);
-		pdp2.setDesignated(true);
-		pdp3.setDesignated(true);
-		pdp4.setDesignated(true);
-		
-		mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-		
-		logger.debug("\n\ntestComputeMostRecentPrimary: All designated all on list, mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-		
-		/*
-		 * If all of the pdps are included in the listOfDesignated and all are designated, it will choose 
-		 * the one which was designated first
-		 */
-		assertTrue(mostRecentPrimary.getPdpId().equals("pdp2"));
-		
-		/*
-		 * Now we will designate only 2 and put just them in the listOfDesignated.  The algorithm will now
-		 * look for the most recently designated pdp which is not currently designated.
-		 */
-		pdp3.setDesignated(false);
-		pdp4.setDesignated(false);
-		
-		listOfDesignated.remove(pdp3);
-		listOfDesignated.remove(pdp4);
-		
-		mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-		
-		logger.debug("\n\ntestComputeMostRecentPrimary: mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-		
-		assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-		
-		
-		/*
-		 * Now we will have none designated and put two of them in the listOfDesignated.  The algorithm will now
-		 * look for the most recently designated pdp regardless of whether it is currently marked as designated.
-		 */
-		pdp1.setDesignated(false);
-		pdp2.setDesignated(false);
-		
-		mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-		
-		logger.debug("\n\ntestComputeMostRecentPrimary: 2 on list mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-		
-		assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-		
-		/*
-		 * If we have only one pdp on in the listOfDesignated, the most recently designated pdp will be chosen, regardless
-		 * of its designation status
-		 */
-		listOfDesignated.remove(pdp1);
-		
-		mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-		
-		logger.debug("\n\ntestComputeMostRecentPrimary: 1 on list mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-		
-		assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-		
-		/*
-		 * Finally, if none are on the listOfDesignated, it will again choose the most recently designated pdp.
-		 */
-		listOfDesignated.remove(pdp2);
-
-		mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-		
-		logger.debug("\n\ntestComputeMostRecentPrimary: 0 on list mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-		
-		assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-		
-	}
-	
-	//@Ignore
-	//@Test
-	public void testComputeDesignatedPdp() throws Exception{
-		
-		logger.debug("\n\ntestComputeDesignatedPdp: Entering\n\n");
-		
-		/*
-		 * Get a DroolsPdpsConnector
-		 */
-		logger.debug("testComputeDesignatedPdp: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testComputeDesignatedPdp: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector droolsPdpsConnector = new JpaDroolsPdpsConnector(emfDrools);
-		
-		/*
-		 * Create 4 pdpd all not designated.  Two on site1. Two on site2
-		 */
-		long designatedDateMS = new Date().getTime();
-		DroolsPdp pdp1 = new DroolsPdpImpl("pdp1", false, 4, new Date());
-		pdp1.setDesignatedDate(new Date(designatedDateMS - 2));
-		pdp1.setSiteName("site1");
-		
-		DroolsPdp pdp2 = new DroolsPdpImpl("pdp2", false, 4, new Date());
-		pdp2.setDesignatedDate(new Date(designatedDateMS - 3));
-		pdp2.setSiteName("site1");
-
-		//oldest		
-		DroolsPdp pdp3 = new DroolsPdpImpl("pdp3", false, 4, new Date());
-		pdp3.setDesignatedDate(new Date(designatedDateMS - 4));
-		pdp3.setSiteName("site2");
-		
-		DroolsPdp pdp4 = new DroolsPdpImpl("pdp4", false, 4, new Date());
-		//most recent
-		pdp4.setDesignatedDate(new Date(designatedDateMS));
-		pdp4.setSiteName("site2");
-		
-		ArrayList<DroolsPdp> listOfAllPdps = new ArrayList<DroolsPdp>();
-		listOfAllPdps.add(pdp1);
-		listOfAllPdps.add(pdp2);
-		listOfAllPdps.add(pdp3);
-		listOfAllPdps.add(pdp4);
-				
-		
-		ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
-		
-		/*
-		 * We will first test an empty listOfDesignated. As we know from the previous JUnit,
-		 * the pdp with the most designated date will be chosen for mostRecentPrimary  
-		 */
-		
-		DroolsPDPIntegrityMonitor droolsPDPIntegrityMonitor;
-		try{
-			droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.init("src/test/server/config");
-		}catch(Exception e){
-			//If it already exists, just get it
-			droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
-		}
-		DroolsPdpsElectionHandler droolsPdpsElectionHandler =  new DroolsPdpsElectionHandler(droolsPdpsConnector, pdp1, droolsPDPIntegrityMonitor);
-		
-		DroolsPdp mostRecentPrimary = pdp4;
-	
-		DroolsPdp designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-		
-		/*
-		 * The designatedPdp should be null
-		 */
-		assertTrue(designatedPdp==null);
-		
-		/*
-		 * Now let's try having only one pdp in listOfDesignated, but not in the same site as the most recent primary
-		 */
-		
-		listOfDesignated.add(pdp2);
-		
-		designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-		
-		/*
-		 * Now the designatedPdp should be the one and only selection in the listOfDesignated
-		 */
-		assertTrue(designatedPdp.getPdpId().equals(pdp2.getPdpId()));
-		
-		/*
-		 * Now let's put 2 pdps in the listOfDesignated, neither in the same site as the mostRecentPrimary
-		 */
-		listOfDesignated.add(pdp1);
-		
-		designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-		
-		/*
-		 * The designatedPdp should now be the one with the lowest lexiographic score - pdp1
-		 */
-		assertTrue(designatedPdp.getPdpId().equals(pdp1.getPdpId()));
-		
-		/*
-		 * Finally, we will have 2 pdps in the listOfDesignated, one in the same site with the mostRecentPrimary
-		 */
-		listOfDesignated.remove(pdp1);
-		listOfDesignated.add(pdp3);
-		
-		designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-		
-		/*
-		 * The designatedPdp should now be the one on the same site as the mostRecentPrimary
-		 */
-		assertTrue(designatedPdp.getPdpId().equals(pdp3.getPdpId()));
-	}
-	
-	
-	//@Ignore
-	//@Test
-	public void testColdStandby() throws Exception {
-
-		logger.debug("\n\ntestColdStandby: Entering\n\n");
-		cleanXacmlDb();
-		cleanDroolsDb();
-
-		logger.debug("testColdStandby: Reading IntegrityMonitorProperties");
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				"src/test/server/config/IntegrityMonitor.properties")));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-		String thisPdpId = IntegrityMonitorProperties
-				.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
-		logger.debug("testColdStandby: Reading xacmlPersistenceProperties");
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-		
-		logger.debug("testColdStandby: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		logger.debug("testColdStandby: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testColdStandby: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-		
-		logger.debug("testColdStandby: Cleaning up tables");
-		conn.deleteAllSessions();
-		conn.deleteAllPdps();
-	
-		logger.debug("testColdStandby: Inserting PDP=" + thisPdpId + " as designated");
-		DroolsPdp pdp = new DroolsPdpImpl(thisPdpId, true, 4, new Date());
-		conn.insertPdp(pdp);
-		DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.debug("testColdStandby: After insertion, DESIGNATED="
-				+ droolsPdpEntity.isDesignated() + " for PDP=" + thisPdpId);
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-
-		/*
-		 * When the Standby Status changes (from providingservice) to hotstandby
-		 * or coldstandby,the Active/Standby selection algorithm must stand down
-		 * if thePDP-D is currently the lead/active node and allow another PDP-D
-		 * to take over.
-		 * 
-		 * It must also call lock on all engines in the engine management.
-		 * 
-		 * Yes, this is kludgy, but we have a chicken and egg problem here: we
-		 * need a StateManagement object to invoke the
-		 * deleteAllStateManagementEntities method.
-		 */
-		logger.debug("testColdStandby: Instantiating stateManagement object");
-		StateManagement sm = new StateManagement(emfXacml, "dummy");
-		sm.deleteAllStateManagementEntities();
-		sm = new StateManagement(emfXacml, thisPdpId);
-		PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
-		sm.addObserver(pmStandbyStateChangeNotifier);
-		
-		// Artificially putting a PDP into service is really a two step process, 1)
-		// inserting it as designated and 2) promoting it so that its standbyStatus
-		// is providing service.
-		
-		logger.debug("testColdStandby: Running policy-management.Main class");
-		PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
-		policyManagementRunner.start();
-		
-		logger.debug("testColdStandby: Runner started; Sleeping "
-				+ interruptRecoveryTime + "ms before promoting PDP="
-				+ thisPdpId);
-		Thread.sleep(interruptRecoveryTime);
-
-		logger.debug("testColdStandby: Promoting PDP=" + thisPdpId);
-		sm.promote();		
-		
-		String standbyStatus = sm.getStandbyStatus(thisPdpId);
-		logger.debug("testColdStandby: Before locking, PDP=" + thisPdpId + " has standbyStatus="
-				+ standbyStatus);
-		
-		logger.debug("testColdStandby: Locking sm");
-		sm.lock();
-		
-		Thread.sleep(interruptRecoveryTime);
-		/*
-		 * Verify that the PDP is no longer designated.
-		 */
-		droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.debug("testColdStandby: After lock sm.lock() invoked, DESIGNATED="
-				+ droolsPdpEntity.isDesignated() + " for PDP=" + thisPdpId);
-		assertTrue(droolsPdpEntity.isDesignated() == false);
-		
-		logger.debug("testColdStandby: Stopping policyManagementRunner");
-		//policyManagementRunner.stopRunner();
-	
-		logger.debug("\n\ntestColdStandby: Exiting\n\n");
-		Thread.sleep(interruptRecoveryTime);
-
-	}
-	
-	/*
-	 * Tests hot standby when there is only one PDP.
-	 */
-	//@Ignore
-	//@Test
-	public void testHotStandby1() throws Exception {
-	
-		logger.debug("\n\ntestHotStandby1: Entering\n\n");
-		cleanXacmlDb();
-		cleanDroolsDb();
-		
-		logger.debug("testHotStandby1: Reading IntegrityMonitorProperties");
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				"src/test/server/config/IntegrityMonitor.properties")));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-		String thisPdpId = IntegrityMonitorProperties
-				.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-		
-		logger.debug("testHotStandby1: Reading xacmlPersistenceProperties");
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-		
-		logger.debug("testHotStandby1: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		logger.debug("testHotStandby1: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testHotStandby1: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-		
-		logger.debug("testHotStandby1: Cleaning up tables");
-		conn.deleteAllSessions();
-		conn.deleteAllPdps();
-					
-		/*
-		 * Insert this PDP as not designated.  Initial standby state will be 
-		 * either null or cold standby.   Demoting should transit state to
-		 * hot standby.
-		 */
-		logger.debug("testHotStandby1: Inserting PDP=" + thisPdpId + " as not designated");
-		Date yesterday = DateUtils.addDays(new Date(), -1);
-		DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, false, 4, yesterday);
-		conn.insertPdp(pdp);
-		DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.debug("testHotStandby1: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == false);
-		
-		logger.debug("testHotStandby1: Instantiating stateManagement object");
-		StateManagement sm = new StateManagement(emfXacml, "dummy");
-		sm.deleteAllStateManagementEntities();
-		sm = new StateManagement(emfXacml, thisPdpId);
-		PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
-		sm.addObserver(pmStandbyStateChangeNotifier);
-
-		logger.debug("testHotStandby1: Demoting PDP=" + thisPdpId);
-		// demoting should cause state to transit to hotstandby
-		sm.demote();
-		
-		logger.debug("testHotStandby1: Running policy-management.Main class");
-		PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
-		policyManagementRunner.start();
-				
-		logger.debug("testHotStandby1: Sleeping "
-				+ sleepTime
-				+ "ms, to allow JpaDroolsPdpsConnector time to check droolspdpentity table");
-		Thread.sleep(sleepTime);
-		
-		/*
-		 * Verify that this formerly un-designated PDP in HOT_STANDBY is now designated and providing service.
-		 */
-		droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.debug("testHotStandby1: After sm.demote() invoked, DESIGNATED="
-				+ droolsPdpEntity.isDesignated() + " for PDP=" + thisPdpId);
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-		String standbyStatus = sm.getStandbyStatus(thisPdpId);
-		logger.debug("testHotStandby1: After demotion, PDP=" + thisPdpId + " has standbyStatus="
-				+ standbyStatus);
-		assertTrue(standbyStatus != null  &&  standbyStatus.equals(StateManagement.PROVIDING_SERVICE));
-				
-		logger.debug("testHotStandby1: Stopping policyManagementRunner");
-		//policyManagementRunner.stopRunner();		
-	
-		logger.debug("\n\ntestHotStandby1: Exiting\n\n");
-		Thread.sleep(interruptRecoveryTime);
-
-	}
-
-	/*
-	 * Tests hot standby when two PDPs are involved.
-	 */
-	//@Ignore
-	//@Test
-	public void testHotStandby2() throws Exception {
-
-		logger.info("\n\ntestHotStandby2: Entering\n\n");
-		cleanXacmlDb();
-		cleanDroolsDb();
-		
-		logger.info("testHotStandby2: Reading IntegrityMonitorProperties");
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				"src/test/server/config/IntegrityMonitor.properties")));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-		String thisPdpId = IntegrityMonitorProperties
-				.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-		
-		logger.info("testHotStandby2: Reading xacmlPersistenceProperties");
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-		
-		logger.info("testHotStandby2: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		logger.info("testHotStandby2: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.info("testHotStandby2: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-		
-		logger.info("testHotStandby2: Cleaning up tables");
-		conn.deleteAllSessions();
-		conn.deleteAllPdps();
-		
-		/*
-		 * Insert a PDP that's designated but not current.
-		 */
-		String activePdpId = "pdp2";
-		logger.info("testHotStandby2: Inserting PDP=" + activePdpId + " as stale, designated PDP");
-		Date yesterday = DateUtils.addDays(new Date(), -1);
-		DroolsPdp pdp = new DroolsPdpImpl(activePdpId, true, 4, yesterday);
-		conn.insertPdp(pdp);
-		DroolsPdpEntity droolsPdpEntity = conn.getPdp(activePdpId);
-		logger.info("testHotStandby2: After insertion, PDP=" + activePdpId + ", which is not current, has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-		
-		/*
-		 * Promote the designated PDP.
-		 * 
-		 * We have a chicken and egg problem here: we need a StateManagement
-		 * object to invoke the deleteAllStateManagementEntities method.
-		 */
-		logger.info("testHotStandby2: Promoting PDP=" + activePdpId);
-		StateManagement sm = new StateManagement(emfXacml, "dummy");
-		sm.deleteAllStateManagementEntities();
-		sm = new StateManagement(emfXacml, activePdpId);//pdp2
-		PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
-		sm.addObserver(pmStandbyStateChangeNotifier);
-		
-		// Artificially putting a PDP into service is really a two step process, 1)
-		// inserting it as designated and 2) promoting it so that its standbyStatus
-		// is providing service.
-				
-		/*
-		 * Insert this PDP as not designated.  Initial standby state will be 
-		 * either null or cold standby.   Demoting should transit state to
-		 * hot standby.
-		 */
-		logger.info("testHotStandby2: Inserting PDP=" + thisPdpId + " as not designated");
-		pdp = new DroolsPdpImpl(thisPdpId, false, 4, yesterday);
-		conn.insertPdp(pdp);
-		droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.info("testHotStandby2: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == false);
-		
-		logger.info("testHotStandby2: Demoting PDP=" + thisPdpId);//pdp1
-		StateManagement sm2 = new StateManagement(emfXacml, thisPdpId);
-		sm2.addObserver(pmStandbyStateChangeNotifier);
-		
-		logger.info("testHotStandby2: Running policy-management.Main class");
-		PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner(); //pdp1
-		policyManagementRunner.start();
-		
-		logger.info("testHotStandby2: Runner started; Sleeping "
-				+ interruptRecoveryTime + "ms before promoting/demoting");
-		Thread.sleep(interruptRecoveryTime);
-
-		logger.info("testHotStandby2: Runner started; promoting PDP=" + activePdpId);//pdpd2xs
-		//at this point, the newly created pdp will have set the state to disabled/failed/cold standby
-		//because it is stale. So, it cannot be promoted.  We need to call sm.enableNotFailed() so we
-		//can promote it and demote the other pdp - else the other pdp will just spring back to providingservice
-		sm.enableNotFailed();//pdp1
-		sm.promote();
-		String standbyStatus = sm.getStandbyStatus(activePdpId);
-		logger.info("testHotStandby2: After promoting, PDP=" + activePdpId + " has standbyStatus="
-				+ standbyStatus);
-		
-		// demoting PDP should ensure that state transits to hotstandby
-		logger.info("testHotStandby2: Runner started; demoting PDP=" + thisPdpId);
-		sm2.demote();//pdp1
-		standbyStatus = sm.getStandbyStatus(thisPdpId);
-		logger.info("testHotStandby2: After demoting, PDP=" + thisPdpId + " has standbyStatus="
-				+ standbyStatus);
-		
-		logger.info("testHotStandby2: Sleeping "
-				+ sleepTime
-				+ "ms, to allow JpaDroolsPdpsConnector time to check droolspdpentity table");
-		Thread.sleep(sleepTime);
-		
-		/*
-		 * Verify that this PDP, demoted to HOT_STANDBY, is now
-		 * re-designated and providing service.
-		 */
-		droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.info("testHotStandby2: After demoting PDP=" + activePdpId
-				+ ", DESIGNATED=" + droolsPdpEntity.isDesignated()
-				+ " for PDP=" + thisPdpId);
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-		standbyStatus = sm2.getStandbyStatus(thisPdpId);
-		logger.info("testHotStandby2: After demoting PDP=" + activePdpId
-				+ ", PDP=" + thisPdpId + " has standbyStatus=" + standbyStatus);
-		assertTrue(standbyStatus != null
-				&& standbyStatus.equals(StateManagement.PROVIDING_SERVICE));
-				
-		logger.info("testHotStandby2: Stopping policyManagementRunner");
-		//policyManagementRunner.stopRunner();		
-
-		logger.info("\n\ntestHotStandby2: Exiting\n\n");
-		Thread.sleep(interruptRecoveryTime);
-
-	}
-	
-	/*
-	 * 1) Inserts and designates this PDP, then verifies that startTransaction
-	 * is successful.
-	 * 
-	 * 2) Demotes PDP, and verifies that because there is only one PDP, it will
-	 * be immediately re-promoted, thus allowing startTransaction to be
-	 * successful.
-	 * 
-	 * 3) Locks PDP and verifies that startTransaction results in
-	 * AdministrativeStateException.
-	 * 
-	 * 4) Unlocks PDP and verifies that startTransaction results in
-	 * StandbyStatusException.
-	 * 
-	 * 5) Promotes PDP and verifies that startTransaction is once again
-	 * successful.
-	 */
-	//@Ignore
-	//@Test
-	public void testLocking1() throws Exception {
-		logger.debug("testLocking1: Entry");
-		cleanXacmlDb();
-		cleanDroolsDb();		
-		
-		logger.debug("testLocking1: Reading IntegrityMonitorProperties");
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				"src/test/server/config/IntegrityMonitor.properties")));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-		String thisPdpId = IntegrityMonitorProperties
-				.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
-		logger.debug("testLocking1: Reading xacmlPersistenceProperties");
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-		
-		logger.debug("testLocking1: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		logger.debug("testLocking1: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testLocking1: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-		
-		logger.debug("testLocking1: Cleaning up tables");
-		conn.deleteAllSessions();
-		conn.deleteAllPdps();
-		
-		/*
-		 * Insert this PDP as designated.  Initial standby state will be 
-		 * either null or cold standby.   
-		 */
-		logger.debug("testLocking1: Inserting PDP=" + thisPdpId + " as designated");
-		DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, true, 4, new Date());
-		conn.insertPdp(pdp);
-		DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.debug("testLocking1: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-		
-		logger.debug("testLocking1: Instantiating stateManagement object");
-		StateManagement sm = new StateManagement(emfXacml, "dummy");
-		sm.deleteAllStateManagementEntities();
-		sm = new StateManagement(emfXacml, thisPdpId);
-		PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
-		sm.addObserver(pmStandbyStateChangeNotifier);
-				
-		logger.debug("testLocking1: Running policy-management.Main class, designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
-		policyManagementRunner.start();
-		
-		logger.debug("testLocking1: Runner started; Sleeping "
-				+ interruptRecoveryTime + "ms before promoting PDP="
-				+ thisPdpId);
-		Thread.sleep(interruptRecoveryTime);
-
-		logger.debug("testLocking1: Promoting PDP=" + thisPdpId);
-		sm.promote();
-
-		logger.debug("testLocking1: Sleeping "
-				+ sleepTime
-				+ "ms, to allow time for policy-management.Main class to come up, designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		Thread.sleep(sleepTime);
-		
-		logger.debug("testLocking1: Waking up and invoking startTransaction on active PDP="
-				+ thisPdpId
-				+ ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor = (DroolsPDPIntegrityMonitor) IntegrityMonitor
-				.getInstance();
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			droolsPdpIntegrityMonitor.endTransaction();
-			logger.debug("testLocking1: As expected, transaction successful");
-		} catch (AdministrativeStateException e) {
-			logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (StandbyStatusException e) {
-			logger.error("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (Exception e) {
-			logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		}
-		
-		// demoting should cause state to transit to hotstandby, followed by re-promotion,
-		// since there is only one PDP.
-		logger.debug("testLocking1: demoting PDP=" + thisPdpId);
-		sm = droolsPdpIntegrityMonitor.getStateManager();
-		sm.demote();
-		
-		logger.debug("testLocking1: sleeping" + electionWaitSleepTime
-				+ " to allow election handler to re-promote PDP=" + thisPdpId);
-		Thread.sleep(electionWaitSleepTime);
-								
-		logger.debug("testLocking1: Invoking startTransaction on re-promoted PDP="
-				+ thisPdpId
-				+ ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			droolsPdpIntegrityMonitor.endTransaction();
-			logger.debug("testLocking1: As expected, transaction successful");
-		} catch (AdministrativeStateException e) {
-			logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (StandbyStatusException e) {
-			logger.error("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (Exception e) {
-			logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		}
-		
-		// locking should cause state to transit to cold standby
-		logger.debug("testLocking1: locking PDP=" + thisPdpId);
-		sm.lock();
-		
-		// Just to avoid any race conditions, sleep a little after locking
-		logger.debug("testLocking1: Sleeping a few millis after locking, to avoid race condition");
-		Thread.sleep(100);
-		
-		logger.debug("testLocking1: Invoking startTransaction on locked PDP="
-				+ thisPdpId
-				+ ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			logger.error("testLocking1: startTransaction unexpectedly successful");
-			assertTrue(false);
-		} catch (AdministrativeStateException e) {
-			logger.debug("testLocking1: As expected, caught AdministrativeStateException, message=" + e.getMessage());
-		} catch (StandbyStatusException e) {
-			logger.error("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (Exception e) {
-			logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		} finally {
-			droolsPdpIntegrityMonitor.endTransaction();
-		}		
-		
-		// unlocking should cause state to transit to hot standby and then providing service
-		logger.debug("testLocking1: unlocking PDP=" + thisPdpId);
-		sm.unlock();
-		
-		// Just to avoid any race conditions, sleep a little after locking
-		logger.debug("testLocking1: Sleeping a few millis after unlocking, to avoid race condition");
-		Thread.sleep(electionWaitSleepTime);
-		
-		logger.debug("testLocking1: Invoking startTransaction on unlocked PDP="
-				+ thisPdpId
-				+ ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			logger.error("testLocking1: startTransaction successful as expected");
-		} catch (AdministrativeStateException e) {
-			logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (StandbyStatusException e) {
-			logger.debug("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (Exception e) {
-			logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		} finally {
-			droolsPdpIntegrityMonitor.endTransaction();
-		}
-		
-		// demoting should cause state to transit to providing service
-		logger.debug("testLocking1: demoting PDP=" + thisPdpId);
-		sm.demote();
-		
-		// Just to avoid any race conditions, sleep a little after promoting
-		logger.debug("testLocking1: Sleeping a few millis after demoting, to avoid race condition");
-		Thread.sleep(100);
-		
-		logger.debug("testLocking1: Invoking startTransaction on demoted PDP="
-				+ thisPdpId
-				+ ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			droolsPdpIntegrityMonitor.endTransaction();
-			logger.debug("testLocking1: Unexpectedly, transaction successful");
-			assertTrue(false);
-		} catch (AdministrativeStateException e) {
-			logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (StandbyStatusException e) {
-			logger.error("testLocking1: As expected caught StandbyStatusException, message=" + e.getMessage());
-		} catch (Exception e) {
-			logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		}
-		
-		logger.debug("testLocking1: Stopping policyManagementRunner");
-		//policyManagementRunner.stopRunner();		
-
-		logger.debug("\n\ntestLocking1: Exiting\n\n");
-		Thread.sleep(interruptRecoveryTime);
-
-	}
-	
-	/*
-	 * 1) Inserts and designates this PDP, then verifies that startTransaction
-	 * is successful.
-	 * 
-	 * 2) Inserts another PDP in hotstandby.
-	 * 
-	 * 3) Demotes this PDP, and verifies 1) that other PDP is not promoted (because one
-	 * PDP cannot promote another PDP) and 2) that this PDP is re-promoted.
-	 */
-	//@Ignore
-	//@Test
-	public void testLocking2() throws Exception {
-
-		logger.debug("\n\ntestLocking2: Entering\n\n");
-		cleanXacmlDb();
-		cleanDroolsDb();		
-		
-		logger.debug("testLocking2: Reading IntegrityMonitorProperties");
-		Properties integrityMonitorProperties = new Properties();
-		integrityMonitorProperties.load(new FileInputStream(new File(
-				"src/test/server/config/IntegrityMonitor.properties")));
-		IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-		String thisPdpId = IntegrityMonitorProperties
-				.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
-		logger.debug("testLocking2: Reading xacmlPersistenceProperties");
-		Properties xacmlPersistenceProperties = new Properties();
-		xacmlPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/xacmlPersistence.properties")));
-		XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-		
-		logger.debug("testLocking2: Creating emfXacml");
-		EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
-				"junitXacmlPU", xacmlPersistenceProperties);
-		
-		logger.debug("testLocking2: Reading droolsPersistenceProperties");
-		Properties droolsPersistenceProperties = new Properties();
-		droolsPersistenceProperties.load(new FileInputStream(new File(
-				"src/test/server/config/droolsPersistence.properties")));
-		DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
-		logger.debug("testLocking2: Creating emfDrools");
-		EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
-				"junitDroolsPU", droolsPersistenceProperties);
-		
-		DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-		
-		logger.debug("testLocking2: Cleaning up tables");
-		conn.deleteAllSessions();
-		conn.deleteAllPdps();
-		
-		/*
-		 * Insert this PDP as designated.  Initial standby state will be 
-		 * either null or cold standby.   Demoting should transit state to
-		 * hot standby.
-		 */
-		logger.debug("testLocking2: Inserting PDP=" + thisPdpId + " as designated");
-		DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, true, 3, new Date());
-		conn.insertPdp(pdp);
-		DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
-		logger.debug("testLocking2: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == true);
-		
-		logger.debug("testLocking2: Instantiating stateManagement object and promoting PDP=" + thisPdpId);
-		StateManagement sm = new StateManagement(emfXacml, "dummy");
-		sm.deleteAllStateManagementEntities();
-		sm = new StateManagement(emfXacml, thisPdpId);
-		PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
-		sm.addObserver(pmStandbyStateChangeNotifier);
-				
-		/*
-		 * Insert another PDP as not designated.  Initial standby state will be 
-		 * either null or cold standby.   Demoting should transit state to
-		 * hot standby.
-		 */
-		String standbyPdpId = "pdp2";
-		logger.debug("testLocking2: Inserting PDP=" + standbyPdpId + " as not designated");
-		Date yesterday = DateUtils.addDays(new Date(), -1);
-		pdp = new DroolsPdpImpl(standbyPdpId, false, 4, yesterday);
-		conn.insertPdp(pdp);
-		droolsPdpEntity = conn.getPdp(standbyPdpId);
-		logger.debug("testLocking2: After insertion, PDP=" + standbyPdpId + " has DESIGNATED="
-				+ droolsPdpEntity.isDesignated());
-		assertTrue(droolsPdpEntity.isDesignated() == false);
-		
-		logger.debug("testLocking2: Demoting PDP=" + standbyPdpId);
-		StateManagement sm2 = new StateManagement(emfXacml, standbyPdpId);
-		sm2.addObserver(pmStandbyStateChangeNotifier);
-				
-		logger.debug("testLocking2: Running policy-management.Main class");
-		PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
-		policyManagementRunner.start();
-		
-		logger.debug("testLocking2: Runner started; Sleeping "
-				+ interruptRecoveryTime + "ms before promoting/demoting");
-		Thread.sleep(interruptRecoveryTime);
-
-		logger.debug("testLocking2: Promoting PDP=" + thisPdpId);
-		sm.promote();
-
-		// demoting PDP should ensure that state transits to hotstandby
-		logger.debug("testLocking2: Demoting PDP=" + standbyPdpId);
-		sm2.demote();
-		
-		logger.debug("testLocking2: Sleeping "
-				+ sleepTime
-				+ "ms, to allow time for policy-management.Main class to come up");
-		Thread.sleep(sleepTime);
-		
-		logger.debug("testLocking2: Waking up and invoking startTransaction on active PDP="
-				+ thisPdpId
-				+ ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor = (DroolsPDPIntegrityMonitor) IntegrityMonitor
-				.getInstance();
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			droolsPdpIntegrityMonitor.endTransaction();
-			logger.debug("testLocking2: As expected, transaction successful");
-		} catch (AdministrativeStateException e) {
-			logger.error("testLocking2: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (StandbyStatusException e) {
-			logger.error("testLocking2: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (Exception e) {
-			logger.error("testLocking2: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		}
-		
-		// demoting should cause state to transit to hotstandby followed by re-promotion.
-		logger.debug("testLocking2: demoting PDP=" + thisPdpId);
-		sm = droolsPdpIntegrityMonitor.getStateManager();
-		sm.demote();
-		
-		logger.debug("testLocking2: sleeping" + electionWaitSleepTime
-				+ " to allow election handler to re-promote PDP=" + thisPdpId);
-		Thread.sleep(electionWaitSleepTime);
-		
-		logger.debug("testLocking2: Waking up and invoking startTransaction on re-promoted PDP="
-				+ thisPdpId + ", designated="
-				+ conn.getPdp(thisPdpId).isDesignated());
-		try {
-			droolsPdpIntegrityMonitor.startTransaction();
-			droolsPdpIntegrityMonitor.endTransaction();
-			logger.debug("testLocking2: As expected, transaction successful");
-		} catch (AdministrativeStateException e) {
-			logger.error("testLocking2: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (StandbyStatusException e) {
-			logger.error("testLocking2: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
-			assertTrue(false);
-		} catch (Exception e) {
-			logger.error("testLocking2: Unexpectedly caught Exception, message=" + e.getMessage());
-			assertTrue(false);
-		}
-		
-		logger.debug("testLocking2: Verifying designated status for PDP="
-				+ standbyPdpId);
-		boolean standbyPdpDesignated = conn.getPdp(standbyPdpId).isDesignated();
-		assertTrue(standbyPdpDesignated == false);
-		
-		logger.debug("testLocking2: Stopping policyManagementRunner");
-		//policyManagementRunner.stopRunner();		
-
-		logger.debug("\n\ntestLocking2: Exiting\n\n");
-		Thread.sleep(interruptRecoveryTime);
-
-	}
-	
-
-	private class PolicyManagementRunner extends Thread {
-
-		public void run() {
-			logger.info("PolicyManagementRunner.run: Entering");
-			String args[] = { "src/main/server/config" };
-			try {
-				Main.main(args);
-			} catch (Exception e) {
-				logger
-						.info("PolicyManagementRunner.run: Exception thrown from Main.main(), message="
-								+ e.getMessage());
-				return;
-			}
-			logger.info("PolicyManagementRunner.run: Exiting");
-		}
-
-	}
-	
-}
diff --git a/policy-persistence/src/test/resources/IntegrityMonitor.properties b/policy-persistence/src/test/resources/IntegrityMonitor.properties
deleted file mode 100644
index 2d8676c6..00000000
--- a/policy-persistence/src/test/resources/IntegrityMonitor.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-#hostPort = ${{host_port}}
-hostPort = 0.0.0.0:9981
-
-# The following were added as part of US673632
-#
-# Forward Progress Monitor update interval seconds
-fp_monitor_interval = 30
-# Failed counter threshold before failover 
-failed_counter_threshold = 3
-# Interval between test transactions when no traffic seconds
-test_trans_interval = 10
-# Interval between writes of the FPC to the DB seconds 
-write_fpc_interval = 5
-# Name of the site in which this node is hosted 
-site_name = pdp_1
-# Node type
-# Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error! 
-node_type = pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon. 
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon.  For example:
-#dependency_groups=site_1.astra_1,site_1.astra_2;site_1.brms_1,site_1.brms_2;site_1.logparser_1;site_1.pypdp_1
-#dependency_groups=${{dependency_groups}}
-dependency_groups=""
-# When set to true, dependent health checks are performed by using JMX to invoke test() on the dependent.
-# The default false is to use state checks for health.
-#test_via_jmx=${{test_via_jmx}}
-# This is the max number of seconds beyond which a non incrementing FPC is considered a failure
-#max_fpc_update_interval=${{max_fpc_update_interval}}
-
-# Needed by DroolsPdpsElectionHandler
-pdp.checkInterval=1500
-pdp.updateInterval=1000
-#pdp.timeout=3000
-# Need long timeout, because testTransaction is only run every 10 seconds.
-pdp.timeout=15000
-#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=20000
-
-# Known as the PDPID in the droolpdpentity table.
-resource.name=pdp1
-#resource.name=${{resource_name}}
-
-# Flag to control the execution of the subsystemTest for the Database
-db.audit.is.active=false
-
-# Flag to control the execution of the subsystemTest for the Nexus Maven repository
-repository.audit.is.active=false
-repository.audit.ignore.errors=true
-
-# Run the state audit every 60 seconds.  NOTE! It will only run on nodes that are providing service.
-state_audit_interval_ms=60000
-
diff --git a/policy-persistence/src/test/resources/META-INF/persistence.xml b/policy-persistence/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index ed8a8cd7..00000000
--- a/policy-persistence/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  policy-persistence
-  ================================================================================
-  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=========================================================
-  -->
-
-<persistence version="2.1"
-	xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-
-	<persistence-unit name="junitDroolsPU" transaction-type="RESOURCE_LOCAL">
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.drools.persistence.DroolsPdpEntity</class>
-		<class>org.openecomp.policy.drools.persistence.DroolsSessionEntity</class>
-		<!-- <class>org.openecomp.policy.drools.persistence.LastSiteEntity</class> -->
-		<class>org.drools.persistence.info.SessionInfo</class>
-		<class>org.drools.persistence.info.WorkItemInfo</class>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<properties>
-			<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-			<property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/> 
-            <property name="javax.persistence.schema-generation.scripts.create-target" value="./sql/generatedCreateDrools.ddl"/>
-            <property name="javax.persistence.schema-generation.scripts.drop-target" value="./sql/generatedDropDrools.ddl"/>
-        </properties>
-	</persistence-unit>
-	
-	<persistence-unit name="junitXacmlPU" transaction-type="RESOURCE_LOCAL">
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
-		<class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
-		<class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-		<properties>
-			<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-			<property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/> 
-            <property name="javax.persistence.schema-generation.scripts.create-target" value="./sql/generatedCreateXacml.ddl"/>
-            <property name="javax.persistence.schema-generation.scripts.drop-target" value="./sql/generatedDropXacml.ddl"/>
-        </properties>
-	</persistence-unit>
-
-</persistence>
diff --git a/policy-persistence/src/test/resources/droolsPersistence.properties b/policy-persistence/src/test/resources/droolsPersistence.properties
deleted file mode 100644
index 544e1c23..00000000
--- a/policy-persistence/src/test/resources/droolsPersistence.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url  = jdbc:h2:file:./sql/drools
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/drools
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-#javax.persistence.jdbc.driver = ${{JDBC_DRIVER}}
-#javax.persistence.jdbc.url  = ${{JDBC_DROOLS_URL}}
-#javax.persistence.jdbc.user = ${{JDBC_USER}}
-#javax.persistence.jdbc.password = ${{JDBC_PASSWORD}}
-
-# Needed?
-#javax.persistence.jdbc.driver = org.h2.Driver
-#javax.persistence.jdbc.url  = jdbc:h2:file:./sql/ncomp
-#javax.persistence.jdbc.user = sa
-#javax.persistence.jdbc.password =
-#persistenceDisabled=false
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://192.168.56.30:3306/drools
-#javax.persistence.jdbc.user=patb
-#javax.persistence.jdbc.password=policy
-
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
diff --git a/policy-persistence/src/test/resources/log4j.properties b/policy-persistence/src/test/resources/log4j.properties
deleted file mode 100644
index 746d59a0..00000000
--- a/policy-persistence/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-log4j.rootLogger=DEBUG, out
-log4j.logger.com.att=DEBUG
-log4j.logger.org.openecomp.policy.drools.system=DEBUG
-log4j.logger.org.openecomp.policy.drools.im=DEBUG
-log4j.logger.org.openecomp.policy.common.im=DEBUG
-log4j.logger.org.openecomp.policy.drools.event.comm=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d %-5p %-30.30c{1} %4L - %m%n
diff --git a/policy-persistence/src/test/resources/logback.xml b/policy-persistence/src/test/resources/logback.xml
deleted file mode 100644
index 9fd83e8d..00000000
--- a/policy-persistence/src/test/resources/logback.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  policy-persistence
-  ================================================================================
-  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=========================================================
-  -->
-
-<!-- Controls the output of logs for JUnit tests -->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
-  <!--<jmxConfigurator /> -->
-  <!-- directory path for all other type logs -->
-  <property name="logDir" value="testingLogs" />
-  
-  <!-- directory path for debugging type logs -->
-  <property name="debugDir" value="testingLogs" />
-  
-  <!--  specify the component name 
-    <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
-  <property name="componentName" value="drools-pdp"></property>
-  <property name="subComponentName" value="policy-management"></property>
-  
-  <!--  log file names -->
-  <property name="errorLogName" value="error" />
-  <property name="metricsLogName" value="metrics" />
-  <property name="auditLogName" value="audit" />
-  <property name="debugLogName" value="debug" />
-  
-   <property name="defaultPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{requestId}|%X{serviceInstanceId}|%t|%X{serverName}|%X{serviceName}|%X{instanceUuid}|%p|%X{severity}|%X{serverIpAddress}|%X{server}|%X{clientIpAddress}|%c||%msg%n" />
-   <!--  <property name="defaultPattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n" />  -->
-  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
-  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
-   <!--
-  <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
-  <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
-  -->
-  <!-- example from old log4j.properties:  ${catalina.base}/logs/pdp-rest.log  -->  
-
-  <!-- Example evaluator filter applied against console appender -->
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-
-  <!-- ============================================================================ -->
-  <!-- EELF Appenders -->
-  <!-- ============================================================================ -->
-
-  <!-- The EELFAppender is used to record events to the general application 
-    log -->
-    
-    
-
-  
-  <!-- EELF Audit Appender. This appender is used to record audit engine 
-    related logging events. The audit logger and appender are specializations 
-    of the EELF application root logger and appender. This can be used to segregate 
-    Policy engine events from other components, or it can be eliminated to record 
-    these events as part of the application root log. -->
-    
-  <appender name="EELFAudit"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${auditLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${auditLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-         <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFAudit" />
-  </appender>
-
-<appender name="EELFMetrics"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${metricsLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${metricsLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - 
-        %msg%n"</pattern> -->
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  
-  
-  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFMetrics"/>
-  </appender>
-   
-  <appender name="EELFError"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${logDirectory}/${errorLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${logDirectory}/${errorLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-     <level>ERROR</level>
-     </filter>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  
-  <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFError"/>
-  </appender>
-  
-   <appender name="EELFDebug"
-    class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${debugLogDirectory}/${debugLogName}.log</file>
-    <rollingPolicy
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${debugLogDirectory}/${debugLogName}.%i.log.zip
-      </fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>9</maxIndex>
-    </rollingPolicy>
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-     <!-- <level>INFO</level> -->
-     <level>DEBUG</level>
-     </filter>
-    <triggeringPolicy
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5MB</maxFileSize>
-    </triggeringPolicy>
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
-  
-  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-    <queueSize>256</queueSize>
-    <appender-ref ref="EELFDebug" />
-    <includeCallerData>true</includeCallerData>
-  </appender>
- 
-  
-  <!-- ============================================================================ -->
-  <!--  EELF loggers -->
-  <!-- ============================================================================ -->
- 
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="asyncEELFAudit" />
-  </logger>
-  
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
-        <appender-ref ref="asyncEELFMetrics" />
-  </logger>
- 
-    <logger name="com.att.eelf.error" level="error" additivity="false">
-  <appender-ref ref="asyncEELFError" />
-  </logger>
-  
-   <!-- <logger name="com.att.eelf.debug" level="info" additivity="false"> -->
-   <logger name="com.att.eelf.debug" level="debug" additivity="false">
-        <appender-ref ref="asyncEELFDebug" />
-  </logger>
-  
-  <!-- <root level="INFO"> -->
-  <root level="DEBUG">
-        <appender-ref ref="asyncEELFDebug" />
-        <appender-ref ref="asyncEELFError" />
-  </root>
-
-</configuration>
diff --git a/policy-persistence/src/test/resources/xacmlPersistence.properties b/policy-persistence/src/test/resources/xacmlPersistence.properties
deleted file mode 100644
index 284e87d7..00000000
--- a/policy-persistence/src/test/resources/xacmlPersistence.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url  = jdbc:h2:file:./sql/xacml
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://127.0.0.1:3306/xacml
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-#javax.persistence.jdbc.driver = ${{JDBC_DRIVER}}
-#javax.persistence.jdbc.url  = ${{JDBC_URL}}
-#javax.persistence.jdbc.user = ${{JDBC_USER}}
-#javax.persistence.jdbc.password = ${{JDBC_PASSWORD}}
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
-
- 
diff --git a/policy-persistence/src/test/server/config/IntegrityMonitor.properties b/policy-persistence/src/test/server/config/IntegrityMonitor.properties
deleted file mode 100644
index 5e7085ca..00000000
--- a/policy-persistence/src/test/server/config/IntegrityMonitor.properties
+++ /dev/null
@@ -1,69 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-# port 9981 fails on Jenkins, so try another.
-hostPort = 0.0.0.0:57692
-
-# The following were added as part of US673632
-#
-# Forward Progress Monitor update interval seconds
-fp_monitor_interval = 30
-# Failed counter threshold before failover 
-failed_counter_threshold = 3
-# Interval between test transactions when no traffic seconds
-test_trans_interval = 10
-# Interval between writes of the FPC to the DB seconds 
-write_fpc_interval = 5
-# Name of the site in which this node is hosted 
-site_name = pdp_1
-# Node type. Can take values of: pdp-xacml, pdp-drools, pap, pap-admin, logparser, brms-gateway, 
-# astra-gateway, elk-server and pypdpNode type
-# Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error! 
-node_type = pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon. 
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon.  For example:
-#For JUnit testing this must be empty since none of the other components exist 
-#dependency_groups=site_1.astra_1,site_1.astra_2;site_1.brms_1,site_1.brms_2;site_1.logparser_1;site_1.pypdp_1
-dependency_groups=
-
-# Needed by DroolsPdpsElectionHandler
-pdp.checkInterval=1500
-pdp.updateInterval=1000
-#pdp.timeout=3000
-# Need long timeout, because testTransaction is only run every 10 seconds.
-pdp.timeout=15000
-#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=20000
-
-# Known as the PDPID in the droolpdpentity table.
-resource.name=pdp1
-
-# The amount of this a resource (entity) should sleep between audit executions.
-# If not specified, defaults to five seconds.
-# -1 turns off audit
-# zero forces audit to run continuously
-integrity_audit_period_seconds=60
-
-# Flag to control the execution of the subsystemTest for the Database
-db.audit.is.active=false
-
-# Flag to control the execution of the subsystemTest for the Nexus Maven repository
-repository.audit.is.active=false
-repository.audit.ignore.errors=true
\ No newline at end of file
diff --git a/policy-persistence/src/test/server/config/droolsPersistence.properties b/policy-persistence/src/test/server/config/droolsPersistence.properties
deleted file mode 100644
index 8cdaf6ab..00000000
--- a/policy-persistence/src/test/server/config/droolsPersistence.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url  = jdbc:h2:file:./sql/drools
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/drools
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
diff --git a/policy-persistence/src/test/server/config/policyLogger.properties b/policy-persistence/src/test/server/config/policyLogger.properties
deleted file mode 100644
index 6ee66fd6..00000000
--- a/policy-persistence/src/test/server/config/policyLogger.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-################################### Set concurrentHashMap and timer info  #######################
-#Timer initial delay and the delay between in milliseconds before task is to be execute.
-timer.delay.time=1000
-#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
-check.interval= 30000
-#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. 
-event.expired.time=86400
-#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed 
-#to remove all expired records from this concurrentHashMap.
-concurrentHashMap.limit=5000
-#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
-stop.check.point=2500
-################################### Set logging format #############################################
-# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
-logger.type=EELF
-#################################### Set level for EELF or SYSTEMOUT logging ##################################
-# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all 
-debugLogger.level=INFO
-# Set level for metrics file. Set OFF to disable; set ON to enable
-metricsLogger.level=ON
-# Set level for error file. Set OFF to disable; set ON to enable
-error.level=ON
-# Set level for audit file. Set OFF to disable; set ON to enable
-audit.level=ON
diff --git a/policy-persistence/src/test/server/config/xacmlPersistence.properties b/policy-persistence/src/test/server/config/xacmlPersistence.properties
deleted file mode 100644
index 149aa557..00000000
--- a/policy-persistence/src/test/server/config/xacmlPersistence.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url  = jdbc:h2:file:./sql/xacml
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://127.0.0.1:3306/xacml
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
-
-