aboutsummaryrefslogtreecommitdiffstats
path: root/feature-session-persistence/src/main/resources/META-INF
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2018-02-14 12:52:31 -0500
committerJim Hahn <jrh3@att.com>2018-02-14 16:14:17 -0500
commitc83e35bab5aa44f01cb7a9089701ef963ee0c131 (patch)
treed76dfcdb85ecdde91202da22053876ab57f46204 /feature-session-persistence/src/main/resources/META-INF
parentc5d5a9058d47eca9d4ac90308514ff8f1f9d0ca3 (diff)
Replace bitronix and eclipselink in persistence
Replaced bitronix transaction manager, which is not intended for production, with jboss transaction manager. Eliminated eclipselink so that only hibernate is used for persistence for both JPA and drools-persistence. Added more test cases to EntityMgrTrans to provide coverage for various exception types. Moved object store to features/session-persistence/jta. Wrapped RuntimeException in specific type. Modified test to throw specific exception type. Converted GenSchema from an @Test to a main(). Logged caught exceptions in junit tests. Change-Id: I4b02efc8da43d20b2dbb3c0b25adc382e80474ec Issue-ID: POLICY-191 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'feature-session-persistence/src/main/resources/META-INF')
-rw-r--r--feature-session-persistence/src/main/resources/META-INF/persistence.xml21
1 files changed, 6 insertions, 15 deletions
diff --git a/feature-session-persistence/src/main/resources/META-INF/persistence.xml b/feature-session-persistence/src/main/resources/META-INF/persistence.xml
index 7ddd2fd3..6b8345c3 100644
--- a/feature-session-persistence/src/main/resources/META-INF/persistence.xml
+++ b/feature-session-persistence/src/main/resources/META-INF/persistence.xml
@@ -23,20 +23,10 @@
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="onapPU" transaction-type="RESOURCE_LOCAL">
- <!-- This is for database access by non-drools methods -->
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.onap.policy.drools.persistence.DroolsSessionEntity</class>
- <class>org.drools.persistence.info.SessionInfo</class>
- <class>org.drools.persistence.info.WorkItemInfo</class>
- <properties>
- <!-- Properties are passed in -->
- </properties>
- </persistence-unit>
-
<persistence-unit name="onapsessionsPU" transaction-type="JTA">
<!-- Used for drools session data access -->
- <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+ <class>org.onap.policy.drools.persistence.DroolsSessionEntity</class>
<class>org.drools.persistence.info.SessionInfo</class>
<class>org.drools.persistence.info.WorkItemInfo</class>
<properties>
@@ -44,18 +34,19 @@
<property name="hibernate.max_fetch_depth" value="3" />
<property name="hibernate.hbm2ddl.auto" value="update" />
<property name="hibernate.show_sql" value="false" />
- <property name="hibernate.transaction.manager_lookup_class"
- value="org.hibernate.transaction.BTMTransactionManagerLookup" />
+ <property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory" />
+ <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />
</properties>
</persistence-unit>
<persistence-unit name="schemaDroolsPU" transaction-type="RESOURCE_LOCAL">
<!-- Limited use for generating the DB and schema files for drools DB - uses eclipselink for convenience -->
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.onap.policy.drools.persistence.DroolsSessionEntity</class>
<class>org.drools.persistence.info.SessionInfo</class>
<class>org.drools.persistence.info.WorkItemInfo</class>
<properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MariaDBDialect" />
<property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
<property name="javax.persistence.schema-generation.scripts.create-target" value="sql/generatedCreateDrools.ddl"/>
<property name="javax.persistence.schema-generation.scripts.drop-target" value="sql/generatedDropDrools.ddl"/>