[jboss-svn-commits] JBL Code SVN: r18408 - labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/routing.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2008-02-08 03:28:55 -0500 (Fri, 08 Feb 2008)
New Revision: 18408

Modified:
   labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
Log:
Added support for Topics


Modified: labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java	2008-02-08 06:54:37 UTC (rev 18407)
+++ labs/jbossesb/workspace/dbevenius/redeliver/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java	2008-02-08 08:28:55 UTC (rev 18408)
@@ -35,6 +35,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Queue;
 import javax.jms.QueueSession;
+import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.Context;
 import javax.naming.NamingException;
@@ -205,7 +206,7 @@
         	sb.append("Exception while sending message [").append(message).append("] to destination [");
             
             if (queueSetup != null)
-            	sb.append(queueSetup.queueName).append("].");
+            	sb.append(queueSetup.destinationName).append("].");
             else
             	sb.append("null ].");
             
@@ -222,7 +223,7 @@
         	jmsMessage = queueSetup.jmsSession.createTextMessage();
 
             if(logger.isDebugEnabled()) {
-                logger.debug("Sending Text message: [" + objectFromBody + "] to destination [" + queueSetup.queueName + "].");
+                logger.debug("Sending Text message: [" + objectFromBody + "] to destination [" + queueSetup.destinationName + "].");
             }
             
             ((TextMessage)jmsMessage).setText((String)objectFromBody);
@@ -230,7 +231,7 @@
         	jmsMessage = queueSetup.jmsSession.createBytesMessage();
         
             if(logger.isDebugEnabled()) {
-                logger.debug("Sending byte[] message: [" + objectFromBody + "] to destination [" + queueSetup.queueName + "].");
+                logger.debug("Sending byte[] message: [" + objectFromBody + "] to destination [" + queueSetup.destinationName + "].");
             }
             
             ((BytesMessage)jmsMessage).writeBytes((byte[])objectFromBody);
@@ -263,7 +264,7 @@
 		jmsMessage = queueSetup.jmsSession.createObjectMessage();
 		
 		if(logger.isDebugEnabled()) {
-		    logger.debug("Sending Object message: [" + message + "] to destination [" + queueSetup.queueName + "].");
+		    logger.debug("Sending Object message: [" + message + "] to destination [" + queueSetup.destinationName + "].");
 		}
 		((ObjectMessage)jmsMessage).setObject((Serializable) message);
 		return jmsMessage;
@@ -320,16 +321,16 @@
 	}
     
     private static class JMSSendQueueSetup {
-        QueueSession jmsSession;
-        Queue jmsQueue;
+        Session jmsSession;
+        Destination jmsDestination;
         MessageProducer jmsProducer;
-        String queueName;
+        String destinationName;
         JmsConnectionPool pool;
         Properties environment;
         
         // TODO: Modify to support topic destinations too
 
-        private JMSSendQueueSetup(String queueName) throws NamingException, JMSException, ConnectionException  {
+        private JMSSendQueueSetup(String destinationName) throws NamingException, JMSException, ConnectionException  {
             environment = new Properties();
             environment.setProperty(Context.PROVIDER_URL, Configuration.getJndiServerURL());
             environment.setProperty(Context.INITIAL_CONTEXT_FACTORY, Configuration.getJndiServerContextFactory());
@@ -337,23 +338,23 @@
             Context oCtx = NamingContext.getServerContext(environment);
             pool = JmsConnectionPoolContainer.getPool(environment, "ConnectionFactory", JMSEpr.QUEUE_TYPE);
             
-            this.queueName = queueName;
+            this.destinationName = destinationName;
             
             jmsSession = pool.getQueueSession();
             boolean clean = true ;
             try {
                 try {
-                	jmsQueue = (Queue) oCtx.lookup(queueName);
+                	jmsDestination = (Destination)oCtx.lookup(destinationName);
                 } catch (NamingException ne) {
                     try {
                         oCtx = NamingContext.getFreshServerContext(environment);
-                        jmsQueue = (Queue) oCtx.lookup(queueName);
+                        jmsDestination = (Queue) oCtx.lookup(destinationName);
                     } catch (NamingException nex) {
                         //ActiveMQ
-                        jmsQueue = jmsSession.createQueue(queueName);
+                        jmsDestination = jmsSession.createQueue(destinationName);
                     }
                 }
-                jmsProducer = jmsSession.createSender(jmsQueue);
+                jmsProducer = jmsSession.createProducer(jmsDestination);
                 clean = false ;
             } finally {
                 if (clean) {