cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r679256 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend...
Date Thu, 24 Jul 2008 00:53:23 GMT
Author: dkulp
Date: Wed Jul 23 17:53:22 2008
New Revision: 679256

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

........
  r679248 | dkulp | 2008-07-23 20:38:36 -0400 (Wed, 23 Jul 2008) | 5 lines
  
  [CXF-1719, CXF-1720] RPC/Lit issues
  * Fix issues of soap:body namespace not being honored
  * Fix issues of soap-rpc:result element causing deserialization exception
  * Add a warnging (probably could/should be exception) if endpoint name doesn't match the
given name (usually due to not specifying an endpoint name and getting the autogenerated name)
of any port in the wsdl.   Try to grab a port that may make sense instead of creating a new
one so that things like soap:body and SOAPActions and stuff would hopefully be correct.
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
    cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/Server.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 23 17:53:22 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248

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

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Wed Jul 23 17:53:22 2008
@@ -547,7 +547,6 @@
             if (action == null) {
                 action = "";
             }
-
             soi.setAction(action);
             soi.setStyle(soapOp.getStyle());
         }
@@ -601,6 +600,7 @@
 
         SoapBodyInfo bodyInfo = new SoapBodyInfo();
         SoapBody soapBody = SOAPBindingUtil.getSoapBody(bmsg.getExtensors(ExtensibilityElement.class));
+        
         List parts = null;
         if (soapBody == null) {
             MIMEMultipartRelated mmr = bmsg.getExtensor(MIMEMultipartRelated.class);
@@ -608,6 +608,7 @@
                 parts = mmr.getMIMEParts();
             }
         } else {
+            bmsg.addExtensor(soapBody);
             bodyInfo.setUse(soapBody.getUse());
             parts = soapBody.getParts();
         }

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
Wed Jul 23 17:53:22 2008
@@ -26,6 +26,7 @@
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.cxf.common.logging.LogUtils;
@@ -39,6 +40,7 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageContentsList;
 import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.MessageInfo;
@@ -48,9 +50,11 @@
 import org.apache.cxf.service.model.ServiceModelUtil;
 import org.apache.cxf.staxutils.DepthXMLStreamReader;
 import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.tools.common.extensions.soap.SoapBody;
 
 public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
