summaryrefslogtreecommitdiffstats
path: root/BRMSGateway/src
diff options
context:
space:
mode:
authorTej, Tarun <tt3868@att.com>2017-09-27 10:53:52 -0400
committerTej, Tarun <tt3868@att.com>2017-09-27 11:03:21 -0400
commit3be65a6cb5f880fe35c42a8fa83c2dfa1a44b5c4 (patch)
tree7ad98026c46af491f46daf3c5a64c86738eab025 /BRMSGateway/src
parentdfbd3a038161cc65b6bc911c37017fbfdd8c84fe (diff)
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>
Diffstat (limited to 'BRMSGateway/src')
-rw-r--r--BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java5
-rw-r--r--BRMSGateway/src/test/resources/config.properties2
2 files changed, 5 insertions, 2 deletions
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 6e8588acb..266e090a2 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 @@ public class BRMSPush {
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 @@ public class BRMSPush {
} 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();
diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties
index 4f9e01305..8c46ec277 100644
--- a/BRMSGateway/src/test/resources/config.properties
+++ b/BRMSGateway/src/test/resources/config.properties
@@ -65,7 +65,7 @@ javax.persistence.jdbc.user=sa
#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***