summaryrefslogtreecommitdiffstats
path: root/integrity-monitor
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2020-04-09 13:31:38 -0500
committerjhh <jorge.hernandez-herrero@att.com>2020-04-09 13:35:04 -0500
commitf9f55b74950a2fb39f76209c5392676d3e4d0e77 (patch)
treefd4d12eaa7c4ce8465e4c52ba30f55392c9afe2f /integrity-monitor
parenta2ca5ed5782f32ca54d14ffde2cbcfa0e4c3fea3 (diff)
rename jpa persistence file
After inspecting the fat jar generated by brmsgw, noticed that the persistence.xml included from here it was overriden by another one, therefore the persistence unit was not available. This may solve the issue for the brmsgw, as with a far jar build, there are the risks of collisions such as this of files with the same name. Issue-ID: POLICY-2471 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I91cf2b6d3d2f5086d77795e08800ca96d984c214
Diffstat (limited to 'integrity-monitor')
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java4
-rw-r--r--integrity-monitor/src/main/resources/META-INF/persistenceIM.xml (renamed from integrity-monitor/src/main/resources/META-INF/persistence.xml)0
-rw-r--r--integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java2
3 files changed, 6 insertions, 0 deletions
diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java
index 3cb708e2..d12a9bde 100644
--- a/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/IntegrityMonitor.java
@@ -44,6 +44,7 @@ import javax.persistence.LockModeType;
import javax.persistence.Persistence;
import javax.persistence.Query;
import org.apache.commons.lang3.StringUtils;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.onap.policy.common.im.jmx.ComponentAdmin;
import org.onap.policy.common.im.jmx.ComponentAdminMBean;
import org.onap.policy.common.im.jmx.JmxAgentConnection;
@@ -229,6 +230,9 @@ public class IntegrityMonitor {
//
// Create the entity manager factory
//
+ if (!properties.containsKey(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML)) {
+ properties.setProperty(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, "META-INF/persistenceIM.xml");
+ }
emf = Persistence.createEntityManagerFactory(getPersistenceUnit(), properties);
//
// Did it get created?
diff --git a/integrity-monitor/src/main/resources/META-INF/persistence.xml b/integrity-monitor/src/main/resources/META-INF/persistenceIM.xml
index 7aff9219..7aff9219 100644
--- a/integrity-monitor/src/main/resources/META-INF/persistence.xml
+++ b/integrity-monitor/src/main/resources/META-INF/persistenceIM.xml
diff --git a/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java b/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java
index 1bb7cd96..c034482f 100644
--- a/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java
+++ b/integrity-monitor/src/test/java/org/onap/policy/common/im/IntegrityMonitorTestBase.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.onap.policy.common.utils.jpa.EntityTransCloser;
import org.onap.policy.common.utils.test.log.logback.ExtractAppender;
import org.onap.policy.common.utils.time.CurrentTime;
@@ -163,6 +164,7 @@ public class IntegrityMonitorTestBase {
properties.put(IntegrityMonitorProperties.NODE_TYPE, NODE_TYPE);
properties.put(IntegrityMonitorProperties.REFRESH_STATE_AUDIT_INTERVAL_MS,
String.valueOf(REFRESH_INTERVAL_MS));
+ properties.setProperty(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, "META-INF/persistenceIM.xml");
emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT, makeProperties());