[jboss-svn-commits] JBL Code SVN: r6891 - labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners

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

Author: estebanschifman
Date: 2006-10-18 10:54:49 -0400 (Wed, 18 Oct 2006)
New Revision: 6891

Modified:
   labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/JmsQueueListener.java
   labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/ListenerPropertyNames.java
Log:
Move constant tag names from ListenerPropertyNames to JMSEpr

Modified: labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/JmsQueueListener.java
===================================================================
--- labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/JmsQueueListener.java	2006-10-18 14:54:10 UTC (rev 6890)
+++ labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/JmsQueueListener.java	2006-10-18 14:54:49 UTC (rev 6891)
@@ -22,8 +22,6 @@
 
 package org.jboss.soa.esb.message.listeners;
 
-import java.net.URISyntaxException;
-
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
 import javax.jms.ObjectMessage;
@@ -101,7 +99,7 @@
         }
 
     	_controller.unRegister(_eprName);
-
+    	cleanup();
     } // _______________________________
     
     /**
@@ -119,26 +117,19 @@
         _eprName		= obtainAttribute(ListenerPropertyNames.EPR_NAME,null);
 
         // No problem if selector is null - everything in queue will be returned
-        _sSelector = _config.getAttribute(ListenerPropertyNames.MESSAGE_SELECTOR);
+        _sSelector = _config.getAttribute(JMSEpr.MESSAGE_SELECTOR_TAG);
 
         _oQconn = null;
         _oQsess = null;
         _oQueue = null;
 
-        String sJndiType = obtainAttribute	(ListenerPropertyNames.JNDI_TYPE	,"jboss");
-        String sJndiURL = obtainAttribute	(ListenerPropertyNames.JNDI_URL		,"localhost");
+        String sJndiType = obtainAttribute	(JMSEpr.JNDI_TYPE_TAG	,"jboss");
+        String sJndiURL = obtainAttribute	(JMSEpr.JNDI_URL_TAG	,"localhost");
         Context oJndiCtx = AppServerContext.getServerContext(sJndiType,sJndiURL);
 
         String sFactClass = obtainAttribute(JMSEpr.CONNECTION_FACTORY_TAG, "ConnectionFactory");
-        _epr			= new JMSEpr(JMSEpr.QUEUE_TYPE,sQueue,sFactClass);
-        try
-        {
-    		_epr.getAddr().addExtension(ListenerPropertyNames.JNDI_TYPE,sJndiType);
-    		_epr.getAddr().addExtension(ListenerPropertyNames.JNDI_URL,sJndiURL);
-    		if (null!=_sSelector)
-    			_epr.getAddr().addExtension(ListenerPropertyNames.MESSAGE_SELECTOR,_sSelector);        	
-        }
-        catch (URISyntaxException e) {}
+        _epr = new JMSEpr(JMSEpr.QUEUE_TYPE,sQueue,sFactClass
+        				,sJndiType,sJndiURL,_sSelector);
 
 		Exception thrown = null;
         try
@@ -158,7 +149,6 @@
 
     } // ________________________________
 
-
     protected org.jboss.soa.esb.message.Message receiveEsbMessage(long millis)
     {
     	javax.jms.Message jmsMessage = null;
@@ -216,7 +206,7 @@
         	catch (Exception e2) {/* Tried my best - Just continue */ }
     }
 
-    private String obtainAttribute(String p_sAtt, String p_sDefault)
+    protected String obtainAttribute(String p_sAtt, String p_sDefault)
 		throws ConfigurationException 
 	{
     	String sVal = _config.getAttribute(p_sAtt);

Modified: labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/ListenerPropertyNames.java
===================================================================
--- labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/ListenerPropertyNames.java	2006-10-18 14:54:10 UTC (rev 6890)
+++ labs/jbossesb/workspace/eschifman/trunk/product/core/listeners/src/org/jboss/soa/esb/message/listeners/ListenerPropertyNames.java	2006-10-18 14:54:49 UTC (rev 6891)
@@ -3,9 +3,6 @@
 public class ListenerPropertyNames 
 {
 	public static final String EPR_NAME			= "epr-name";
-	public static final String JNDI_TYPE		= "jndi-type";
-    public static final String JNDI_URL 		= "jndi-URL";
-    public static final String MESSAGE_SELECTOR	= "message-selector";
     
     public static final String ACTION_ELEMENT			= "action";
     public static final String ACTION_CLASS_ATTRIBUTE	= "class";