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

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

Author: kevin.conner at jboss.com
Date: 2008-05-30 13:58:22 -0400 (Fri, 30 May 2008)
New Revision: 20232

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContextPool.java
Log:
Rework JNDI context test: JBESB-1773

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2008-05-30 17:56:48 UTC (rev 20231)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2008-05-30 17:58:22 UTC (rev 20232)
@@ -57,6 +57,7 @@
 	public static final String JNDI_SERVER_URL                = "org.jboss.soa.esb.jndi.server.url";
 	public static final String JNDI_SERVER_CONTEXT_FACTORY    = "org.jboss.soa.esb.jndi.server.context.factory";
 	public static final String JNDI_SERVER_PKG_PREFIX         = "org.jboss.soa.esb.jndi.server.pkg.prefix";
+	public static final String JNDI_SERVER_TEST_LOOKUP         = "org.jboss.soa.esb.jndi.test.lookup";
 	public static final String PARAMS_REPOS_IMPL_CLASS        = "org.jboss.soa.esb.paramsRepository.class";
 	public static final String OBJECT_STORE_CONFIG_FILE       = "org.jboss.soa.esb.objStore.configFile";
 	public static final String ENCRYPT_FACTORY_CLASS          = "org.jboss.soa.esb.encryption.factory.class";

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContextPool.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContextPool.java	2008-05-30 17:56:48 UTC (rev 20231)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/NamingContextPool.java	2008-05-30 17:58:22 UTC (rev 20232)
@@ -75,6 +75,10 @@
      */
     private static final String DEFAULT_KEY = "<empty key>" ;
     /**
+     * Default JNDI test lookup
+     */
+    private static final String DEFAULT_TEST_LOOKUP = "__dummy2" ;
+    /**
      * Maximum pool size.
      */
     private static final int POOL_SIZE ;
@@ -86,6 +90,10 @@
      * Retry count for creating Naming Contexts.
      */
     private static final int RETRY_COUNT ;
+    /**
+     * JNDI test lookup
+     */
+    private static final String TEST_LOOKUP ;
 
     /**
      * The lifecycle resource factory.
@@ -339,10 +347,9 @@
                 
                 try
                 {
-                    context.list("__dummy2@#$%") ;
+                    context.lookup(TEST_LOOKUP) ;
                 }
                 catch (final NameNotFoundException nfne) {} // Expected
-                catch (final NotContextException nce) {} // Expected from IBM MQ
             }
             catch (final NamingException ne)
             {
@@ -389,6 +396,7 @@
         POOL_SIZE = getIntProperty(prop, Environment.NAMING_CONTEXT_POOL_SIZE, DEFAULT_POOL_SIZE);
         SLEEP_PERIOD = getIntProperty(prop, Environment.NAMING_CONTEXT_SLEEP_PERIOD, DEFAULT_SLEEP_PERIOD);
         RETRY_COUNT = getIntProperty(prop, Environment.NAMING_CONTEXT_RETRY_COUNT, DEFAULT_RETRY_COUNT);
+        TEST_LOOKUP = prop.getProperty(Environment.JNDI_SERVER_TEST_LOOKUP, DEFAULT_TEST_LOOKUP) ;
     }
     
     /**