-
+    private static final QName SOAP12_RESULT = new QName("http://www.w3.org/2003/05/soap-rpc",
+                                                         "result");
     private static final Logger LOG = LogUtils.getL7dLogger(RPCInInterceptor.class);
     
     public RPCInInterceptor() {
@@ -59,7 +63,30 @@
     }
 
     private BindingOperationInfo getOperation(Message message, QName opName) {
-        return ServiceModelUtil.getOperation(message.getExchange(), opName);
+        BindingOperationInfo bop = ServiceModelUtil.getOperation(message.getExchange(), opName);
+        if (bop == null) {
+            Endpoint ep = message.getExchange().get(Endpoint.class);
+            if (ep == null) {
+                return null;
+            }
+            BindingInfo service = ep.getEndpointInfo().getBinding();
+            boolean output = !isRequestor(message);
+            for (BindingOperationInfo info : service.getOperations()) {
+                if (info.getName().getLocalPart().equals(opName.getLocalPart())) {
+                    SoapBody body = null;
+                    if (output) {
+                        body = info.getOutput().getExtensor(SoapBody.class);
+                    } else {
+                        body = info.getInput().getExtensor(SoapBody.class);
+                    }        
+                    if (body != null 
+                        && opName.getNamespaceURI().equals(body.getNamespaceURI()))
{
+                        return info;
+                    }
+                }
+            }
+        }
+        return bop;
     }
 
     public void handleMessage(Message message) {
@@ -111,8 +138,24 @@
             if (hasNext) {
                 hasNext = StaxUtils.toNextElement(xmlReader);
             }
+
             if (hasNext) {
                 QName qn = xmlReader.getName();
+                if (qn.equals(SOAP12_RESULT)) {
+                    //just ignore this.   The parts should work correctly.
+                    try {
+                        while (xmlReader.getEventType() != XMLStreamReader.END_ELEMENT) {
+                            xmlReader.next();
+                        }
+                        xmlReader.next();
+                    } catch (XMLStreamException e) {
+                        //ignore
+                    }
+                    StaxUtils.toNextElement(xmlReader);
+                    qn = xmlReader.getName();
+                }
+                
+                
                 // WSI-BP states that RPC/Lit part accessors should be completely unqualified
                 // However, older toolkits (Axis 1.x) are qualifying them.   We'll go
                 // ahead and just match on the localpart.   The RPCOutInterceptor

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
Wed Jul 23 17:53:22 2008
@@ -26,6 +26,7 @@
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.NSStack;
 import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
 import org.apache.cxf.interceptor.Fault;
@@ -35,6 +36,7 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.tools.common.extensions.soap.SoapBody;
 
 public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
     private static final Logger LOG = LogUtils.getL7dLogger(RPCOutInterceptor.class);
@@ -56,14 +58,15 @@
 
             XMLStreamWriter xmlWriter = getXMLStreamWriter(message);
 
-            addOperationNode(nsStack, message, xmlWriter);
 
             List<MessagePartInfo> parts = null;
 
             if (!isRequestor(message)) {
                 parts = operation.getOutput().getMessageParts();
+                addOperationNode(nsStack, message, xmlWriter, true, operation);
             } else {
                 parts = operation.getInput().getMessageParts();
+                addOperationNode(nsStack, message, xmlWriter, false, operation);
             }
             
             MessageContentsList objs = MessageContentsList.getContentsList(message);
@@ -92,11 +95,23 @@
         }
     }
 
-    protected String addOperationNode(NSStack nsStack, Message message, XMLStreamWriter xmlWriter)

+    protected String addOperationNode(NSStack nsStack, Message message, 
+                                      XMLStreamWriter xmlWriter, 
+                                      boolean output,
+                                      BindingOperationInfo boi) 
         throws XMLStreamException {
-        String responseSuffix = !isRequestor(message) ? "Response" : "";
-        BindingOperationInfo boi = message.getExchange().get(BindingOperationInfo.class);
+        String responseSuffix = output ? "Response" : "";
         String ns = boi.getName().getNamespaceURI();
+        SoapBody body = null;
+        if (output) {
+            body = boi.getOutput().getExtensor(SoapBody.class);
+        } else {
+            body = boi.getInput().getExtensor(SoapBody.class);
+        }        
+        if (body != null && !StringUtils.isEmpty(body.getNamespaceURI())) {
+            ns = body.getNamespaceURI();
+        }
+
         nsStack.add(ns);
         String prefix = nsStack.getPrefix(ns);
         StaxUtils.writeStartElement(xmlWriter, prefix, boi.getName().getLocalPart() + responseSuffix,
ns);

Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Wed Jul 23 17:53:22 2008
@@ -247,7 +247,11 @@
             }
 
         } else {
-            soapFault.setFaultCode(new QName("http://cxf.apache.org/faultcode", "HandlerFault"));
+            try {
+                soapFault.setFaultCode(new QName("http://cxf.apache.org/faultcode", "HandlerFault"));
+            } catch (SOAPException ex2) {
+                //ignore
+            }
             String msg = ex.getMessage();
             if (msg != null) {
                 soapFault.setFaultString(msg);

Modified: cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
Wed Jul 23 17:53:22 2008
@@ -102,6 +102,7 @@
             endpointName = serviceFactory.getEndpointName();
         }
         EndpointInfo ei = service.getEndpointInfo(endpointName);
+        
         if (ei != null) {
             if (transportId != null
                 && !ei.getTransportId().equals(transportId)) {
@@ -117,8 +118,32 @@
                 ei = ServiceModelUtil.findBestEndpointInfo(serviceFactory.getInterfaceName(),
service
                     .getServiceInfos());
             }
+            if (ei == null && !serviceFactory.isPopulateFromClass()) {
+                ei = ServiceModelUtil.findBestEndpointInfo(serviceFactory.getInterfaceName(),
service
+                                                           .getServiceInfos());
+                if (ei != null
+                    && transportId != null
+                    && !ei.getTransportId().equals(transportId)) {
+                    ei = null;
+                }
+                if (ei != null) {
+                    BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class);
+                    bindingFactory = bfm.getBindingFactory(ei.getBinding().getBindingId());
+                }
+
+                if (ei == null) {
+                    LOG.warning("Could not find endpoint/port for " 
+                                + endpointName + " in wsdl. Creating default.");
+                } else {
+                    LOG.warning("Could not find endpoint/port for " 
+                                + endpointName + " in wsdl. Using " 
+                                + ei.getName() + ".");                        
+                }
+            }
             if (ei == null) {
                 ei = createEndpointInfo();
+            } else if (getAddress() != null) {
+                ei.setAddress(getAddress()); 
             }
         } else if (getAddress() != null) {
             ei.setAddress(getAddress()); 

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/Server.java?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/Server.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/Server.java
Wed Jul 23 17:53:22 2008
@@ -21,6 +21,8 @@
 
 import java.net.URL;
 
+import javax.xml.namespace.QName;
+
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -71,7 +73,7 @@
                     this.getClass().getResource("resources/greeting.wsdl").toString());
         // How the hell do I know what the name of the 
         // http-destination is from using this call?
