X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=mythtv%2Fwar%2Fsrc%2Fmain%2Fresources%2Forg.wamblee.mythtv.hibernate.xml;h=fb66e86b18e0ca1b12fa45179b2896fac3ab9f51;hb=6f71c512569f73bb18462307dc0ed94afa2d31fc;hp=4d34ac8d70a2a36285bc84b964554574289ab529;hpb=84623d9c9d1297b2440b0fd8075ec7c89f2dd502;p=utils

diff --git a/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml
index 4d34ac8d..fb66e86b 100644
--- a/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml
+++ b/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" 
-		"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- bean id="namingStrategy" class="nl.jmonks.system.hibernate.JMonksNamingStrategy"> </bean -->
 
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+	<!-- bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
 		<property name="dataSource">
 			<ref bean="dataSource"/>
 		</property>
@@ -16,28 +16,37 @@
                 <prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
                 <prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
 				<prop key="hibernate.query.substitutions">true 1, false 0</prop>
-				<!-- prop key="hibernate.connection.release_mode">after_statement</prop -->
-			</props>
+		   </props>
 		</property>
-		<property name="mappingResources">
-			<ref bean="hibernateMappingFiles"/>
+		<property name="annotatedClasses">
+			<list>
+				<value>org.wamblee.mythtv.Channel</value>
+				<value>org.wamblee.mythtv.Recording</value>
+			</list>
 		</property>
-		<!-- property name="namingStrategy">
-			<ref local="namingStrategy"/>
-		</property -->
-	</bean>
+		
+	</bean -->
 
-	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
+	<!-- bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
-	</bean>
+	</bean -->
 
-	<bean id="transactionManager"
+	<!-- bean id="transactionManager"
 		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory">
 			<ref local="sessionFactory"/>
 		</property>
+		</bean -->
+	
+	<bean id="entityManager" class="org.springframework.jndi.JndiObjectFactoryBean">
+		<property name="jndiName"><value>java:comp/env/persistence/mythtv</value></property>
+	</bean>
+
+	<bean id="transactionManager"
+		class="org.springframework.transaction.jta.JtaTransactionManager">
+		
 	</bean>
 
 	<!-- Abstract bean. Subclass this bean and specify the target property to