[jboss-cvs] JBossAS SVN: r61824 - trunk/testsuite/src/main/org/jboss/test/jbossmessaging.

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

Author: scott.stark at jboss.org
Date: 2007-03-29 00:35:24 -0400 (Thu, 29 Mar 2007)
New Revision: 61824

Modified:
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSTestCase.java
Log:
Update the logic for loading the provider properties

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSTestCase.java	2007-03-29 04:30:45 UTC (rev 61823)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/JMSTestCase.java	2007-03-29 04:35:24 UTC (rev 61824)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.jbossmessaging;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.Properties;
 import javax.naming.InitialContext;
@@ -30,7 +31,6 @@
 import org.objectweb.jtests.jms.admin.Admin;
 import org.objectweb.jtests.jms.admin.AdminFactory;
 
-import org.jboss.logging.Logger;
 import org.jboss.util.NestedRuntimeException;
 import org.jboss.test.JBossTestCase;
 
@@ -46,7 +46,8 @@
  */
 public class JMSTestCase extends JBossTestCase
 {
-   private static String PROP_FILE_NAME = "provider.properties";
+   /** JBM provider properties resource name */
+   private static String PROP_FILE_NAME = "jbossmessaging/provider.properties";
 
    private static String PROP_NAME = "jms.provider.resources.dir";
 
@@ -77,7 +78,8 @@
          log.info("setting up Admin");
          // get the Admin implementation for the current JMS provider
          // specified in provider.properties
-         admin = AdminFactory.getAdmin();
+         Properties props = getProviderProperties();
+         admin = AdminFactory.getAdmin(props);
       }
       catch (Exception e)
       {
@@ -236,6 +238,17 @@
       }
    }
 
+   protected Properties getProviderProperties()
+      throws IOException
+   {
+      Properties props = new Properties();
+      ClassLoader loader = Thread.currentThread().getContextClassLoader();
+      URL propsURL = loader.getResource(PROP_FILE_NAME);
+      System.err.println("using provider.properties: " + propsURL);
+      props.load(propsURL.openStream());
+      return props;      
+   }
+
    /**
     * Given a resource file name, prepend a directory qualifier to that name,
     * according to the instance of the JMS provider currently in use.
@@ -248,40 +261,7 @@
     */
    public static String getJMSResourceRelativePathname(String name)
    {
-      String directoryName;
-
-      // not our problem - let someone else handle it
-      if (name == null)
-         return name;
-
-      try
-      {
-         // get the JMS provider specific directory name
-         Properties props = new Properties();
-         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-         URL propsURL = loader.getResource(PROP_FILE_NAME);
-         if( propsURL == null )
-         {
-            // Assume the properties are under a jbossmessaging prefix
-            propsURL = loader.getResource("jbossmessaging/"+PROP_FILE_NAME);
-         }
-         System.err.println("using provider.properties: " + propsURL);
-         props.load(propsURL.openStream());
-         directoryName = props.getProperty(PROP_NAME);
-      }
-      catch (Exception e)
-      {
-         throw new NestedRuntimeException(
-               "error getting JMS provider directory name", e);
-      }
-
-      if (directoryName == null)
-      {
-         throw new NestedRuntimeException("Property " + PROP_NAME
-               + " has not been found in the file " + PROP_FILE_NAME + ".");
-      }
-
       // return the resource name with directory prepended
-      return (String) (directoryName + "/" + name);
+      return "jbossmessaging/" + name;
    }
 }