[jboss-svn-commits] JBL Code SVN: r20683 - labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/testutils.

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

Author: tfennelly
Date: 2008-06-21 18:38:14 -0400 (Sat, 21 Jun 2008)
New Revision: 20683

Modified:
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/testutils/AbstractTestRunner.java
Log:
Added explicit setting of the registry connection class as suggested by Daniel.

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/testutils/AbstractTestRunner.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/testutils/AbstractTestRunner.java	2008-06-21 14:10:23 UTC (rev 20682)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/testutils/AbstractTestRunner.java	2008-06-21 22:38:14 UTC (rev 20683)
@@ -21,6 +21,7 @@
 
 import junit.framework.TestCase;
 import org.jboss.internal.soa.esb.assertion.AssertArgument;
+import org.jboss.soa.esb.common.ModulePropertyManager;
 
 import java.io.InputStream;
 
@@ -73,6 +74,9 @@
             esbConfig.setESBProperties(AbstractTestRunner.class.getResourceAsStream("jbossesb-properties.xml"));
         }
 
+        String installedJaxrConnectionFactoryImpl = System.getProperty( "javax.xml.registry.ConnectionFactoryClass");
+        String jaxrConnectionFactoryImpl = ModulePropertyManager.getPropertyManager("registry").getProperty("org.jboss.soa.esb.registry.factoryClass", "org.apache.ws.scout.registry.ConnectionFactoryImpl"); 
+        System.setProperty( "javax.xml.registry.ConnectionFactoryClass", jaxrConnectionFactoryImpl);
         try {
             esbConfig.installRegistry();
             try {
@@ -86,6 +90,11 @@
                 esbConfig.uninstallRegistry();
             }
         } finally {
+            if(installedJaxrConnectionFactoryImpl != null) {
+                System.setProperty("javax.xml.registry.ConnectionFactoryClass", installedJaxrConnectionFactoryImpl);
+            } else {
+                System.getProperties().remove("javax.xml.registry.ConnectionFactoryClass");
+            }
             esbConfig.resetESBProperties();
         }
     }