[jboss-svn-commits] JBL Code SVN: r8165 - in labs/jbossesb/trunk/product/core: listeners/src/org/jboss/soa/esb/actions/routing listeners/src/org/jboss/soa/esb/listeners/gateway listeners/src/org/jboss/soa/esb/listeners/message listeners/src/org/jboss/soa/esb/listeners/old rosetta/src/org/jboss/internal/soa/esb/command rosetta/src/org/jboss/internal/soa/esb/couriers
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 8 18:14:52 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-08 18:14:49 -0500 (Fri, 08 Dec 2006)
New Revision: 8165
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/JmsQueueListener.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
Log:
Looking up the Queue/Topic before creating it.
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2006-12-08 22:30:20 UTC (rev 8164)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2006-12-08 23:14:49 UTC (rev 8165)
@@ -184,9 +184,12 @@
QueueConnection oQconn = qcf.createQueueConnection();
this.queueName = queueName;
-
jmsSession = oQconn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- jmsQueue = (Queue) m_oCtx.lookup(queueName);
+ try {
+ jmsQueue = (Queue) m_oCtx.lookup(queueName);
+ } catch (NamingException ne) {
+ jmsQueue = jmsSession.createQueue(queueName);
+ }
jmsProducer = jmsSession.createSender(jmsQueue);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2006-12-08 22:30:20 UTC (rev 8164)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2006-12-08 23:14:49 UTC (rev 8165)
@@ -39,6 +39,7 @@
import javax.jms.QueueSession;
import javax.jms.TextMessage;
import javax.naming.Context;
+import javax.naming.NamingException;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.addressing.EPR;
@@ -243,7 +244,11 @@
_queueConnection = qcf.createQueueConnection();
_queueSession = _queueConnection.createQueueSession(false,QueueSession.AUTO_ACKNOWLEDGE);
- _queue = _queueSession.createQueue(_queueName);
+ try {
+ _queue = (Queue) oJndiCtx.lookup(_queueName);
+ } catch (NamingException ne) {
+ _queue = _queueSession.createQueue(_queueName);
+ }
_queueConnection.start();
_messageReceiver = _queueSession.createReceiver(_queue, _messageSelector);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java 2006-12-08 22:30:20 UTC (rev 8164)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/JmsQueueListener.java 2006-12-08 23:14:49 UTC (rev 8165)
@@ -34,6 +34,7 @@
import javax.jms.QueueSession;
import javax.jms.TopicSession;
import javax.naming.Context;
+import javax.naming.NamingException;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.log4j.Logger;
@@ -179,7 +180,11 @@
_oQconn = qcf.createQueueConnection();
_oQsess = _oQconn.createQueueSession(false,TopicSession.AUTO_ACKNOWLEDGE);
- _oQueue = _oQsess.createQueue(_queueName);
+ try {
+ _oQueue = (Queue) _jndiCtx.lookup(_queueName);
+ } catch (NamingException ne) {
+ _oQueue = _oQsess.createQueue(_queueName);
+ }
_oQconn.start();
_receiver = _oQsess.createReceiver(_oQueue, _sSelector);
return;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/JmsQueueListener.java 2006-12-08 22:30:20 UTC (rev 8164)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/old/JmsQueueListener.java 2006-12-08 23:14:49 UTC (rev 8165)
@@ -33,6 +33,7 @@
import javax.jms.TextMessage;
import javax.jms.TopicSession;
import javax.naming.Context;
+import javax.naming.NamingException;
import org.jboss.soa.esb.actions.ActionDefinitionFactory;
import org.jboss.soa.esb.actions.ActionProcessor;
@@ -96,9 +97,13 @@
QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
m_oQconn = qcf.createQueueConnection();
- m_oQueue = (Queue) oJndiCtx.lookup(sQueue);
m_oQsess = m_oQconn.createQueueSession(false,
TopicSession.AUTO_ACKNOWLEDGE);
+ try {
+ m_oQueue = (Queue) oJndiCtx.lookup(sQueue);
+ } catch (NamingException ne) {
+ m_oQueue = m_oQsess.createQueue(sQueue);
+ }
m_oQconn.start();
jmsMessageReceiver = m_oQsess.createReceiver(m_oQueue, m_sSelector);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java 2006-12-08 22:30:20 UTC (rev 8164)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/command/JmsCommandQueue.java 2006-12-08 23:14:49 UTC (rev 8165)
@@ -17,6 +17,7 @@
import javax.jms.TopicConnectionFactory;
import javax.jms.TopicSession;
import javax.naming.Context;
+import javax.naming.NamingException;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
@@ -131,7 +132,12 @@
TopicConnection oTC = tcf.createTopicConnection();
TopicSession oSess = oTC.createTopicSession(false,
TopicSession.AUTO_ACKNOWLEDGE);
- Topic oTopic = oSess.createTopic(sJndiName);
+ Topic oTopic = null;
+ try {
+ oTopic = (Topic) oJndiCtx.lookup(sJndiName);
+ } catch (NamingException ne) {
+ oTopic = oSess.createTopic(sJndiName);
+ }
m_oJmsConn = oTC;
m_oJmsSess = oSess;
oTC.start();
@@ -141,7 +147,12 @@
QueueConnection oQC = qcf.createQueueConnection();
QueueSession oSess = oQC.createQueueSession(false,
TopicSession.AUTO_ACKNOWLEDGE);
- javax.jms.Queue oQ = oSess.createQueue(sJndiName);
+ javax.jms.Queue oQ = null;
+ try {
+ oQ = (javax.jms.Queue) oJndiCtx.lookup(sJndiName);
+ } catch (NamingException ne) {
+ oQ = oSess.createQueue(sJndiName);
+ }
oQC.start();
m_oJmsConn = oQC;
m_oJmsSess = oSess;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2006-12-08 22:30:20 UTC (rev 8164)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java 2006-12-08 23:14:49 UTC (rev 8165)
@@ -41,6 +41,7 @@
import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.naming.Context;
+import javax.naming.NamingException;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.log4j.Logger;
@@ -207,7 +208,12 @@
QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
QueueConnection qConn = qcf.createQueueConnection();
QueueSession qSess = qConn.createQueueSession(false,QueueSession.AUTO_ACKNOWLEDGE);
- javax.jms.Queue queue = qSess.createQueue(_epr.getDestinationName());
+ javax.jms.Queue queue = null;
+ try {
+ queue = (javax.jms.Queue) oJndiCtx.lookup(_epr.getDestinationName());
+ } catch (NamingException ne){
+ queue = qSess.createQueue(_epr.getDestinationName());
+ }
_jmsConnection = qConn;
_jmsSession = qSess;
_messageProducer = qSess.createSender(queue);
@@ -217,7 +223,12 @@
TopicConnectionFactory tcf = (TopicConnectionFactory) tmp;
TopicConnection tConn = tcf.createTopicConnection();
TopicSession tSess = tConn.createTopicSession(false,TopicSession.AUTO_ACKNOWLEDGE);
- Topic topic = tSess.createTopic(_epr.getDestinationName());
+ Topic topic = null;
+ try {
+ topic = (Topic) oJndiCtx.lookup(_epr.getDestinationName());
+ } catch (NamingException ne) {
+ topic = tSess.createTopic(_epr.getDestinationName());
+ }
_jmsConnection = tConn;
_jmsSession = tSess;
_messageProducer = tSess.createPublisher(topic);
@@ -305,7 +316,12 @@
QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
QueueConnection qConn = qcf.createQueueConnection();
QueueSession qSess = qConn.createQueueSession(false,QueueSession.AUTO_ACKNOWLEDGE);
- javax.jms.Queue queue = qSess.createQueue(_epr.getDestinationName());
+ javax.jms.Queue queue = null;
+ try {
+ queue = (javax.jms.Queue)oJndiCtx.lookup(_epr.getDestinationName());
+ } catch (NamingException ne) {
+ queue = qSess.createQueue(_epr.getDestinationName());
+ }
_jmsConnection = qConn;
_jmsSession = qSess;
_messageConsumer = qSess.createReceiver(queue,_epr.getMessageSelector());
More information about the jboss-svn-commits
mailing list