svn commit: r1402098 - in /cxf/trunk: rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/ testutils/src/main/java/org/apache/cxf/testutil/common/

[coheigea]

Author: coheigea
Date: Thu Oct 25 10:52:34 2012
New Revision: 1402098

URL: http://svn.apache.org/viewvc?rev=1402098&view=rev
Log:
More refactoring

Modified:
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
    
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
    
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java?rev=1402098&r1=1402097&r2=1402098&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
 Thu Oct 25 10:52:34 2012
@@ -36,7 +36,6 @@ import org.apache.cxf.aegis.xml.MessageW
 import org.apache.cxf.common.util.XMLSchemaQNames;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;

Modified: 
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?rev=1402098&r1=1402097&r2=1402098&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
 (original)
+++ 
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
 Thu Oct 25 10:52:34 2012
@@ -86,9 +86,7 @@ public abstract class AbstractJMSTester 
     protected void setupServiceInfo(String ns, String wsdl, String 
serviceName, String portName) {
         URL wsdlUrl = getClass().getResource(wsdl);
         assertNotNull(wsdlUrl);
-        if (!"HelloWorldPortSpringICF".equals(portName)) {
-            EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, 
wsdlUrl.toString());
-        }
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, wsdlUrl.toString());
         WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlUrl, new 
QName(ns, serviceName));
 
         Service service = factory.create();

Modified: 
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java?rev=1402098&r1=1402097&r2=1402098&view=diff
==============================================================================
--- 
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
 (original)
+++ 
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
 Thu Oct 25 10:52:34 2012
@@ -119,7 +119,10 @@ public class EmbeddedJMSBrokerLauncher e
                                     if 
("java.naming.provider.url".equals(f.get(prop))) {
                                         f = 
prop.getClass().getDeclaredField("value");
                                         ReflectionUtil.setAccessible(f);
-                                        f.set(prop, url);
+                                        String value = (String)f.get(prop);
+                                        if (value == null || 
!value.startsWith("classpath")) {
+                                            f.set(prop, url);
+                                        }
                                     }
                                 }
                             } catch (Exception ex) {