From 48a6ca923198aee7f6e0d046c1bdc4bd8ac48ea5 Mon Sep 17 00:00:00 2001
From: jomu <joern@muehlencord.de>
Date: Fri, 18 Jan 2019 16:47:32 +0100
Subject: [PATCH] fixed broken persistence settings

---
 .../account/web/PersistenceContextFactory.java    |  8 +++-----
 .../src/main/resources/META-INF/persistence.xml   | 15 +++++++++++++--
 .../src/main/resources/META-INF/persistence.xml   |  3 ++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java b/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java
index 37e57f4..bce1718 100644
--- a/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java
+++ b/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java
@@ -26,10 +26,8 @@ public class PersistenceContextFactory {
     // account UI is the only application where application and account is the same database
     // account UI does not call this as it references all database access via accountPu
     @PersistenceUnit (unitName = "accountPu")
-    EntityManagerFactory applicationEntityManagerFactory;    
+    EntityManagerFactory entityManagerFactory;    
     
-    @PersistenceUnit (unitName = "accountPu")
-    EntityManagerFactory accountEntityManagerFactory;
                
     @Produces    
     @RequestScoped
@@ -38,7 +36,7 @@ public class PersistenceContextFactory {
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("getting entityManager for application");
         }                
-        EntityManager em =  applicationEntityManagerFactory.createEntityManager(SynchronizationType.UNSYNCHRONIZED);
+        EntityManager em =  entityManagerFactory.createEntityManager(SynchronizationType.UNSYNCHRONIZED);
         return em;
     }
     
@@ -57,7 +55,7 @@ public class PersistenceContextFactory {
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("getting entityManager for account database");
         }                
-        EntityManager em =  accountEntityManagerFactory.createEntityManager(SynchronizationType.UNSYNCHRONIZED);
+        EntityManager em =  entityManagerFactory.createEntityManager(SynchronizationType.UNSYNCHRONIZED);
         return em;
     }    
     
diff --git a/account-ui/src/main/resources/META-INF/persistence.xml b/account-ui/src/main/resources/META-INF/persistence.xml
index 8580099..7065ea3 100644
--- a/account-ui/src/main/resources/META-INF/persistence.xml
+++ b/account-ui/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="accountPu" transaction-type="RESOURCE_LOCAL">
-    <exclude-unlisted-classes>false</exclude-unlisted-classes>
+  <persistence-unit name="accountPu" transaction-type="JTA">
+    <provider>org.hibernate.ejb.HibernatePersistence</provider>
+    <jta-data-source>java:/jboss/accountDs</jta-data-source>
+    <class>de.muehlencord.shared.account.business.account.entity.AccountEntity</class>
+    <class>de.muehlencord.shared.account.business.account.entity.AccountHistoryEntity</class>
+    <class>de.muehlencord.shared.account.business.account.entity.AccountLoginEntity</class>
+    <class>de.muehlencord.shared.account.business.account.entity.ApiKeyEntity</class>
+    <class>de.muehlencord.shared.account.business.application.entity.ApplicationEntity</class>
+    <class>de.muehlencord.shared.account.business.application.entity.ApplicationPermissionEntity</class>
+    <class>de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity</class>
+    <class>de.muehlencord.shared.account.business.config.entity.ConfigEntity</class>
+    <class>de.muehlencord.shared.account.business.mail.entity.MailTemplateEntity</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
     <shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
     <validation-mode>NONE</validation-mode>
     <properties>
diff --git a/account/src/main/resources/META-INF/persistence.xml b/account/src/main/resources/META-INF/persistence.xml
index 10a60eb..5a0c0aa 100644
--- a/account/src/main/resources/META-INF/persistence.xml
+++ b/account/src/main/resources/META-INF/persistence.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="accountPu" transaction-type="RESOURCE_LOCAL">
+  <persistence-unit name="accountPu" transaction-type="JTA">
+    <jta-data-source>java:/jboss/accountDs</jta-data-source>
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
     <properties>