servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r604782 - in /servicemix/smx3/trunk: ./ common/servicemix-soap2/ deployables/bindingcomponents/servicemix-cxf-bc/ deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ deployables/bindingcomponents/servi...
Date Mon, 17 Dec 2007 07:00:32 GMT
Author: ffang
Date: Sun Dec 16 23:00:23 2007
New Revision: 604782

URL: http://svn.apache.org/viewvc?rev=604782&view=rev
Log:
[SM-1168]Redeploy of CXF SE fails
[SM-1174]update cxf version used in servicemix

Modified:
    servicemix/smx3/trunk/common/servicemix-soap2/pom.xml
    servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
    servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/GreeterImplForProvider.java
    servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImpl.java
    servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImplForClientProxy.java
    servicemix/smx3/trunk/pom.xml
    servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml

Modified: servicemix/smx3/trunk/common/servicemix-soap2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-soap2/pom.xml?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-soap2/pom.xml (original)
+++ servicemix/smx3/trunk/common/servicemix-soap2/pom.xml Sun Dec 16 23:00:23 2007
@@ -69,13 +69,19 @@
       <artifactId>xmlsec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.ws.commons.schema</groupId>
-      <artifactId>XmlSchema</artifactId>
-      <version>1.2</version>
+                <groupId>org.apache.ws.commons.schema</groupId>
+                <artifactId>XmlSchema</artifactId>
+                <version>1.3.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.woden</groupId>
       <artifactId>woden</artifactId>
+      <exclusions>
+          <exclusion>
+              <groupId>org.apache.ws.commons</groupId>
+              <artifactId>XmlSchema</artifactId>
+          </exclusion>
+      </exclusions>  
     </dependency>
   </dependencies>
 

Modified: servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml Sun Dec
16 23:00:23 2007
@@ -35,6 +35,9 @@
 
   <properties>
       <surefire.fork.mode>pertest</surefire.fork.mode>
+      <jaxb.version>2.1</jaxb.version>
+      <jaxb.impl.version>2.1.4</jaxb.impl.version>
+      <jaxb.xjc.version>2.1.4</jaxb.xjc.version>
   </properties>
 
   <dependencies>
@@ -257,11 +260,6 @@
        <scope>provided</scope>
     </dependency>
     <dependency>
-       <groupId>org.apache.ws.commons</groupId>
-       <artifactId>XmlSchema</artifactId>
-       <scope>provided</scope>
-    </dependency>
-    <dependency>
        <groupId>org.apache.ws.commons.neethi</groupId>
        <artifactId>neethi</artifactId>
        <version>2.0</version>
@@ -280,6 +278,104 @@
            </exclusion>
        </exclusions>
     </dependency>
