(no commit message)

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 b7ee2bf3da0eb4818c0033a65630092b283deb46..45e6e220fa1c3b968d54f0d616e6fd1538937855 100644 (file)
--- 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 b3c04cfdd04cad97ea6369779dae887fded44f69..84e66f9fce136a6b38a0630c118599a04238a6ca 100644 (file)
--- 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 (file)
index 0000000..b08fa26
--- /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