(no commit message)

diff --git a/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
index 539557516fac667fb932507d563db5bd834197a8..bdf1cb03be6465a8a7400bce9a8c590f5e14c112 100644 (file)
--- a/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
+++ b/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
@@ -36,10 +36,10 @@ import org.wamblee.general.BeanKernel;
 public class Application implements ServletContextListener {
     private static final Log LOG = LogFactory.getLog(Application.class);
     
-    @Resource(mappedName = "jms/MythtvConnectionFactory")
+    @Resource(name = "MythtvConnectionFactory")
     private ConnectionFactory connectionFactory; 
     
-    @Resource(mappedName = "jms/MythtvTimer")
+    @Resource(name = "MythtvTimer")
     private Queue timerQueue; 
 
     /*

diff --git a/mythtv/war/src/webapp/WEB-INF/sun-web.xml b/mythtv/war/src/webapp/WEB-INF/sun-web.xml
index e7b2c10848c1238e8d6041c6f4e382a299eccfc1..606cf61ebdd34e5dbf1745b5ac235cc973a5199a 100644 (file)
--- a/mythtv/war/src/webapp/WEB-INF/sun-web.xml
+++ b/mythtv/war/src/webapp/WEB-INF/sun-web.xml
@@ -5,14 +5,15 @@ Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.d
 
 <sun-web-app>
     
-    <!-- resource-ref>
+    <resource-ref>
         <res-ref-name>MythtvConnectionFactory</res-ref-name>
         <jndi-name>jms/MythtvConnectionFactory</jndi-name>
     </resource-ref>
     
-    <resource-ref>
-        <res-ref-name>MythtvTimer</res-ref-name>
+    
+    <message-destination-ref>
+        <message-destination-ref-name>MythtvTimer</message-destination-ref-name>
         <jndi-name>jms/MythtvTimer</jndi-name>
-    </resource-ref -->
+    </message-destination-ref>
   
 </sun-web-app>
\ No newline at end of file