From: Erik Brakkee <erik@brakkee.org>
Date: Wed, 6 Feb 2008 21:00:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: wamblee-utils-0.7~855
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=47c9d29c2fd575b917006af988c10f3d35bd15d1;hp=8da8fd78a21ce99e0a2da70dcdcf5a4370a5f708;p=utils

---

diff --git a/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java b/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
index b7ee2bf3..45e6e220 100644
--- a/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
+++ b/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
@@ -35,7 +35,7 @@ import org.wamblee.io.DirectoryMonitor;
 /**
  * 
  */
-@MessageDriven(mappedName = "jms/MythtvTimer")
+@MessageDriven(name = "MythtvTimer")
 public class TimerBean implements MessageListener {
     
     private static final Log LOG = LogFactory.getLog(TimerBean.class);
diff --git a/mythtv/timer/src/main/resources/META-INF/ejb-jar.xml b/mythtv/timer/src/main/resources/META-INF/ejb-jar.xml
index b3c04cfd..84e66f9f 100644
--- a/mythtv/timer/src/main/resources/META-INF/ejb-jar.xml
+++ b/mythtv/timer/src/main/resources/META-INF/ejb-jar.xml
@@ -8,12 +8,15 @@
         <message-driven>
            <ejb-name>TimerBean</ejb-name>
             <ejb-class>org.wamblee.timer.TimerBean</ejb-class>
-            <message-destination-link>jms/MythtvTimer</message-destination-link>
+            <message-destination-ref>
+                <message-destination-ref-name>MythtvTimer</message-destination-ref-name>
+            </message-destination-ref>
         </message-driven>
-    </enterprise-beans>
-    <assembly-descriptor>
+    </enterprise-beans -->
+    <!-- assembly-descriptor>
         <message-destination>
-            <message-destination-name>jms/MythtvTimer</message-destination-name>
+            
+            <message-destination-name>MythtvTimer</message-destination-name>
             <mapped-name>jms/MythtvTimer</mapped-name>
         </message-destination>
     </assembly-descriptor -->
diff --git a/mythtv/timer/src/main/resources/META-INF/sun-ejb-jar.xml b/mythtv/timer/src/main/resources/META-INF/sun-ejb-jar.xml
new file mode 100644
index 00000000..b08fa26f
--- /dev/null
+++ b/mythtv/timer/src/main/resources/META-INF/sun-ejb-jar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 EJB 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-ejb-jar_3_0-0.dtd">
+<sun-ejb-jar>
+   
+    <enterprise-beans>
+        <ejb>
+            <ejb-name>MythtvTimer</ejb-name>
+            <jndi-name>jms/MythtvTimer</jndi-name>
+        </ejb>
+    </enterprise-beans>
+   
+</sun-ejb-jar>
\ No newline at end of file