cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r529542 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/wsdl/ rt/core/src/main/java/org/apache/cxf/wsdl11/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ ...
Date Tue, 17 Apr 2007 09:29:47 GMT
Author: mmao
Date: Tue Apr 17 02:29:46 2007
New Revision: 529542

URL: http://svn.apache.org/viewvc?view=rev&rev=529542
Log:
CXF-537 Remove hard coded namespaces in ServiceWSDLBuilder
 * Java2wsdl will not generate redundant soap11/soap12 namespaces
 * Combine part of the Tools/WSDLConstants and API/WSDLConstants 
 * Remove the redundant prefix2ns map
 * Fix the Java2wsdl tests
 * Correct the transportId in AbstractEndpointFactory, only hard code soap11 ns in localTransport
case. must revisit later.
 * Specify apparently the local transport id to some the tests

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
    incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
    incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java Tue Apr 17
02:29:46 2007
@@ -19,19 +19,23 @@
 
 package org.apache.cxf.wsdl;
 
+import java.util.HashMap;
+import java.util.Map;
 import javax.xml.namespace.QName;
 
 public final class WSDLConstants {
 
     public static final String WSDL11_NAMESPACE = "http://schemas.xmlsoap.org/wsdl";
-    
+
     public static final String NP_XMLNS = "xmlns";
     public static final String NU_XMLNS = "http://www.w3.org/2000/xmlns/";
 
     // XML Schema (CR) datatypes + structures
-    public static final String NP_SCHEMA_XSD = "xs";
+    public static final String NP_SCHEMA_XSD = "xsd";
     public static final String NU_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
 
+    public static final QName SCHEMA_QNAME = new QName(NU_SCHEMA_XSD, "schema");
+
     // XML Schema instance
     public static final String NP_SCHEMA_XSI = "xsi";
     public static final String NU_SCHEMA_XSI = "http://www.w3.org/2001/XMLSchema-instance";
@@ -41,10 +45,43 @@
     
     // XML Schema attribute names
     public static final QName NA_XSI_TYPE = new QName(NP_SCHEMA_XSI, A_XSI_TYPE, NU_SCHEMA_XSI);
-    public static final QName NA_XSI_NIL = new QName(NP_SCHEMA_XSI, A_XSI_NIL, NU_SCHEMA_XSI);
   
+    public static final QName NA_XSI_NIL = new QName(NP_SCHEMA_XSI, A_XSI_NIL, NU_SCHEMA_XSI);
+
+
 
+    public static final String SOAP11_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/soap/";
+    public static final String SOAP12_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/soap12/";
+    public static final String SOAP11_PREFIX = "soap";
+    public static final String SOAP12_PREFIX = "soap12";
+    
+    public static final Map<String, String> NS_PREFIX_PAIR = new HashMap<String,
String>(2);
+    static {
+        NS_PREFIX_PAIR.put(SOAP11_NAMESPACE, SOAP11_PREFIX);
+        NS_PREFIX_PAIR.put(SOAP12_NAMESPACE, SOAP12_PREFIX);
+    }
+    
+    public static final String XML_BINDING_NS = "http://cxf.apache.org/bindings/xformat";
+
+    public static final String WSDL11 = "1.1";
+    public static final String WSDL20 = "2.0";
 
-    private WSDLConstants() {        
+    public enum WSDLVersion {
+        WSDL11,
+        WSDL20,
+        UNKNOWN
+    };
+
+    private WSDLConstants() {
+    }
+    
+    public static WSDLVersion getVersion(String version) {
+        if (WSDL11.equals(version)) {
+            return WSDLVersion.WSDL11;
+        }
+        if (WSDL20.equals(version)) {
+            return WSDLVersion.WSDL20;
+        }
+        return WSDLVersion.UNKNOWN;
     }
     
 }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
Tue Apr 17 02:29:46 2007
@@ -46,7 +46,6 @@
 import javax.wsdl.extensions.ElementExtensible;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.factory.WSDLFactory;
-import javax.xml.namespace.QName;
 
 import com.ibm.wsdl.extensions.schema.SchemaImpl;
 
@@ -64,25 +63,20 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.WSDLConstants;
 
 public final class ServiceWSDLBuilder {
     
-    private static final QName SCHEMA_QNAME = new QName("http://www.w3.org/2001/XMLSchema",
"schema");
-    
-    private Map<String, String> prefix2ns;
     private Map<String, String> ns2prefix;
     private Definition definition;
     private List<ServiceInfo> services;
     
     public ServiceWSDLBuilder(List<ServiceInfo> services) {
         this.services = services;
-        prefix2ns = new HashMap<String, String>();
         ns2prefix = new HashMap<String, String>();
     }
     public ServiceWSDLBuilder(ServiceInfo ... services) {
-        this.services = Arrays.asList(services);
-        prefix2ns = new HashMap<String, String>();
-        ns2prefix = new HashMap<String, String>();
+        this(Arrays.asList(services));
     }
 
     public Definition build() throws WSDLException {
@@ -94,13 +88,10 @@
         if (definition == null) {
             definition = WSDLFactory.newInstance().newDefinition();
             definition.getExtensionRegistry().registerSerializer(Types.class, 
-                                                                 SCHEMA_QNAME,
+                                                                 WSDLConstants.SCHEMA_QNAME,
                                                                  new SchemaSerializer());
                     
-            addNamespace("wsdlsoap", "http://schemas.xmlsoap.org/wsdl/soap/");
-            addNamespace("wsdlsoap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
-            addNamespace("soap", "http://schemas.xmlsoap.org/soap/");
-            addNamespace("xsd", "http://www.w3.org/2001/XMLSchema");
+            addNamespace(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NU_SCHEMA_XSD);
             
             ServiceInfo si = services.get(0);
             definition.setQName(si.getName());
@@ -137,7 +128,7 @@
         for (SchemaInfo schemaInfo : schemas) {
             SchemaImpl schemaImpl = new SchemaImpl();
             schemaImpl.setRequired(true);
-            schemaImpl.setElementType(SCHEMA_QNAME);
+            schemaImpl.setElementType(WSDLConstants.SCHEMA_QNAME);
             schemaImpl.setElement(schemaInfo.getElement());
             types.addExtensibilityElement(schemaImpl);
         }
@@ -228,7 +219,7 @@
 
         for (EndpointInfo ei : serviceInfo.getEndpoints()) {
             addNamespace(ei.getTransportId());
-            addNamespace(ei.getBinding().getBindingId());
+            //addNamespace(ei.getBinding().getBindingId());
             Port port = definition.createPort();
             port.setName(ei.getName().getLocalPart());
             port.setBinding(definition.getBinding(ei.getBinding().getName()));
@@ -261,7 +252,6 @@
     }
 
     protected void addNamespace(String prefix, String namespaceURI) {
-        prefix2ns.put(prefix, namespaceURI);
         ns2prefix.put(namespaceURI, prefix);
         definition.addNamespace(prefix, namespaceURI);
     }
@@ -315,7 +305,12 @@
         }
     }
 
-    protected String getPrefix(String ns) {
+    private String getPrefix(String ns) {
+        for (String namespace : WSDLConstants.NS_PREFIX_PAIR.keySet()) {
+            if (namespace.equals(ns)) {
+                return WSDLConstants.NS_PREFIX_PAIR.get(namespace);
+            }
+        }
         String prefix = ns2prefix.get(ns);
         if (prefix == null) {
             prefix = getNewPrefix();
@@ -324,10 +319,10 @@
         return prefix;
     }
     
-    protected String getNewPrefix() {
+    private String getNewPrefix() {
         String prefix = "ns1";
         int i = 0;
-        while (prefix2ns.get(prefix) != null) {
+        while (ns2prefix.containsValue(prefix)) {
             i++;
             prefix = "ns" + i;
         }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
Tue Apr 17 02:29:46 2007
@@ -96,6 +96,7 @@
         svrFactory.setServiceFactory(bean);
         String address = "http://localhost:9000/test";
         svrFactory.setAddress(address);
+        svrFactory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
 
         ServerImpl server = (ServerImpl)svrFactory.create();
 
@@ -201,6 +202,7 @@
         svrFactory.setServiceBean(new StreamSourcePayloadProvider());
         String address = "http://localhost:9000/test";
         svrFactory.setAddress(address);
+        svrFactory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
 
         svrFactory.create();
 

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
(original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
Tue Apr 17 02:29:46 2007
@@ -165,23 +165,20 @@
                 // TODO: we shouldn't have to do this, but the DF is null because the
                 // LocalTransport doesn't return for the http:// uris
                 // People also seem to be supplying a null JMS getAddress(), which is worrying
-                transportId = "http://schemas.xmlsoap.org/soap/http";
+                transportId = "http://schemas.xmlsoap.org/wsdl/soap/";
             }
         }
         
         // Get the Service from the ServiceFactory if specified
         Service service = serviceFactory.getService();
-
         // SOAP nonsense
         BindingInfo bindingInfo = createBindingInfo();
-        if (bindingInfo instanceof SoapBindingInfo) {
-            if (((SoapBindingInfo) bindingInfo).getTransportURI() == null
-                || LocalTransportFactory.TRANSPORT_ID.equals(transportId)) {
-                ((SoapBindingInfo) bindingInfo).setTransportURI(transportId);
-            }
+        if (bindingInfo instanceof SoapBindingInfo
+            && (((SoapBindingInfo) bindingInfo).getTransportURI() == null
+            || LocalTransportFactory.TRANSPORT_ID.equals(transportId))) {
+            ((SoapBindingInfo) bindingInfo).setTransportURI(transportId);
             transportId = "http://schemas.xmlsoap.org/wsdl/soap/";
         }
-
         service.getServiceInfos().get(0).addBinding(bindingInfo);
 
         setTransportId(transportId);
@@ -239,7 +236,7 @@
             bindingFactory = mgr.getBindingFactory(binding);
             
             return bindingFactory.createBindingInfo(serviceFactory.getService(),
-                                                                    binding, bindingConfig);
+                                                    binding, bindingConfig);
         } catch (BusException ex) {
             throw new ServiceConstructionException(
                    new Message("COULD.NOT.RESOLVE.BINDING", LOG, bindingId), ex);

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
Tue Apr 17 02:29:46 2007
@@ -41,7 +41,7 @@
         
         ClientFactoryBean cfBean = new ClientFactoryBean();
         cfBean.setAddress("http://localhost/Hello");
-        cfBean.setTransportId("http://schemas.xmlsoap.org/soap/http");
+        cfBean.setTransportId("http://schemas.xmlsoap.org/wsdl/soap/");
         cfBean.setBus(getBus());
         cfBean.setServiceClass(HelloService.class);
         

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
(original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
Tue Apr 17 02:29:46 2007
@@ -137,7 +137,7 @@
         
         ServerFactoryBean svrBean = new ServerFactoryBean();
         svrBean.setAddress("http://localhost/Hello");
-        svrBean.setTransportId("http://schemas.xmlsoap.org/soap/http");
+        svrBean.setTransportId("http://schemas.xmlsoap.org/wsdl/soap/");
         svrBean.setServiceFactory(serviceFactory);
         svrBean.setBus(getBus());
         

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Tue Apr 17 02:29:46 2007
@@ -39,9 +39,9 @@
     JavaToProcessor processor = new JavaToProcessor();
     private WSDLHelper wsdlHelper = new WSDLHelper();
 
-    //     @org.junit.After
-    //     public void tearDown() {
-    //     }
+//         @org.junit.After
+//         public void tearDown() {
+//         }
         
     @Test
     public void testGetWSDLVersion() {

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
Tue Apr 17 02:29:46 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://apache.org/hello_world_soap12_http"
xmlns:wsdlsoap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns2="http://apache.org/hello_world_soap12_http/types" xmlns:soap="http://schemas.xmlsoap.org/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_soap12_http"
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:ns1="http://apache.org/hello_world_soap12_http"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/hello_world_soap12_http/types"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/hello_world_soap12_http/types"
version="1.0">
 <xs:element name="faultDetail">
@@ -83,29 +83,29 @@
     </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
-    <wsdlsoap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
+    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
     <wsdl:operation name="sayHi">
-      <wsdlsoap12:operation soapAction="" style="document"/>
+      <soap12:operation soapAction="" style="document"/>
       <wsdl:input name="sayHi">
-        <wsdlsoap12:body use="literal"/>
+        <soap12:body use="literal"/>
       </wsdl:input>
       <wsdl:output name="sayHiResponse">
-        <wsdlsoap12:body use="literal"/>
+        <soap12:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="pingMe">
-      <wsdlsoap12:operation soapAction="" style="document"/>
+      <soap12:operation soapAction="" style="document"/>
       <wsdl:input name="pingMe">
-        <wsdlsoap12:body use="literal"/>
+        <soap12:body use="literal"/>
       </wsdl:input>
       <wsdl:output name="pingMeResponse">
-        <wsdlsoap12:body use="literal"/>
+        <soap12:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="GreeterService">
     <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
-      <wsdlsoap12:address location="http://localhost:9090/hello"/>
+      <soap12:address location="http://localhost:9090/hello"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_rpc.wsdl
Tue Apr 17 02:29:46 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="StockService" targetNamespace="http://rpc.classnoanno.fortest.tools.cxf.apache.org/"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://rpc.classnoanno.fortest.tools.cxf.apache.org/"
xmlns:wsdlsoap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="StockService" targetNamespace="http://rpc.classnoanno.fortest.tools.cxf.apache.org/"
xmlns:ns1="http://rpc.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:message name="getPrice">
     <wsdl:part name="arg0" type="xsd:string">
     </wsdl:part>
@@ -17,20 +17,20 @@
     </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="StockServiceSoapBinding" type="ns1:Stock">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="getPrice">
-      <wsdlsoap:operation soapAction="" style="rpc"/>
+      <soap:operation soapAction="" style="rpc"/>
       <wsdl:input name="getPrice">
-        <wsdlsoap:body use="literal"/>
+        <soap:body use="literal"/>
       </wsdl:input>
       <wsdl:output name="getPriceResponse">
-        <wsdlsoap:body use="literal"/>
+        <soap:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="StockService">
     <wsdl:port name="StockPort" binding="ns1:StockServiceSoapBinding">
-      <wsdlsoap:address location="http://localhost"/>
+      <soap:address location="http://localhost"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl?view=diff&rev=529542&r1=529541&r2=529542
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/stock_noanno_wrapped.wsdl
Tue Apr 17 02:29:46 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="StockService" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/"
xmlns:wsdlsoap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="StockService" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/"
xmlns:ns1="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/"
attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://docwrapped.classnoanno.fortest.tools.cxf.apache.org/">
 <xsd:element name="getPrice">
@@ -35,20 +35,20 @@
     </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="StockServiceSoapBinding" type="ns1:Stock">
-    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="getPrice">
-      <wsdlsoap:operation soapAction="" style="document"/>
+      <soap:operation soapAction="" style="document"/>
       <wsdl:input name="getPrice">
-        <wsdlsoap:body use="literal"/>
+        <soap:body use="literal"/>
       </wsdl:input>
       <wsdl:output name="getPriceResponse">
-        <wsdlsoap:body use="literal"/>
+        <soap:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="StockService">
     <wsdl:port name="StockPort" binding="ns1:StockServiceSoapBinding">
-      <wsdlsoap:address location="http://localhost"/>
+      <soap:address location="http://localhost"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>



Mime
View raw message