[jboss-svn-commits] JBL Code SVN: r26746 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta: tests/src/org/jboss/soa/esb/util and 1 other directory.

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

Author: tfennelly
Date: 2009-05-27 07:03:07 -0400 (Wed, 27 May 2009)
New Revision: 26746

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/util/JndiUtil.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/util/JndiUtilUnitTest.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2596
Add JBoss ESB specific JNDI namespace prefix

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/util/JndiUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/util/JndiUtil.java	2009-05-27 11:02:16 UTC (rev 26745)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/util/JndiUtil.java	2009-05-27 11:03:07 UTC (rev 26746)
@@ -34,6 +34,14 @@
  */
 public class JndiUtil
 {
+
+    /**
+     * General Namespace prefix for ESB related properties.  If the property name
+     * is prefixed with this string it will be automatically added as one of the
+     * JNDI prefixes.
+     */
+    public static final String ESB_JNDI_PARAMETER_PREFIX = "org.jboss.esb.";
+
     private JndiUtil()
     {
     }
@@ -41,9 +49,11 @@
     public static Set<String> getJndiPrefixesSet(final String jndiPrefixesValue)
     {
         final Set<String> jndiPrefixesSet = new TreeSet<String>();
-        // Add default prefix.
+
+        // Add default prefixes.
         jndiPrefixesSet.add("java.naming.") ;
-        
+        jndiPrefixesSet.add(ESB_JNDI_PARAMETER_PREFIX) ;
+
         if (jndiPrefixesValue != null)
         {
             final String[] values = jndiPrefixesValue.split(",") ;
@@ -56,6 +66,7 @@
                 }
             }
         }
+        
         return jndiPrefixesSet;
     }
     

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/util/JndiUtilUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/util/JndiUtilUnitTest.java	2009-05-27 11:02:16 UTC (rev 26745)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/tests/src/org/jboss/soa/esb/util/JndiUtilUnitTest.java	2009-05-27 11:03:07 UTC (rev 26746)
@@ -40,7 +40,7 @@
     public void test_getJndiPrefixesSet()
     {
         Set<String> set = JndiUtil.getJndiPrefixesSet("test.vendorName");
-        assertEquals(2, set.size());
+        assertEquals(3, set.size());
         assertTrue(set.contains("test.vendorName"));
         assertTrue(set.contains("java.naming."));
     }