cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r545423 - in /incubator/cxf/trunk: distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/ distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-e...
Date Fri, 08 Jun 2007 05:36:32 GMT
Author: ffang
Date: Thu Jun  7 22:36:31 2007
New Revision: 545423

URL: http://svn.apache.org/viewvc?view=rev&rev=545423
Log:
[CXF-709] get external_provider_internal_consumer working
[CXF-710] get external_provider_external_consumer working
[CXF-711] get handler working

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_client.wsdl
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_server.wsdl
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/src/test/provider/HelloWorldProvider.java
    incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/wsdl/addNumbers.wsdl
    incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
    incubator/cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/JBIBindingFactoryTest.java
    incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIConduitOutputStream.java
    incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/build.xml
Thu Jun  7 22:36:31 2007
@@ -7,10 +7,8 @@
   "License"); you may not use this file except in compliance
   with the License. You may obtain a copy of the License at
                                                                                         
                                                                    
-                                                                                        
                                                                    
   http://www.apache.org/licenses/LICENSE-2.0
                                                                                         
                                                                    
-                                                                                        
                                                                    
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,16 +16,17 @@
   specific language governing permissions and limitations
   under the License.
 -->
+
 <project name="jbi-demo-service-engine" default="build">
 
   <property name="build.dir" location="./build"/>
   <property name="build.classes.dir" location="${build.dir}/classes"/>
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
-  <property environment="env"/>
-  
+
+  <property environment="env"/> 
   <path id="build.classpath">
-    <fileset dir="${evn.CXF_HOME}/modules">
+    <fileset dir="${env.CXF_HOME}/modules">
       <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
@@ -40,7 +39,21 @@
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
       <fileset dir="${env.CXF_HOME}/lib">
-	<include name="*.jar"/>
+	<include name="cxf-2.0-incubator-SNAPSHOT.jar"/>
+        <include name="cxf-manifest-incubator.jar"/>
+        <include name="jaxb*.jar"/>
+        <include name="neethi-2.0.jar"/>
+        <include name="jaxws-api-2.0.jar"/>
+        <include name="geronimo-annotation_1.0_spec-1.1.jar"/>
+        <include name="xml-resolver-1.2.jar"/>
+        <include name="saaj*.jar"/>
+        <include name="geronimo-ws-metadata_2.0_spec-1.1.jar"/>
+        <include name="XmlSchema-1.2.jar"/>
+        <include name="wstx-asl-3.2.1.jar"/>
+        <include name="wsdl4j-1.6.1.jar"/>
+      </fileset>
+      <fileset dir="${env.CXF_HOME}/modules/integration">
+        <include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">
 	<include name="jbi.xml"/>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/build.xml
Thu Jun  7 22:36:31 2007
@@ -7,10 +7,8 @@
   "License"); you may not use this file except in compliance
   with the License. You may obtain a copy of the License at
                                                                                         
                                                                    
-                                                                                        
                                                                    
   http://www.apache.org/licenses/LICENSE-2.0
                                                                                         
                                                                    
-                                                                                        
                                                                    
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,7 +24,7 @@
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
 
-  <property environment="env"/>  
+  <property environment="env"/> 
   <path id="build.classpath">
     <fileset dir="${env.CXF_HOME}/modules">
       <include name="cxf-manifest-incubator.jar"/>
@@ -41,7 +39,21 @@
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
       <fileset dir="${env.CXF_HOME}/lib">
-	<include name="*.jar"/>
+	<include name="cxf-2.0-incubator-SNAPSHOT.jar"/>
+        <include name="cxf-manifest-incubator.jar"/>
+        <include name="jaxb*.jar"/>
+        <include name="neethi-2.0.jar"/>
+        <include name="jaxws-api-2.0.jar"/>
+        <include name="geronimo-annotation_1.0_spec-1.1.jar"/>
+        <include name="xml-resolver-1.2.jar"/>
+        <include name="saaj*.jar"/>
+        <include name="geronimo-ws-metadata_2.0_spec-1.1.jar"/>
+        <include name="XmlSchema-1.2.jar"/>
+        <include name="wstx-asl-3.2.1.jar"/>
+        <include name="wsdl4j-1.6.1.jar"/>
+      </fileset>
+      <fileset dir="${env.CXF_HOME}/modules/integration">
+        <include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">
 	<include name="jbi.xml"/>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_client.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_client.wsdl?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_client.wsdl
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_client.wsdl
Thu Jun  7 22:36:31 2007
@@ -28,7 +28,7 @@
     xmlns:x1="http://apache.org/hello_world/types"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xformat="http://cxf.apache.org/bindings/xformat"
