From: Erik Brakkee <erik@brakkee.org>
Date: Wed, 6 Feb 2008 20:19:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: wamblee-utils-0.7~856
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=8da8fd78a21ce99e0a2da70dcdcf5a4370a5f708;hp=37723b27fc86390e870c0df62d43116fd24f58b3;p=utils

---

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 53955751..bdf1cb03 100644
--- 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 e7b2c108..606cf61e 100644
--- 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