From: erik Date: Wed, 6 Feb 2008 20:19:07 +0000 (+0000) Subject: (no commit message) X-Git-Tag: wamblee-utils-0.2@603~254 X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=11bcea87af1bb48e1dd858ae1396c26460809994;p=utils --- diff --git a/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java index 53955751..bdf1cb03 100644 --- a/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java +++ b/trunk/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/trunk/mythtv/war/src/webapp/WEB-INF/sun-web.xml b/trunk/mythtv/war/src/webapp/WEB-INF/sun-web.xml index e7b2c108..606cf61e 100644 --- a/trunk/mythtv/war/src/webapp/WEB-INF/sun-web.xml +++ b/trunk/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 - + \ No newline at end of file