Browse Source

Issue #800 - Fix Ninja-Resin persistence.xml config

Martin Tzvetanov Grigorov 11 years ago
parent
commit
ce68f5118f

+ 1 - 0
ninja-resin/pom.xml

@@ -5,6 +5,7 @@
     <artifactId>ninja-resin</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>ninja-resin</name>
+    <packaging>war</packaging>
     <description>Ninja test for the TechEmpower/FrameworkBenchmarks project</description>
 
     <properties>

+ 1 - 1
ninja-resin/src/main/java/logback.xml

@@ -8,7 +8,7 @@
     </encoder>
   </appender>
 
-  <root level="debug">
+  <root level="error">
     <appender-ref ref="STDOUT" />
   </root>
 </configuration>

+ 10 - 11
ninja-resin/src/main/resources/META-INF/persistence.xml

@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <persistence xmlns="http://java.sun.com/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
     
     <!-- Resin datasource -->
-    <persistence-unit name="resin" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+    <persistence-unit name="resin" transaction-type="JTA">
+        <!--provider>org.hibernate.jpa.HibernatePersistenceProvider</provider-->
         <jta-data-source>java:comp/env/jdbc/hello_world</jta-data-source>
-
+        <shared-cache-mode>NONE</shared-cache-mode>
         <properties>
-            <property name="hibernate.connection.datasource" value="java:comp/env/jdbc/hello_world" />
-            <property name="hibernate.transaction.factory_class"
-                                  value="org.hibernate.transaction.JTATransactionFactory" />
-            <property name="hibernate.transaction.manager_lookup_class"
-                                  value="org.hibernate.transaction.ResinTransactionManagerLookup" />
+            <!--property name="hibernate.connection.datasource" value="java:comp/env/jdbc/hello_world" /-->
+            <!--property name="hibernate.transaction.factory_class"
+                                  value="org.hibernate.transaction.JTATransactionFactory" /-->
+            <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.ResinTransactionManagerLookup" />
+            <property name="hibernate.jdbc.batch_size" value="100" />
         </properties>
     </persistence-unit>
-        
+
     <!-- Database for tests and local dev mode... -->
     <persistence-unit name="h2" transaction-type="RESOURCE_LOCAL">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <properties>
-            <property name="javax.persistence.provider" value="org.hibernate.ejb.HibernatePersistence" />
+            <property name="javax.persistence.provider" value="org.hibernate.jpa.HibernatePersistenceProvider" />
             <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
             <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
             <!-- you may want to enable the ddl if you do not use migrations. -->