From 795d6d72f85f95f73bd78d885ee743b187b5f3bd Mon Sep 17 00:00:00 2001
From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Wed, 6 Feb 2008 21:00:16 +0000
Subject: [PATCH]

---
 .../src/main/java/org/wamblee/timer/TimerBean.java   |  2 +-
 mythtv/timer/src/main/resources/META-INF/ejb-jar.xml | 11 +++++++----
 .../src/main/resources/META-INF/sun-ejb-jar.xml      | 12 ++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 mythtv/timer/src/main/resources/META-INF/sun-ejb-jar.xml

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
-- 
2.31.1