-    xmlns:jbi="http://apache.org/transport/jbi"
+    xmlns:jbi="http://cxf.apache.org/transports/jbi"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <wsdl:types>
         <schema targetNamespace="http://apache.org/hello_world/types" 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_server.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_server.wsdl?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_server.wsdl
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-unit/wsdl/hello_world_server.wsdl
Thu Jun  7 22:36:31 2007
@@ -28,7 +28,7 @@
     xmlns:x1="http://apache.org/hello_world/types"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xformat="http://cxf.apache.org/bindings/xformat"
-    xmlns:jbi="http://apache.org/transport/jbi"
+    xmlns:jbi="http://cxf.apache.org/transports/jbi"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <wsdl:types>
         <schema targetNamespace="http://apache.org/hello_world/types" 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/build.xml
Thu Jun  7 22:36:31 2007
@@ -16,16 +16,17 @@
   specific language governing permissions and limitations
   under the License.
 -->
+
 <project name="jbi-demo-service-engine" default="build">
 
   <property name="build.dir" location="./build"/>
   <property name="build.classes.dir" location="${build.dir}/classes"/>
   <property name="build.lib.dir" location="${build.dir}/lib"/>
   <property name="src.dir" location="./src"/>
-  <property environment="env"/>
-  
+
+  <property environment="env"/> 
   <path id="build.classpath">
-    <fileset dir="${env.CXF_HOME}/lib">
+    <fileset dir="${env.CXF_HOME}/modules">
       <include name="cxf-manifest-incubator.jar"/>
     </fileset>
     <pathelement location="./build/classes"/>
@@ -38,7 +39,21 @@
 
     <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
       <fileset dir="${env.CXF_HOME}/lib">
-	<include name="*.jar"/>
+	<include name="cxf-2.0-incubator-SNAPSHOT.jar"/>
+        <include name="cxf-manifest-incubator.jar"/>
+        <include name="jaxb*.jar"/>
+        <include name="neethi-2.0.jar"/>
+        <include name="jaxws-api-2.0.jar"/>
+        <include name="geronimo-annotation_1.0_spec-1.1.jar"/>
+        <include name="xml-resolver-1.2.jar"/>
+        <include name="saaj*.jar"/>
+        <include name="geronimo-ws-metadata_2.0_spec-1.1.jar"/>
+        <include name="XmlSchema-1.2.jar"/>
+        <include name="wstx-asl-3.2.1.jar"/>
+        <include name="wsdl4j-1.6.1.jar"/>
+      </fileset>
+      <fileset dir="${env.CXF_HOME}/modules/integration">
+        <include name="*.jar"/>
       </fileset>
       <metainf dir="./etc">
 	<include name="jbi.xml"/>
@@ -52,4 +67,5 @@
   </target>
 
 </project>
+
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/src/test/provider/HelloWorldProvider.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/src/test/provider/HelloWorldProvider.java?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/src/test/provider/HelloWorldProvider.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/src/test/provider/HelloWorldProvider.java
Thu Jun  7 22:36:31 2007
@@ -27,7 +27,7 @@
 @javax.jws.WebService(portName = "AddNumbersPort", serviceName = "AddNumbersService",
                       targetNamespace = "http://apache.org/handlers",
                       endpointInterface = "org.apache.handlers.AddNumbers",
-                      wsdlLocation = "/META-INF/addNumbers.wsdl")
+                      wsdlLocation = "./META-INF/addNumbers.wsdl")
 
 
 @HandlerChain(file = "../common/demo_handlers.xml", name = "DemoHandlerChain")

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/wsdl/addNumbers.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/wsdl/addNumbers.wsdl?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/wsdl/addNumbers.wsdl
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-unit/wsdl/addNumbers.wsdl
Thu Jun  7 22:36:31 2007
@@ -25,7 +25,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
     xmlns:x1="http://apache.org/handlers/types"
