kie server persistence - allow to add hibernate and javax.persistence…

… properties when creating entity manager factory without modifying persistence.xml
kiegroup · Mar 14, 2017 · cf08c33 · cf08c33
1 parent 6c48563
commit cf08c33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...rver-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java b/...rver-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java
@@ -661,6 +661,11 @@ protected Map<String, String> getPersistenceProperties(KieServerConfig config) {
         persistenceProperties.put("hibernate.transaction.jta.platform", config.getConfigItemValue(KieServerConstants.CFG_PERSISTANCE_TM, "org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform"));
         persistenceProperties.put("javax.persistence.jtaDataSource", config.getConfigItemValue(KieServerConstants.CFG_PERSISTANCE_DS, "java:jboss/datasources/ExampleDS"));
 
+        System.getProperties().stringPropertyNames()
+                .stream()
+                .filter(PersistenceUnitInfoLoader::isValidPersistenceKey)
+                .forEach(name -> persistenceProperties.put(name, System.getProperty(name)));
+
         return persistenceProperties;
     }
 

diff --git a/...rvices-jbpm/src/main/java/org/kie/server/services/jbpm/jpa/PersistenceUnitInfoLoader.java b/...rvices-jbpm/src/main/java/org/kie/server/services/jbpm/jpa/PersistenceUnitInfoLoader.java
@@ -149,4 +149,11 @@ public static PersistenceUnitInfo load(InputStream inputStream, InitialContext i
         return persistenceUnitInfo;
     }
 
+    public static Boolean isValidPersistenceKey(String propertyName) {
+        if (propertyName.startsWith("hibernate.") || propertyName.startsWith("javax.persistence")) {
+            return true;
+        }
+
+        return false;
+    }
 }