cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r662496 - in /cxf/branches/2.0.x-fixes: ./ distribution/src/main/release/samples/ws_addressing/ distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/ distribution/src/main/release/samples/ws_addressing/src/demo/...
Date Mon, 02 Jun 2008 17:45:01 GMT
Author: dkulp
Date: Mon Jun  2 10:45:01 2008
New Revision: 662496

URL: http://svn.apache.org/viewvc?rev=662496&view=rev
Log:
Merged revisions 662492 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r662492 | dkulp | 2008-06-02 13:31:40 -0400 (Mon, 02 Jun 2008) | 2 lines
  
  [CXF-1625] Allow decoupled responses from servlet transport by promoting the getConduitInitiator
method to the super class.
........

Added:
    cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/wsdl/cxf-servlet.xml
      - copied unchanged from r662492, cxf/trunk/distribution/src/main/release/samples/ws_addressing/wsdl/cxf-servlet.xml
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/build.xml
    cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
    cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/GreeterImpl.java
    cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/build.xml?rev=662496&r1=662495&r2=662496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/build.xml
(original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/build.xml
Mon Jun  2 10:45:01 2008
@@ -39,4 +39,20 @@
         <echo level="info" message="Generating code using wsdl2java..."/>
         <wsdl2java file="hello_world_addr.wsdl"/>
     </target>
+
+
+    <property name="cxf.war.file.name" value="helloworld_wsaddr"/>
+    <target name="war" depends="build">
+        <cxfwar wsdl="hello_world_addr.wsdl" filename="${cxf.war.file.name}.war"/>
+    </target>
+
+    <target name="client-servlet" description="run demo client hitting servlet" depends="build">
+        <property name="param" value=""/>
+        <cxfrun classname="demo.ws_addressing.client.Client" 
+            jvmarg1="-Dcxf.config.file=client.xml"
+            param1="${base.url}/helloworld_wsaddr/services/hello_world?wsdl" 
+            param2="${op}" param3="${param}"/>
+    </target>
+
+
 </project>

Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java?rev=662496&r1=662495&r2=662496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
(original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/client/Client.java
Mon Jun  2 10:45:01 2008
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.lang.reflect.UndeclaredThrowableException;
+import java.net.URL;
 import java.util.Map;
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
@@ -55,9 +56,16 @@
             System.exit(1); 
         }
         
-        try { 
-            File wsdl = new File(args[0]);
-            SOAPService service = new SOAPService(wsdl.toURL(), SERVICE_NAME);
+        try {
+            URL wsdlURL; 
+            File wsdlFile = new File(args[0]);
+            if (wsdlFile.exists()) {
+                wsdlURL = wsdlFile.toURL();
+            } else {
+                wsdlURL = new URL(args[0]);
+            }
+
+            SOAPService service = new SOAPService(wsdlURL, SERVICE_NAME);
             Greeter port = service.getSoapPort();
 
             implicitPropagation(port);

Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/GreeterImpl.java?rev=662496&r1=662495&r2=662496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/GreeterImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/ws_addressing/src/demo/ws_addressing/server/GreeterImpl.java
Mon Jun  2 10:45:01 2008
@@ -27,7 +27,8 @@
 import org.apache.hello_world_soap_http.PingMeFault;
 import org.apache.hello_world_soap_http.types.FaultDetail;
 
-@WebService(name = "Greeter",
+@WebService(name = "SoapPort",
+            portName = "SoapPort",
             serviceName = "SOAPService", 
             targetNamespace = "http://apache.org/hello_world_soap_http", 
             wsdlLocation = "file:./wsdl/hello_world_addr.wsdl")

Modified: cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=662496&r1=662495&r2=662496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Mon Jun  2 10:45:01 2008
@@ -37,7 +37,6 @@
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.HTTPSession;
 import org.apache.cxf.transports.http.QueryHandler;
@@ -160,12 +159,6 @@
     }   
      
 
-    /**
-     * @return the associated conduit initiator
-     */
-    protected ConduitInitiator getConduitInitiator() {
-        return conduitInitiator;
-    }
     
     protected String getBasePathForFullAddress(String addr) {
         try {

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=662496&r1=662495&r2=662496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Mon Jun  2 10:45:01 2008
@@ -172,6 +172,13 @@
         Exchange ex = message.getExchange();
         return ex == null ? false : ex.isOneWay();
     }
+    
+    /**
+     * @return the associated conduit initiator
+     */
+    protected ConduitInitiator getConduitInitiator() {
+        return conduitInitiator;
+    }
 
     /**
      * Copy the request headers into the message.

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java?rev=662496&r1=662495&r2=662496&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
Mon Jun  2 10:45:01 2008
@@ -92,7 +92,7 @@
         ServletDestination d = getDestinationForPath(endpointInfo.getAddress());
         if (d == null) { 
             String path = getTrimmedPath(endpointInfo.getAddress());
-            d = new ServletDestination(getBus(), null, endpointInfo, this, path);
+            d = new ServletDestination(getBus(), this, endpointInfo, this, path);
             destinations.put(path, d);
         }
         return d;



Mime
View raw message