[jboss-svn-commits] JBL Code SVN: r26745 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss: soa/esb/addressing/eprs and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 27 07:02:17 EDT 2009
Author: tfennelly
Date: 2009-05-27 07:02:16 -0400 (Wed, 27 May 2009)
New Revision: 26745
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2595
Merge duplicate "getJndiPrefixes" code from JMSEpr and JndiUtils
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java 2009-05-27 09:30:06 UTC (rev 26744)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java 2009-05-27 11:02:16 UTC (rev 26745)
@@ -32,6 +32,7 @@
import org.jboss.soa.esb.lifecycle.LifecycleResource;
import org.jboss.soa.esb.lifecycle.LifecycleResourceException;
import org.jboss.soa.esb.lifecycle.LifecycleResourceFactory;
+import org.jboss.soa.esb.util.JndiUtil;
import org.apache.log4j.Logger;
/**
@@ -160,7 +161,7 @@
*/
static Properties getJndiEnvironment(Map<String,String> poolKey) {
Properties environment = new Properties();
- final String[] jndiPrefixes = JMSEpr.getJndiPrefixes(poolKey.get(JMSEpr.JNDI_PREFIXES)) ;
+ final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(poolKey.get(JMSEpr.JNDI_PREFIXES)) ;
for (String key: poolKey.keySet()) {
for(String jndiPrefix: jndiPrefixes) {
if (key.startsWith(jndiPrefix)) {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2009-05-27 09:30:06 UTC (rev 26744)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2009-05-27 11:02:16 UTC (rev 26745)
@@ -43,6 +43,7 @@
import org.jboss.soa.esb.addressing.XMLUtil;
import org.jboss.soa.esb.addressing.PortReference.Extension;
import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.util.JndiUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -240,7 +241,7 @@
}
if (jndiPrefixesValue != null) {
- final String[] jndiPrefixes = getJndiPrefixes(jndiPrefixesValue) ;
+ final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(jndiPrefixesValue) ;
for(Map.Entry<String, String> entry: extensions.entrySet()) {
for(String jndiPrefix: jndiPrefixes) {
final String tag = entry.getKey() ;
@@ -649,7 +650,7 @@
{
properties.put(JNDI_PREFIXES, jndiPrefixesValue) ;
}
- final String[] jndiPrefixes = getJndiPrefixes(jndiPrefixesValue) ;
+ final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(jndiPrefixesValue) ;
Iterator<Extension> iter = getAddr().getExtensions();
while (iter.hasNext()) {
@@ -683,24 +684,11 @@
* Get the list of JNDI extension prefixes.
* @param jndiPrefixesValue The JNDI prefix list or null if default.
* @return The list of JNDI extension prefixes.
+ * @deprecated Use {@link JndiUtil#getJndiPrefixes(String)}.
*/
public static String[] getJndiPrefixes(final String jndiPrefixesValue)
{
- final Set<String> jndiPrefixesSet = new TreeSet<String>();
- jndiPrefixesSet.add("java.naming.") ;
- if (jndiPrefixesValue != null)
- {
- final String[] values = jndiPrefixesValue.split(",") ;
- for(String value: values)
- {
- final String trim = value.trim() ;
- if (trim.length() > 0)
- {
- jndiPrefixesSet.add(trim) ;
- }
- }
- }
- return jndiPrefixesSet.toArray(new String[jndiPrefixesSet.size()]) ;
+ return JndiUtil.getJndiPrefixes(jndiPrefixesValue);
}
/**
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2009-05-27 09:30:06 UTC (rev 26744)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerUtil.java 2009-05-27 11:02:16 UTC (rev 26745)
@@ -42,6 +42,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.util.Util;
+import org.jboss.soa.esb.util.JndiUtil;
public class ListenerUtil
{
@@ -145,7 +146,7 @@
if (jndiPrefixesValue != null) {
environment.put(JMSEpr.JNDI_PREFIXES, jndiPrefixesValue) ;
}
- final String[] jndiPrefixes = JMSEpr.getJndiPrefixes(jndiPrefixesValue) ;
+ final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(jndiPrefixesValue) ;
for (String attributeName : names) {
for(String jndiPrefix: jndiPrefixes) {
if (attributeName.startsWith(jndiPrefix)) {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2009-05-27 09:30:06 UTC (rev 26744)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2009-05-27 11:02:16 UTC (rev 26745)
@@ -63,6 +63,7 @@
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
import org.jboss.soa.esb.util.ClassUtil;
+import org.jboss.soa.esb.util.JndiUtil;
public class JmsGatewayListener extends AbstractThreadedManagedLifecycle {
/**
@@ -357,7 +358,7 @@
if (jndiPrefixesValue != null) {
environment.setProperty(JMSEpr.JNDI_PREFIXES, jndiPrefixesValue) ;
}
- final String[] jndiPrefixes = JMSEpr.getJndiPrefixes(jndiPrefixesValue) ;
+ final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(jndiPrefixesValue) ;
for (String name : names) {
for(String jndiPrefix: jndiPrefixes) {
if (name.startsWith(jndiPrefix)) {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2009-05-27 09:30:06 UTC (rev 26744)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2009-05-27 11:02:16 UTC (rev 26745)
@@ -40,6 +40,7 @@
import org.jboss.internal.soa.esb.rosetta.pooling.JmsConnectionPool;
import org.jboss.internal.soa.esb.rosetta.pooling.JmsConnectionPoolContainer;
import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.util.JndiUtil;
import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.helpers.ConfigTree;
@@ -411,7 +412,7 @@
String prefix = configTrees[i].getAttribute(JMSEpr.JNDI_PKG_PREFIX_TAG);
if (prefix!=null) environment.setProperty(Context.URL_PKG_PREFIXES, prefix);
List<KeyValuePair> properties=configTrees[i].childPropertyList();
- final String[] jndiPrefixes = JMSEpr.getJndiPrefixes(KeyValuePair.getValue(JMSEpr.JNDI_PREFIXES, properties)) ;
+ final String[] jndiPrefixes = JndiUtil.getJndiPrefixes(KeyValuePair.getValue(JMSEpr.JNDI_PREFIXES, properties)) ;
for (KeyValuePair property : properties) {
for(String jndiPrefix: jndiPrefixes) {
if (property.getKey().startsWith(jndiPrefix)) {
More information about the jboss-svn-commits
mailing list