[jboss-svn-commits] JBL Code SVN: r18832 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb: listeners and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2008-03-11 12:15:16 -0400 (Tue, 11 Mar 2008)
New Revision: 18832

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
Log:
Populate JNDI information: JBESB-1555

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java	2008-03-11 16:12:36 UTC (rev 18831)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java	2008-03-11 16:15:16 UTC (rev 18832)
@@ -606,7 +606,7 @@
         }
 
         if(!properties.containsKey(Context.INITIAL_CONTEXT_FACTORY)) {
-            properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+            properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, Configuration.getJndiServerContextFactory());
         }
         if(!properties.containsKey(Context.PROVIDER_URL)) {
             properties.setProperty(Context.PROVIDER_URL, Configuration.getJndiServerURL());

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2008-03-11 16:12:36 UTC (rev 18831)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java	2008-03-11 16:15:16 UTC (rev 18832)
@@ -35,6 +35,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.common.Configuration;
 import org.jboss.soa.esb.addressing.EPR;
 import org.jboss.soa.esb.addressing.eprs.FTPEpr;
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
@@ -121,11 +122,14 @@
 			String type = getAttrAndWarn(tree, JMSEpr.DESTINATION_TYPE_TAG,
 					"queue");
 			String jndiURL = tree.getAttribute(JMSEpr.JNDI_URL_TAG);
-            if (jndiURL!=null) environment.setProperty(Context.PROVIDER_URL, jndiURL);
+            if (jndiURL==null) jndiURL = Configuration.getJndiServerURL() ;
+            environment.setProperty(Context.PROVIDER_URL, jndiURL);
 			String jndiContextFactory = tree.getAttribute(JMSEpr.JNDI_CONTEXT_FACTORY_TAG);
-            if (jndiContextFactory!=null) environment.setProperty(Context.INITIAL_CONTEXT_FACTORY, jndiContextFactory);
+            if (jndiContextFactory==null) jndiContextFactory = Configuration.getJndiServerContextFactory() ;
+            environment.setProperty(Context.INITIAL_CONTEXT_FACTORY, jndiContextFactory);
 			String jndiPkgPrefix = tree.getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG);
-            if (jndiPkgPrefix!=null ) environment.setProperty(Context.URL_PKG_PREFIXES, jndiPkgPrefix);
+            if (jndiPkgPrefix==null ) jndiPkgPrefix = Configuration.getJndiServerPkgPrefix() ;
+            environment.setProperty(Context.URL_PKG_PREFIXES, jndiPkgPrefix);
             
 			String jmsFactoryClass = getAttrAndWarn(tree,
 					JMSEpr.CONNECTION_FACTORY_TAG, "ConnectionFactory");