X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=mythtv%2Fwar%2Fsrc%2Fmain%2Fresources%2Forg.wamblee.mythtv.hibernate.xml;h=29f176a87b4d72a5a75efd6fc5f2e36472009d0e;hb=6adf43d72ff3ffe32451ba187ca94b601f34295b;hp=03a664affcd18a5b2efab6c4af67f19040eddcd9;hpb=244c2406bd9ae23fd4d8dfb07eda03e8bcf95bb3;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 03a664af..29f176a8 100644
--- a/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml
+++ b/mythtv/war/src/main/resources/org.wamblee.mythtv.hibernate.xml
@@ -1,48 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" 
-		"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
-	<!-- bean id="namingStrategy" class="nl.jmonks.system.hibernate.JMonksNamingStrategy"> </bean -->
-
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
-		<property name="dataSource">
-			<ref bean="dataSource"/>
-		</property>
-		<property name="hibernateProperties">
-			<props>
-				<prop key="hibernate.dialect">${hibernate.dialect}</prop>
-                <prop key="hibernate.cache.provider_class">${hibernate.cache.provider}</prop>
-                <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>
-		</property>
-		<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 id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
-		<property name="sessionFactory">
-			<ref bean="sessionFactory"/>
-		</property>
+<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="entityManager" class="org.springframework.jndi.JndiObjectFactoryBean">
+		<property name="jndiName"><value>java:comp/env/persistence/mythtv</value></property>
 	</bean>
 
-	<!-- bean id="transactionManager"
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-		<property name="sessionFactory">
-			<ref local="sessionFactory"/>
-		</property>
-	</bean -->
-	
 	<bean id="transactionManager"
 		class="org.springframework.transaction.jta.JtaTransactionManager">