-        
+        ep.setEndpointName(new QName("http://apache.org/hello_world", name));
         ep.publish(address);
     }
 

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
Wed Jul 23 17:53:22 2008
@@ -39,7 +39,7 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination name="{http://apache.org/hello_world}Abost.http-destination">
     <http:server RedirectURL="http://localhost:9006/Hurlon"/>
   </http:destination>
 

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
Wed Jul 23 17:53:22 2008
@@ -41,7 +41,7 @@
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination 
-    name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+    name="{http://apache.org/hello_world}Bethal.http-destination">
   </http:destination>
   
   <httpj:engine-factory bus="cxf">

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
Wed Jul 23 17:53:22 2008
@@ -41,7 +41,7 @@
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <http:destination 
-         name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+         name="{http://apache.org/hello_world}Gordy.http-destination">
     <http:server RedirectURL="https://localhost:9002/Bethal"/>
   </http:destination>
   

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
Wed Jul 23 17:53:22 2008
@@ -40,7 +40,7 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination name="{http://apache.org/hello_world}Hurlon.http-destination">
     <http:server RedirectURL="http://localhost:9007/Abost"/>
   </http:destination>
   

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
Wed Jul 23 17:53:22 2008
@@ -40,7 +40,7 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination name="{http://apache.org/hello_world}Mortimer.http-destination">
     <!-- Nothing to Configure here for Mortimer -->
   </http:destination>
   

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
Wed Jul 23 17:53:22 2008
@@ -41,7 +41,7 @@
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination name="{http://apache.org/hello_world}Poltim.http-destination">
     <http:server RedirectURL="http://localhost:9000/Mortimer"/>
   </http:destination>
   

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
Wed Jul 23 17:53:22 2008
@@ -40,7 +40,7 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination name="{http://apache.org/hello_world}Rethwel.http-destination">
 
     <http:server RedirectURL="http://localhost:9000/Mortimer"/>
   </http:destination>

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf?rev=679256&r1=679255&r2=679256&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
Wed Jul 23 17:53:22 2008
@@ -41,7 +41,7 @@
               http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 
-  <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+  <http:destination name="{http://apache.org/hello_world}Tarpin.http-destination">
     <http:server RedirectURL="https://localhost:9001/Gordy"/>
   </http:destination>
   



Mime
View raw message