X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=mythtv%2Fwar%2Fsrc%2Fmain%2Fresources%2Forg.wamblee.mythtv.application.xml;h=7b9e8c0765bd4ad2679c99aa60712999e8d25290;hb=0cd2d53496b3819d5f8cccb38400481e2faeda03;hp=35681dc7cac616ba77c083329372eb088ce5db42;hpb=84623d9c9d1297b2440b0fd8075ec7c89f2dd502;p=utils

diff --git a/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml b/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
index 35681dc7..7b9e8c07 100644
--- a/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
+++ b/mythtv/war/src/main/resources/org.wamblee.mythtv.application.xml
@@ -1,40 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<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">
 
-<beans>
-    
     <bean id="linkDir" class="java.io.File">
-        <constructor-arg><value>${org.wamblee.mythtv.linkdir}</value></constructor-arg>
+        <constructor-arg>
+            <value>${org.wamblee.mythtv.linkdir}</value>
+        </constructor-arg>
     </bean>
-    
+
     <bean id="monitorDir" class="java.io.File">
-        <constructor-arg><value>${org.wamblee.mythtv.monitordir}</value></constructor-arg>
+        <constructor-arg>
+            <value>${org.wamblee.mythtv.monitordir}</value>
+        </constructor-arg>
     </bean>
-    
+
     <bean id="fileFilter" class="org.apache.oro.io.AwkFilenameFilter">
-        <constructor-arg><value>^[a-zA-Z0-9-_]*.mpg$</value></constructor-arg>
+        <constructor-arg>
+            <value>^[a-zA-Z0-9-_]*.mpg$</value>
+        </constructor-arg>
     </bean>
-    
-    
-    <bean id="org.wamblee.mythtv.RecordingDatabase" class="org.wamblee.mythtv.RecordingDatabase"
-    init-method="init">    
-        <property name="hibernateTemplate"><ref bean="hibernateTemplate"/></property>
+
+
+    <bean id="org.wamblee.mythtv.RecordingDatabase" class="org.wamblee.mythtv.RecordingDatabase">
+        <constructor-arg>
+            <ref bean="entityManager"/>
+        </constructor-arg>
     </bean>
-    
-    <bean id="org.wamblee.mythtv.LinkStructure" class="org.wamblee.mythtv.LinkStructure">
-        <constructor-arg><value>${org.wamblee.mythtv.monitordir}</value></constructor-arg>
-        <constructor-arg><ref local="linkDir"/></constructor-arg>
-        <constructor-arg><ref local="org.wamblee.mythtv.RecordingDatabase"/></constructor-arg>
+
+    <bean id="org.wamblee.mythtv.LinkStructure"
+        parent="transactionRequiredTemplate">
+        <property name="target">
+            <bean class="org.wamblee.mythtv.LinkStructure">
+                <constructor-arg>
+                    <value>${org.wamblee.mythtv.monitordir}</value>
+                </constructor-arg>
+                <constructor-arg>
+                    <ref local="linkDir"/>
+                </constructor-arg>
+                <constructor-arg>
+                    <ref local="org.wamblee.mythtv.RecordingDatabase"/>
+                </constructor-arg>
+            </bean>
+        </property>
     </bean>
-    
+
     <bean id="org.wamblee.io.DirectoryMonitor" class="org.wamblee.io.DirectoryMonitor">
-        <constructor-arg><ref local="monitorDir"/></constructor-arg>
-        <constructor-arg><ref local="fileFilter"/></constructor-arg>
-        <constructor-arg><ref local="org.wamblee.mythtv.LinkStructure"/></constructor-arg>
+        <constructor-arg>
+            <ref local="monitorDir"/>
+        </constructor-arg>
+        <constructor-arg>
+            <ref local="fileFilter"/>
+        </constructor-arg>
+        <constructor-arg>
+            <ref local="org.wamblee.mythtv.LinkStructure"/>
+        </constructor-arg>
     </bean>
-    
-    <bean id="org.wamblee.mythtv.MonitorScheduler" class="org.wamblee.mythtv.MonitorScheduler">
-        <constructor-arg><value>${org.wamblee.mythtv.pollinterval}</value></constructor-arg>    
+
+    <bean id="org.wamblee.mythtv.ScheduleConfig" class="org.wamblee.mythtv.ScheduleConfig">
+        <constructor-arg>
+            <value>${org.wamblee.mythtv.pollinterval}</value>
+        </constructor-arg>
     </bean>
 
-</beans> 
+</beans>