commit 3be65a6cb5f880fe35c42a8fa83c2dfa1a44b5c4
author Tej, Tarun <tt3868@att.com> Wed Sep 27 10:53:52 2017 -0400
committer Tej, Tarun <tt3868@att.com> Wed Sep 27 11:03:21 2017 -0400
tree 7ad98026c46af491f46daf3c5a64c86738eab025
parent dfbd3a038161cc65b6bc911c37017fbfdd8c84fe

New controller support from BRMSGW

Amsterdam controller support from brmsgw persepective

Issue-Id: POLICY-263
Change-Id: I6b28757128998d3dedb86abada02b1d1ea4d3a8a
Signed-off-by: Tej, Tarun <tt3868@att.com>

BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java

diff --git a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
index 6e8588a..266e090 100644
--- a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
@@ -109,6 +109,7 @@
     private static final String[] GOALS = { "clean", "deploy" };
     private static final String DEFAULT_VERSION = "1.1.0-SNAPSHOT";
     private static final String DEPENDENCY_FILE = "dependency.json";
+    private static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml";
 
     private static Map<String, String> modifiedGroups = new HashMap<>();
     private static IntegrityMonitor im;
@@ -188,8 +189,10 @@
         } catch (Exception e) {
             LOGGER.error("Error starting BackUpMonitor: " + e);
         }
-        if(!config.containsKey(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML)){
+        if(!config.containsKey(BRMSPERSISTENCE)){
             config.setProperty(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, "META-INF/persistenceBRMS.xml");
+        } else {
+            config.setProperty(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, config.getProperty(BRMSPERSISTENCE,"META-INF/persistenceBRMS.xml"));
         }
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("BRMSGW", config);
         em = emf.createEntityManager();

BRMSGateway/src/test/resources/config.properties

diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties
index 4f9e013..8c46ec2 100644
--- a/BRMSGateway/src/test/resources/config.properties
+++ b/BRMSGateway/src/test/resources/config.properties
@@ -65,7 +65,7 @@
 #database password for Integrity Monitor
 javax.persistence.jdbc.password=
 #persistence xml
-eclipselink.persistencexml=META-INF/persistenceBRMStest.xml
+brmsEclipselink.persistencexml=META-INF/persistenceBRMStest.xml
 #resource name
 RESOURCE_NAME=site_1.brmsgw_1
 #***Properties for IntegrityMonitor integration defined in IntegrityMonitorProperties.java***