+    <dependency>
+                    <groupId>javax.xml.ws</groupId>
+                    <artifactId>jaxws-api</artifactId>
+                    <version>2.1-1</version>
+                    <exclusions>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.soap</groupId>
+                        <artifactId>saaj-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181</artifactId>
+                    </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml</groupId>
+                        <artifactId>jsr173</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                </exclusions>
+                </dependency>
+                <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.impl.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml</groupId>
+                        <artifactId>jsr173</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                    <version>1.3.2</version>
+                </dependency>
+                <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>${jaxb.xjc.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                </exclusions>
+                </dependency>
+
   </dependencies>
 
   <build>

Modified: servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/GreeterImplForProvider.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/GreeterImplForProvider.java?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/GreeterImplForProvider.java
(original)
+++ servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/GreeterImplForProvider.java
Sun Dec 16 23:00:23 2007
@@ -16,19 +16,31 @@
  */
 package org.apache.servicemix.cxfbc;
 
+import java.util.concurrent.Future;
+
 import javax.jbi.component.ComponentContext;
 import javax.jws.WebService;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
 
 import org.apache.cxf.calculator.AddNumbersFault;
 import org.apache.cxf.calculator.CalculatorPortType;
+import org.apache.hello_world_soap_http.BadRecordLitFault;
 import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
+import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
+import org.apache.hello_world_soap_http.types.GreetMeResponse;
+import org.apache.hello_world_soap_http.types.GreetMeSometimeResponse;
+import org.apache.hello_world_soap_http.types.SayHiResponse;
+import org.apache.hello_world_soap_http.types.TestDocLitFaultResponse;
+import org.apache.hello_world_soap_http.types.TestNillableResponse;
 
 @WebService(serviceName = "SOAPServiceProvider", 
         portName = "SoapPort", 
         endpointInterface = "org.apache.hello_world_soap_http.Greeter", 
         targetNamespace = "http://apache.org/hello_world_soap_http")
 
-public class GreeterImplForProvider {
+public class GreeterImplForProvider implements Greeter {
     private ComponentContext context;
     private CalculatorPortType calculator;
     private Greeter greeter;
@@ -54,6 +66,11 @@
         }
         return "Hello " + me  + " " + ret;
     }
+
+    public String greetMeLater(long requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
     
     public ComponentContext getContext() {
         return context;
@@ -85,6 +102,91 @@
 
     public Greeter getSecurityGreeter() {
         return securityGreeter;
+    }
+
+    public Response<GreetMeResponse> greetMeAsync(String requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeAsync(String requestType, AsyncHandler<GreetMeResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<GreetMeLaterResponse> greetMeLaterAsync(long requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeLaterAsync(long requestType, AsyncHandler<GreetMeLaterResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void greetMeOneWay(String requestType) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public String greetMeSometime(String requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeSometimeAsync(String requestType, AsyncHandler<GreetMeSometimeResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String sayHi() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<SayHiResponse> sayHiAsync() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> sayHiAsync(AsyncHandler<SayHiResponse> asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void testDocLitFault(String faultType) throws BadRecordLitFault, NoSuchCodeLitFault
{
+        // TODO Auto-generated method stub
+        
+    }
+
+    public Response<TestDocLitFaultResponse> testDocLitFaultAsync(String faultType)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler<TestDocLitFaultResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String testNillable(String nillElem, int intElem) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<TestNillableResponse> testNillableAsync(String nillElem, int intElem)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> testNillableAsync(String nillElem, int intElem, AsyncHandler<TestNillableResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
     }
 
 

Modified: servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
(original)
+++ servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
Sun Dec 16 23:00:23 2007
@@ -66,9 +66,12 @@
 
 public class CxfBcRMSequenceTest extends SpringTestSupport {
     private static final Logger LOG = LogUtils.getL7dLogger(CxfBcRMSequenceTest.class);
-    private static final String GREETMEONEWAY_ACTION = null;
-    private static final String GREETME_ACTION = null;
-    private static final String GREETME_RESPONSE_ACTION = null;
+    private static final String GREETMEONEWAY_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
+    private static final String GREETME_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeRequest";
+    private static final String GREETME_RESPONSE_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeResponse";
     private static final QName CONTROL_SERVICE = new QName("http://cxf.apache.org/greeter_control",
"ControlService");
     private static final QName GREETER_SERVICE = new QName("http://cxf.apache.org/greeter_control",
"GreeterService");
     
@@ -715,7 +718,7 @@
         
         mf.verifyMessages(3, false);
         expectedActions = new String[] {RMConstants.getCreateSequenceResponseAction(),
-                                        null, null};
+            GREETME_RESPONSE_ACTION, null};
         mf.verifyActions(expectedActions, false);
         mf.verifyMessageNumbers(new String[] {null, "1", null}, false);
         mf.verifyAcknowledgements(new boolean[3] , false);
@@ -813,7 +816,7 @@
         
         mf.verifyMessages(3, false);
         expectedActions = new String[] {RMConstants.getCreateSequenceResponseAction(),
-                                        null, null};
+            GREETME_RESPONSE_ACTION, null};
         mf.verifyActions(expectedActions, false);
         mf.verifyMessageNumbers(new String[] {null, "1", null}, false);
         mf.verifyAcknowledgements(new boolean[] {false, true, false} , false);

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml (original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml Sun Dec 16
23:00:23 2007
@@ -35,6 +35,9 @@
  
     <properties>
         <surefire.fork.mode>pertest</surefire.fork.mode>
+        <jaxb.version>2.1</jaxb.version>
+        <jaxb.impl.version>2.1.4</jaxb.impl.version>
+        <jaxb.xjc.version>2.1.4</jaxb.xjc.version>
     </properties>
 
 	<dependencies>
@@ -64,6 +67,103 @@
                     <scope>provided</scope>
                 </dependency>
 
+                <dependency>
+                    <groupId>javax.xml.ws</groupId>
+                    <artifactId>jaxws-api</artifactId>
+                    <version>2.1-1</version>
+                    <exclusions>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>jsr250-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.soap</groupId>
+                        <artifactId>saaj-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.jws</groupId>
+                        <artifactId>jsr181</artifactId>
+                    </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml</groupId>
+                        <artifactId>jsr173</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                </exclusions>
+                </dependency>
+                <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.impl.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml</groupId>
+                        <artifactId>jsr173</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                    <version>1.3.2</version>
+                </dependency>         
+                <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-xjc</artifactId>
+                <version>${jaxb.xjc.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                </exclusions>
+                </dependency>
 		<dependency>
 		    <groupId>org.apache.cxf</groupId>
 		    <artifactId>cxf-rt-frontend-jaxws</artifactId>

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
(original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
Sun Dec 16 23:00:23 2007
@@ -254,7 +254,12 @@
     public void stop() throws Exception {
         ReflectionUtils.callLifecycleMethod(getPojo(), PreDestroy.class);
         JBIDispatcherUtil.clean();
-        getBus().shutdown(true);
+        //getBus().shutdown(true);
+        JBITransportFactory jbiTransportFactory = (JBITransportFactory) getBus()
+            .getExtension(ConduitInitiatorManager.class)
+            .getConduitInitiator(CxfSeComponent.JBI_TRANSPORT_ID);
+        jbiTransportFactory.removeDestination(getService().toString()
+                    + getInterfaceName().toString());
         super.stop();
     }
 

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
(original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
Sun Dec 16 23:00:23 2007
@@ -73,6 +73,15 @@
         component.getServiceUnitManager().init("proxy", getServiceUnitPath("proxy"));
         component.getServiceUnitManager().start("proxy");
         
+        //test redepoly su
+        component.getServiceUnitManager().stop("target");
+        component.getServiceUnitManager().shutDown("target");
+        component.getServiceUnitManager().undeploy("target", getServiceUnitPath("proxytarget"));
+        
+        
+        component.getServiceUnitManager().init("target", getServiceUnitPath("proxytarget"));
+        component.getServiceUnitManager().start("target");
+        
         LOG.info("test clientProxy");
         io.getInMessage().setContent(new StringSource(
                 "<message xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
@@ -85,6 +94,7 @@
         client.sendSync(io);
         assertTrue(new SourceTransformer().contentToString(
                 io.getOutMessage()).indexOf("Hello ffang 3") > 0);
+        
     }
     
     protected void tearDown() throws Exception {

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImpl.java?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImpl.java
(original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImpl.java
Sun Dec 16 23:00:23 2007
@@ -17,13 +17,26 @@
 package org.apache.servicemix.cxfse;
 
 
+import java.util.concurrent.Future;
+
 import javax.jbi.JBIException;
 import javax.jbi.component.ComponentContext;
 import javax.jbi.messaging.InOut;
 import javax.jbi.messaging.NormalizedMessage;
 import javax.jws.WebService;
 import javax.xml.namespace.QName;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
 
+import org.apache.hello_world_soap_http.BadRecordLitFault;
+import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
+import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
+import org.apache.hello_world_soap_http.types.GreetMeResponse;
+import org.apache.hello_world_soap_http.types.GreetMeSometimeResponse;
+import org.apache.hello_world_soap_http.types.SayHiResponse;
+import org.apache.hello_world_soap_http.types.TestDocLitFaultResponse;
+import org.apache.hello_world_soap_http.types.TestNillableResponse;
 import org.apache.servicemix.client.ServiceMixClient;
 import org.apache.servicemix.client.ServiceMixClientFacade;
 import org.apache.servicemix.jbi.jaxp.StringSource;
@@ -33,7 +46,7 @@
         endpointInterface = "org.apache.hello_world_soap_http.Greeter", 
         targetNamespace = "http://apache.org/hello_world_soap_http")
 
-public class GreeterImpl {
+public class GreeterImpl implements Greeter {
 
     private ComponentContext context;
     public String greetMe(String me) {
@@ -65,12 +78,101 @@
         return "Hello " + me  + " " + context.getComponentName();
     }
     
+    public String greetMeLater(long later) {
+        return "test";
+    }
+    
     public ComponentContext getContext() {
         return context;
     }
 
     public void setContext(ComponentContext context) {
         this.context = context;
+    }
+
+    public Response<GreetMeResponse> greetMeAsync(String requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeAsync(String requestType, AsyncHandler<GreetMeResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<GreetMeLaterResponse> greetMeLaterAsync(long requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeLaterAsync(long requestType, AsyncHandler<GreetMeLaterResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void greetMeOneWay(String requestType) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public String greetMeSometime(String requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeSometimeAsync(String requestType, AsyncHandler<GreetMeSometimeResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String sayHi() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<SayHiResponse> sayHiAsync() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> sayHiAsync(AsyncHandler<SayHiResponse> asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void testDocLitFault(String faultType) throws BadRecordLitFault, NoSuchCodeLitFault
{
+        // TODO Auto-generated method stub
+        
+    }
+
+    public Response<TestDocLitFaultResponse> testDocLitFaultAsync(String faultType)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler<TestDocLitFaultResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String testNillable(String nillElem, int intElem) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<TestNillableResponse> testNillableAsync(String nillElem, int intElem)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> testNillableAsync(String nillElem, int intElem, AsyncHandler<TestNillableResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
     }
 
 

Modified: servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImplForClientProxy.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImplForClientProxy.java?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImplForClientProxy.java
(original)
+++ servicemix/smx3/trunk/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/GreeterImplForClientProxy.java
Sun Dec 16 23:00:23 2007
@@ -17,10 +17,23 @@
 package org.apache.servicemix.cxfse;
 
 
+import java.util.concurrent.Future;
+
 import javax.jbi.component.ComponentContext;
 import javax.jws.WebService;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
 
 import org.apache.cxf.calculator.CalculatorPortType;
+import org.apache.hello_world_soap_http.BadRecordLitFault;
+import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
+import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
+import org.apache.hello_world_soap_http.types.GreetMeResponse;
+import org.apache.hello_world_soap_http.types.GreetMeSometimeResponse;
+import org.apache.hello_world_soap_http.types.SayHiResponse;
+import org.apache.hello_world_soap_http.types.TestDocLitFaultResponse;
+import org.apache.hello_world_soap_http.types.TestNillableResponse;
 
 
 
@@ -29,7 +42,7 @@
         endpointInterface = "org.apache.hello_world_soap_http.Greeter", 
         targetNamespace = "http://apache.org/hello_world_soap_http")
 
-public class GreeterImplForClientProxy {
+public class GreeterImplForClientProxy implements Greeter {
 
     private ComponentContext context;
     private CalculatorPortType calculator;
@@ -59,6 +72,96 @@
 
     public CalculatorPortType getCalculator() {
         return calculator;
+    }
+
+    public Response<GreetMeResponse> greetMeAsync(String requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeAsync(String requestType, AsyncHandler<GreetMeResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String greetMeLater(long requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<GreetMeLaterResponse> greetMeLaterAsync(long requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeLaterAsync(long requestType, AsyncHandler<GreetMeLaterResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void greetMeOneWay(String requestType) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public String greetMeSometime(String requestType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> greetMeSometimeAsync(String requestType, AsyncHandler<GreetMeSometimeResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String sayHi() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<SayHiResponse> sayHiAsync() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> sayHiAsync(AsyncHandler<SayHiResponse> asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void testDocLitFault(String faultType) throws BadRecordLitFault, NoSuchCodeLitFault
{
+        // TODO Auto-generated method stub
+        
+    }
+
+    public Response<TestDocLitFaultResponse> testDocLitFaultAsync(String faultType)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> testDocLitFaultAsync(String faultType, AsyncHandler<TestDocLitFaultResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String testNillable(String nillElem, int intElem) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Response<TestNillableResponse> testNillableAsync(String nillElem, int intElem)
{
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Future<?> testNillableAsync(String nillElem, int intElem, AsyncHandler<TestNillableResponse>
asyncHandler) {
+        // TODO Auto-generated method stub
+        return null;
     }
 
     

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sun Dec 16 23:00:23 2007
@@ -209,7 +209,7 @@
         <backport-util-concurrent-version>2.2</backport-util-concurrent-version>
         <camel-version>1.2.0</camel-version>
         <jencks-version>2.1</jencks-version>
-        <jetty-version>6.1.5</jetty-version>
+        <jetty-version>6.1.6</jetty-version>
         <geronimo-version>2.0.1</geronimo-version>
         <servicemix-version>3.3-SNAPSHOT</servicemix-version>
         <wsdl4j-version>1.6.1</wsdl4j-version>
@@ -220,7 +220,7 @@
         <oro-version>2.0.8</oro-version>
         <sitemesh-version>2.2.1</sitemesh-version>
         <woden-version>1.0.0M6</woden-version>
-        <cxf-version>2.0.2-incubator</cxf-version>
+        <cxf-version>2.1-incubator-SNAPSHOT</cxf-version>
         <derby-version>10.2.2.0</derby-version>
 	    <saxon-version>8.9</saxon-version>
 
@@ -889,7 +889,7 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.0.1</version>
+                <version>2.1.4</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml</groupId>
@@ -908,7 +908,7 @@
             <dependency>
                 <groupId>javax.xml</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>2.0</version>
+                <version>2.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml</groupId>
@@ -1823,9 +1823,9 @@
                 <version>1.1.2</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons</groupId>
+                <groupId>org.apache.ws.commons.schema</groupId>
                 <artifactId>XmlSchema</artifactId>
-                <version>1.1</version>
+                <version>1.3.2</version>
             </dependency>
             <dependency>
                 <groupId>lucene</groupId>

Modified: servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml?rev=604782&r1=604781&r2=604782&view=diff
==============================================================================
--- servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml (original)
+++ servicemix/smx3/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/pom.xml Sun Dec 16 23:00:23
2007
@@ -38,6 +38,41 @@
             <artifactId>servicemix-cxf-se</artifactId>
             <version>${servicemix-version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.1-1</version>
+            <exclusions>
+            <exclusion>
+               <groupId>javax.annotation</groupId>
+               <artifactId>jsr250-api</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>javax.xml.soap</groupId>
+               <artifactId>saaj-api</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>javax.xml.stream</groupId>
+               <artifactId>stax-api</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>javax.xml.bind</groupId>
+               <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>javax.xml.bind</groupId>
+               <artifactId>jsr173_api</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>javax.jws</groupId>
+                <artifactId>jsr181-api</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>javax.jws</groupId>
+                <artifactId>jsr181</artifactId>
+            </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>



Mime
View raw message