svn commit: r786417 - in /servicemix/components/bindings/servicemix-cxf-bc/trunk/src: main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java test/java/org/apache/servicemix/cxfbc/CxfBcComponentTest.java

[ffang]

Author: ffang
Date: Fri Jun 19 09:06:30 2009
New Revision: 786417

URL: http://svn.apache.org/viewvc?rev=786417&view=rev
Log:
[SMXCOMP-573]cxf bc component shouldn't rely on the default bus

Modified:
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
    
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcComponentTest.java

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java?rev=786417&r1=786416&r2=786417&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
 Fri Jun 19 09:06:30 2009
@@ -71,7 +71,7 @@
             SpringBusFactory bf = new SpringBusFactory();
             bus = bf.createBus(getBusConfig());
         } else {
-            bus = BusFactory.getDefaultBus();
+            bus = BusFactory.newInstance().createBus();
         }
         if (getConfiguration().getAuthenticationService() == null) {
             try {

Modified: 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcComponentTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcComponentTest.java?rev=786417&r1=786416&r2=786417&view=diff
==============================================================================
--- 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcComponentTest.java
 (original)
+++ 
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcComponentTest.java
 Fri Jun 19 09:06:30 2009
@@ -67,6 +67,31 @@
         jbi.shutDown();
     }
 
+        
+    public void testListService() throws Exception {
+        CxfBcComponent comp = new CxfBcComponent();
+        CxfBcConsumer ep = new CxfBcConsumer();
+        ep.setWsdl(new ClassPathResource("HelloWorld-DOC.wsdl"));
+        ep.setTargetService(new QName("urn:test", "target"));
+        comp.setEndpoints(new CxfBcEndpointType[] {ep});
+        jbi.activateComponent(comp, "servicemix-cxfbc");
+
+        MockServiceComponent echo = new MockServiceComponent();
+        echo.setService(new QName("urn:test", "target"));
+        echo.setEndpoint("endpoint");
+        echo.setResponseXml("<jbi:message 
xmlns:jbi='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'><jbi:part>" 
+                + "<ns2:HelloResponse 
xmlns:ns2='uri:HelloWorld'><text>helloffang</text></ns2:HelloResponse></jbi:part></jbi:message>");
+        jbi.activateComponent(echo, "echo");
+        URL wsdl = getClass().getResource("/HelloWorld-DOC.wsdl");
+        assertNotNull(wsdl);
+        GetMethod getMethod = new GetMethod("http://localhost:8080";);
+        HttpClient httpClient = new HttpClient();
+        httpClient.executeMethod(getMethod);
+        String response = getMethod.getResponseBodyAsString();
+        assertTrue(response.indexOf("Known services on cxf bc component are:") 
>= 0);
+        assertTrue(response.indexOf("http://localhost:8080/hello";) >= 0);
+    }
+    
     public void testEndpointDOC() throws Exception {
         CxfBcComponent comp = new CxfBcComponent();
         CxfBcConsumer ep = new CxfBcConsumer();
@@ -101,30 +126,7 @@
 
         Thread.sleep(100);
     }
-    
-    public void testListService() throws Exception {
-        CxfBcComponent comp = new CxfBcComponent();
-        CxfBcConsumer ep = new CxfBcConsumer();
-        ep.setWsdl(new ClassPathResource("HelloWorld-DOC.wsdl"));
-        ep.setTargetService(new QName("urn:test", "target"));
-        comp.setEndpoints(new CxfBcEndpointType[] {ep});
-        jbi.activateComponent(comp, "servicemix-cxfbc");
 
-        MockServiceComponent echo = new MockServiceComponent();
-        echo.setService(new QName("urn:test", "target"));
-        echo.setEndpoint("endpoint");
-        echo.setResponseXml("<jbi:message 
xmlns:jbi='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'><jbi:part>" 
-                + "<ns2:HelloResponse 
xmlns:ns2='uri:HelloWorld'><text>helloffang</text></ns2:HelloResponse></jbi:part></jbi:message>");
-        jbi.activateComponent(echo, "echo");
-        URL wsdl = getClass().getResource("/HelloWorld-DOC.wsdl");
-        assertNotNull(wsdl);
-        GetMethod getMethod = new GetMethod("http://localhost:8080";);
-        HttpClient httpClient = new HttpClient();
-        httpClient.executeMethod(getMethod);
-        String response = getMethod.getResponseBodyAsString();
-        assertTrue(response.indexOf("Known services on cxf bc component are:") 
>= 0);
-        assertTrue(response.indexOf("http://localhost:8080/hello";) >= 0);
-    }
 
     public void testEndpointDOCWithExternalConsumer() throws Exception {
         CxfBcComponent comp = new CxfBcComponent();