-    xmlns:jbi="http://apache.org/transport/jbi">
+    xmlns:jbi="http://cxf.apache.org/transports/jbi">
 
     <types>
         <xsd:schema

Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
(original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
Thu Jun  7 22:36:31 2007
@@ -38,6 +38,7 @@
 
     public Binding createBinding(BindingInfo binding) {
         JBIBinding jb = new JBIBinding((JBIBindingInfo) binding);
+        jb.getInInterceptors().add(new StaxInInterceptor());
         jb.getInInterceptors().add(new JBIOperationInInterceptor());
         jb.getInInterceptors().add(new JBIWrapperInInterceptor());
         jb.getOutInterceptors().add(new StaxOutInterceptor());
@@ -45,7 +46,6 @@
         jb.getOutFaultInterceptors().add(new StaxOutInterceptor());
         jb.getOutFaultInterceptors().add(new JBIFaultOutInterceptor());
         
-        jb.getInFaultInterceptors().add(new StaxInInterceptor());
         jb.getInFaultInterceptors().add(new JBIFaultInInterceptor());
         return jb;
     }

Modified: incubator/cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/JBIBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/JBIBindingFactoryTest.java?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/JBIBindingFactoryTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/JBIBindingFactoryTest.java
Thu Jun  7 22:36:31 2007
@@ -36,14 +36,14 @@
         
         JBIBindingInfo info = new JBIBindingInfo(new ServiceInfo(), "id");
         Binding binding = new JBIBindingFactory().createBinding(info);
-        assertEquals(2, binding.getInInterceptors().size());
+        assertEquals(3, binding.getInInterceptors().size());
         //assertEquals(?, binding.getInFaultInterceptors().size());
         assertEquals(2, binding.getOutInterceptors().size());
         assertEquals(2, binding.getOutFaultInterceptors().size());
         assertEquals(JBIOperationInInterceptor.class.getName(), 
-                        binding.getInInterceptors().get(0).getClass().getName());
-        assertEquals(JBIWrapperInInterceptor.class.getName(), 
                         binding.getInInterceptors().get(1).getClass().getName());
+        assertEquals(JBIWrapperInInterceptor.class.getName(), 
+                        binding.getInInterceptors().get(2).getClass().getName());
         assertEquals(StaxOutInterceptor.class.getName(), 
                         binding.getOutInterceptors().get(0).getClass().getName());
         assertEquals(JBIWrapperOutInterceptor.class.getName(), 

Modified: incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIConduitOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIConduitOutputStream.java?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIConduitOutputStream.java
(original)
+++ incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIConduitOutputStream.java
Thu Jun  7 22:36:31 2007
@@ -34,7 +34,6 @@
 import javax.jbi.messaging.NormalizedMessage;
 import javax.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
@@ -44,7 +43,6 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
@@ -144,8 +142,7 @@
                     }
                     inMessage.setContent(InputStream.class, ins);
                     
-                    XMLStreamReader reader = StaxUtils.createXMLStreamReader(content);
-                    inMessage.setContent(XMLStreamReader.class, reader);
+                    
                     conduit.getMessageObserver().onMessage(inMessage);
                     
                     

Modified: incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java?view=diff&rev=545423&r1=545422&r2=545423
==============================================================================
--- incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
(original)
+++ incubator/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBIDestination.java
Thu Jun  7 22:36:31 2007
@@ -29,14 +29,13 @@
 import javax.jbi.messaging.MessageExchange;
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
 
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.staxutils.StaxUtils;
+
 
 
 import org.apache.cxf.transport.AbstractConduit;
@@ -182,8 +181,7 @@
             
             final InputStream in = JBIMessageHelper.convertMessageToInputStream(nm.getContent());
             inMessage.setContent(InputStream.class, in);
-            XMLStreamReader reader = StaxUtils.createXMLStreamReader(in);
-            inMessage.setContent(XMLStreamReader.class, reader);                        
      
+                                           
             inMessage.setDestination(this);
             getMessageObserver().onMessage(inMessage);
             



Mime
View raw message