From: Erik Brakkee <erik@brakkee.org>
Date: Thu, 13 Mar 2008 22:48:26 +0000 (+0000)
Subject: Message linking is now working.
X-Git-Tag: wamblee-utils-0.7~848
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=29b8624a295b08705738bbafc8ff7099e621e93f;p=utils
Message linking is now working.
---
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 bdf1cb03..36ff3077 100644
--- a/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
+++ b/mythtv/monitor/src/main/java/org/wamblee/mythtv/Application.java
@@ -62,6 +62,7 @@ public class Application implements ServletContextListener {
msg.setObject(config.getIntervalSeconds());
MessageProducer producer = session.createProducer(timerQueue);
producer.send(msg);
+ LOG.info("Message sent");
} catch (Exception e) {
LOG.fatal("Error sending message", e);
}
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 ca910301..7281bdbe 100644
--- a/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
+++ b/mythtv/timer/src/main/java/org/wamblee/timer/TimerBean.java
@@ -39,7 +39,7 @@ import org.wamblee.io.DirectoryMonitor;
/**
*
*/
-@MessageDriven(name = "MythtvTimer")
+@MessageDriven(name = "TimerBean")
// Spring's JTA transaction manager does not work with container managed transactions
// because it uses the UserTransaction object which glassfish forbids.
@TransactionManagement(TransactionManagementType.BEAN)
@@ -67,7 +67,7 @@ public class TimerBean implements MessageListener {
@Timeout
private void timeout(Timer aTimer) {
- LOG.debug("Timer expired!!!");
+ LOG.info("Timer expired!!!");
try {
DirectoryMonitor monitor = BeanKernel.getBeanFactory().find(
DirectoryMonitor.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 84e66f9f..09dda4ce 100644
--- a/mythtv/timer/src/main/resources/META-INF/ejb-jar.xml
+++ b/mythtv/timer/src/main/resources/META-INF/ejb-jar.xml
@@ -3,22 +3,19 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
version="3.0">
-
- <!-- enterprise-beans>
+
+ <enterprise-beans>
<message-driven>
- <ejb-name>TimerBean</ejb-name>
+ <ejb-name>TimerBean</ejb-name>
<ejb-class>org.wamblee.timer.TimerBean</ejb-class>
- <message-destination-ref>
- <message-destination-ref-name>MythtvTimer</message-destination-ref-name>
- </message-destination-ref>
+ <messaging-type>javax.jms.MessageListener</messaging-type>
+ <message-destination-type>javax.jms.Queue</message-destination-type>
+ <message-destination-link>InternalBootstrapQueue</message-destination-link>
</message-driven>
- </enterprise-beans -->
- <!-- assembly-descriptor>
+ </enterprise-beans>
+ <assembly-descriptor>
<message-destination>
-
- <message-destination-name>MythtvTimer</message-destination-name>
- <mapped-name>jms/MythtvTimer</mapped-name>
+ <message-destination-name>InternalBootstrapQueue</message-destination-name>
</message-destination>
- </assembly-descriptor -->
-
-</ejb-jar>
\ No newline at end of file
+ </assembly-descriptor>
+</ejb-jar>
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
index b08fa26f..b0f373b5 100644
--- a/mythtv/timer/src/main/resources/META-INF/sun-ejb-jar.xml
+++ b/mythtv/timer/src/main/resources/META-INF/sun-ejb-jar.xml
@@ -4,9 +4,14 @@
<enterprise-beans>
<ejb>
- <ejb-name>MythtvTimer</ejb-name>
+ <ejb-name>TimerBean</ejb-name>
<jndi-name>jms/MythtvTimer</jndi-name>
</ejb>
+ <message-destination>
+ <message-destination-name>InternalBootstrapQueue</message-destination-name>
+ <jndi-name>jms/MythtvTimer</jndi-name>
+ </message-destination>
+
</enterprise-beans>
-
+
</sun-ejb-jar>
\ No newline at end of file
diff --git a/mythtv/war/src/webapp/WEB-INF/sun-web.xml b/mythtv/war/src/webapp/WEB-INF/sun-web.xml
index 606cf61e..fc82b5d6 100644
--- a/mythtv/war/src/webapp/WEB-INF/sun-web.xml
+++ b/mythtv/war/src/webapp/WEB-INF/sun-web.xml
@@ -9,11 +9,5 @@ Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.d
<res-ref-name>MythtvConnectionFactory</res-ref-name>
<jndi-name>jms/MythtvConnectionFactory</jndi-name>
</resource-ref>
-
-
- <message-destination-ref>
- <message-destination-ref-name>MythtvTimer</message-destination-ref-name>
- <jndi-name>jms/MythtvTimer</jndi-name>
- </message-destination-ref>
-
+
</sun-web-app>
\ No newline at end of file
diff --git a/mythtv/war/src/webapp/WEB-INF/web.xml b/mythtv/war/src/webapp/WEB-INF/web.xml
index 8d08eb7c..efd70d09 100644
--- a/mythtv/war/src/webapp/WEB-INF/web.xml
+++ b/mythtv/war/src/webapp/WEB-INF/web.xml
@@ -13,18 +13,18 @@
<persistence-context-ref-name>persistence/mythtv</persistence-context-ref-name>
</persistence-context-ref>
- <!-- resource-ref>
+ <resource-ref>
<res-ref-name>MythtvConnectionFactory</res-ref-name>
<res-type>javax.jms.ConnectionFactory</res-type>
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref -->
+ </resource-ref>
- <!-- message-destination-ref>
- <message-destination-ref-name>jms/MythtvTimer</message-destination-ref-name>
+ <message-destination-ref>
+ <message-destination-ref-name>MythtvTimer</message-destination-ref-name>
<message-destination-type>javax.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>Timer</message-destination-link>
- </message-destination-ref -->
+ <message-destination-link>InternalBootstrapQueue</message-destination-link>
+ </message-destination-ref>
</web-app>