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

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

Author: kevin.conner at jboss.com
Date: 2009-02-10 09:05:46 -0500 (Tue, 10 Feb 2009)
New Revision: 25204

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java
Log:
Fix support for JNDI prefixes: JBESB-2382

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java	2009-02-10 13:50:14 UTC (rev 25203)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainer.java	2009-02-10 14:05:46 UTC (rev 25204)
@@ -160,7 +160,7 @@
      */
     static Properties getJndiEnvironment(Map<String,String> poolKey) {
         Properties environment = new Properties();
-        final String[] jndiPrefixes = JMSEpr.getJndiPrefixes(environment.getProperty(JMSEpr.JNDI_PREFIXES)) ;
+        final String[] jndiPrefixes = JMSEpr.getJndiPrefixes(poolKey.get(JMSEpr.JNDI_PREFIXES)) ;
         for (String key: poolKey.keySet()) {
             for(String jndiPrefix: jndiPrefixes) {
                 if (key.startsWith(jndiPrefix)) {

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java	2009-02-10 13:50:14 UTC (rev 25203)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPoolContainerUnitTest.java	2009-02-10 14:05:46 UTC (rev 25204)
@@ -78,6 +78,28 @@
 		assertEquals( password, poolKey.get( JMSEpr.JMS_SECURITY_CREDENTIAL_TAG ) );
 	}
 	
+	@Test
+	public void jndiPrefixes()
+	{
+		final String alternativePrefix = "alternative.naming." ;
+		
+		final Properties env = new Properties() ;
+		env.put("java.naming.first", "first") ;
+		env.put("java.naming.second", "second") ;
+		env.put("java.naming.third", "third") ;
+		env.put(alternativePrefix + "first", "alternative first") ;
+		env.put(alternativePrefix + "second", "alternative second") ;
+		env.put(alternativePrefix + "third", "alternative third") ;
+		final Map<String, String> poolKey = JmsConnectionPoolContainer.createPoolKey(env, connectionFactory) ;
+		final Properties jndiEnv = JmsConnectionPoolContainer.getJndiEnvironment(poolKey) ;
+		assertEquals("Normal JNDI entries", 3, jndiEnv.size()) ;
+		
+		env.put(JMSEpr.JNDI_PREFIXES, alternativePrefix) ;
+		final Map<String, String> alternativePoolKey = JmsConnectionPoolContainer.createPoolKey(env, connectionFactory) ;
+		final Properties alternativeJndiEnv = JmsConnectionPoolContainer.getJndiEnvironment(alternativePoolKey) ;
+		assertEquals("Alternative JNDI entries", 6, alternativeJndiEnv.size()) ;
+	}
+	
 	public static junit.framework.Test suite()
 	{
 		return new JUnit4TestAdapter( JmsConnectionPoolContainerUnitTest.class );