You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/11 19:32:38 UTC
svn commit: r1502292 - in /cxf/trunk:
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/
rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/
rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/
rt/databinding/xmlbeans/src/test/java/org/ap...
Author: dkulp
Date: Thu Jul 11 17:32:37 2013
New Revision: 1502292
URL: http://svn.apache.org/r1502292
Log:
Move some tools only stuff into tools.
Added:
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
cxf/trunk/tools/wsdlto/core/src/test/resources/
cxf/trunk/tools/wsdlto/core/src/test/resources/folder with spaces/
cxf/trunk/tools/wsdlto/core/src/test/resources/folder with spaces/import_test.wsdl
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/folder with spaces/import_test.wsdl
cxf/trunk/tools/wsdlto/core/src/test/resources/org/
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world.wsdl
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_bindings.wsdl
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_messages.wsdl
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_services.wsdl
cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_wsdl_import.wsdl
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema1_In.xsd
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_In.xsd
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema1_Out.xsd
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_Out.xsd
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema2_In.xsd
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_In.xsd
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema2_Out.xsd
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_Out.xsd
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema3_In.xsd
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_In.xsd
cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema3_Out.xsd
- copied, changed from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_Out.xsd
Removed:
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java
cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
cxf/trunk/rt/wsdl/src/test/resources/folder with spaces/import_test.wsdl
cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_In.xsd
cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_Out.xsd
cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_In.xsd
cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_Out.xsd
cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_In.xsd
cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_Out.xsd
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Thu Jul 11 17:32:37 2013
@@ -31,7 +31,6 @@ import java.util.Set;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensionRegistry;
-import javax.wsdl.factory.WSDLFactory;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
@@ -40,7 +39,6 @@ import org.apache.cxf.binding.soap.model
import org.apache.cxf.binding.soap.tcp.SoapTcpDestination;
import org.apache.cxf.binding.soap.tcp.TCPConduit;
import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
-import org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.service.Service;
@@ -55,6 +53,7 @@ import org.apache.cxf.transport.Destinat
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLEndpointFactory;
@NoJSR250Annotations
@@ -142,36 +141,35 @@ public class SoapTransportFactory extend
}
}
- public void createPortExtensors(EndpointInfo ei, Service service) {
+ public void createPortExtensors(Bus b, EndpointInfo ei, Service service) {
if (ei.getBinding() instanceof SoapBindingInfo) {
SoapBindingInfo bi = (SoapBindingInfo)ei.getBinding();
- createSoapExtensors(ei, bi, bi.getSoapVersion() instanceof Soap12);
+ createSoapExtensors(b, ei, bi, bi.getSoapVersion() instanceof Soap12);
}
}
- private void createSoapExtensors(EndpointInfo ei, SoapBindingInfo bi, boolean isSoap12) {
+ private void createSoapExtensors(Bus bus, EndpointInfo ei, SoapBindingInfo bi, boolean isSoap12) {
try {
- // We need to populate the soap extensibilityelement proxy for soap11 and soap12
- ExtensionRegistry extensionRegistry = WSDLFactory.newInstance().newPopulatedExtensionRegistry();
- SoapAddressPlugin addresser = new SoapAddressPlugin();
- addresser.setExtensionRegistry(extensionRegistry);
- //SoapAddress soapAddress = SOAPBindingUtil.createSoapAddress(extensionRegistry, isSoap12);
+
String address = ei.getAddress();
if (address == null) {
address = "http://localhost:9090";
}
- //soapAddress.setLocationURI(address);
- ei.addExtensor(addresser.createExtension(isSoap12, address));
-
- //createSoapBinding(isSoap12, extensionRegistry, bi);
+ ExtensionRegistry registry = bus.getExtension(WSDLManager.class).getExtensionRegistry();
+ SoapAddress soapAddress = SOAPBindingUtil.createSoapAddress(registry, isSoap12);
+ soapAddress.setLocationURI(address);
+
+ ei.addExtensor(soapAddress);
} catch (WSDLException e) {
e.printStackTrace();
}
}
- public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b,
+ public EndpointInfo createEndpointInfo(Bus bus,
+ ServiceInfo serviceInfo,
+ BindingInfo b,
List<?> ees) {
String transportURI = "http://schemas.xmlsoap.org/wsdl/soap/";
if (b instanceof SoapBindingInfo) {
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Thu Jul 11 17:32:37 2013
@@ -21,6 +21,9 @@ package org.apache.cxf.aegis;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import javax.wsdl.Definition;
import javax.wsdl.Import;
@@ -53,6 +56,7 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
@@ -66,7 +70,6 @@ import org.apache.cxf.transport.Destinat
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.constants.Constants;
@@ -239,11 +242,23 @@ public abstract class AbstractAegisTest
}
docs.add(writer.getDocument(definition));
- for (Import wsdlImport : WSDLDefinitionBuilder.getImports(definition)) {
+ for (Import wsdlImport : getImports(definition)) {
docs.add(writer.getDocument(wsdlImport.getDefinition()));
}
return docs;
}
+
+ private Collection<Import> getImports(final Definition wsdlDef) {
+ Collection<Import> importList = new ArrayList<Import>();
+ Map<?, ?> imports = wsdlDef.getImports();
+ for (Iterator<?> iter = imports.keySet().iterator(); iter.hasNext();) {
+ String uri = (String)iter.next();
+ List<Import> lst = CastUtils.cast((List<?>)imports.get(uri));
+ importList.addAll(lst);
+ }
+ return importList;
+ }
+
protected Definition getWSDLDefinition(String string) throws WSDLException {
ServerRegistry svrMan = getBus().getExtension(ServerRegistry.class);
Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java Thu Jul 11 17:32:37 2013
@@ -47,13 +47,14 @@ import org.apache.cxf.frontend.ServerFac
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
+
import org.junit.Before;
public abstract class AbstractSDOTest extends AbstractCXFTest {
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java Thu Jul 11 17:32:37 2013
@@ -47,13 +47,14 @@ import org.apache.cxf.frontend.ServerFac
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
+
import org.junit.Before;
public abstract class AbstractXmlBeansTest extends AbstractCXFTest {
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Thu Jul 11 17:32:37 2013
@@ -284,7 +284,7 @@ public abstract class AbstractWSDLBasedE
WSDLEndpointFactory wsdlEndpointFactory = getWSDLEndpointFactory();
EndpointInfo ei;
if (wsdlEndpointFactory != null) {
- ei = wsdlEndpointFactory.createEndpointInfo(service.getServiceInfos().get(0), bindingInfo, null);
+ ei = wsdlEndpointFactory.createEndpointInfo(bus, service.getServiceInfos().get(0), bindingInfo, null);
ei.setTransportId(transportId);
} else {
ei = new EndpointInfo(service.getServiceInfos().get(0), transportId);
@@ -300,7 +300,7 @@ public abstract class AbstractWSDLBasedE
ei.setBinding(bindingInfo);
if (wsdlEndpointFactory != null) {
- wsdlEndpointFactory.createPortExtensors(ei, service);
+ wsdlEndpointFactory.createPortExtensors(bus, ei, service);
}
service.getServiceInfos().get(0).addEndpoint(ei);
Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLEndpointFactory.java Thu Jul 11 17:32:37 2013
@@ -20,6 +20,7 @@ package org.apache.cxf.wsdl11;
import java.util.List;
+import org.apache.cxf.Bus;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
@@ -29,7 +30,7 @@ import org.apache.cxf.service.model.Serv
* A factory to create an internal {@link EndpointInfo} from WSDL Port extensions.
*/
public interface WSDLEndpointFactory {
- EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b, List<?> extensions);
+ EndpointInfo createEndpointInfo(Bus bus, ServiceInfo serviceInfo, BindingInfo b, List<?> extensions);
- void createPortExtensors(EndpointInfo ei, Service service);
+ void createPortExtensors(Bus bus, EndpointInfo ei, Service service);
}
Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Thu Jul 11 17:32:37 2013
@@ -462,7 +462,7 @@ public class WSDLServiceBuilder {
}
if (factory instanceof WSDLEndpointFactory) {
WSDLEndpointFactory wFactory = (WSDLEndpointFactory)factory;
- ei = wFactory.createEndpointInfo(service, bi,
+ ei = wFactory.createEndpointInfo(bus, service, bi,
port.getExtensibilityElements());
}
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java Thu Jul 11 17:32:37 2013
@@ -49,8 +49,8 @@ import org.apache.cxf.tools.common.ToolE
import org.apache.cxf.tools.java2wsdl.generator.AbstractGenerator;
import org.apache.cxf.tools.util.FileWriterUtil;
import org.apache.cxf.tools.util.OutputStreamCreator;
+import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
public class WSDL11Generator extends AbstractGenerator<Definition> {
Modified: cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java (original)
+++ cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java Thu Jul 11 17:32:37 2013
@@ -21,13 +21,15 @@ package org.apache.cxf.tools.validator.i
import java.util.HashSet;
import java.util.Set;
+
import javax.wsdl.Definition;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.tools.validator.internal.model.XNode;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
+import org.apache.cxf.wsdl.WSDLManager;
+
import org.junit.Assert;
import org.junit.Test;
@@ -35,8 +37,7 @@ public class WSDLRefValidatorTest extend
private Definition getWSDL(String wsdl) throws Exception {
Bus b = BusFactory.getDefaultBus();
- WSDLDefinitionBuilder wsdlBuilder = new WSDLDefinitionBuilder(b);
- return wsdlBuilder.build(wsdl);
+ return b.getExtension(WSDLManager.class).getDefinition(wsdl);
}
@Test
Copied: cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java (from r1502274, cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java?p2=cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java&p1=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilder.java (original)
+++ cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java Thu Jul 11 17:32:37 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.wsdl11;
+package org.apache.cxf.tools.wsdlto.core;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,6 +30,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.wsdl.Definition;
import javax.wsdl.Import;
import javax.wsdl.extensions.ExtensionRegistry;
@@ -44,6 +45,7 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.wsdl.WSDLBuilder;
import org.apache.cxf.wsdl.WSDLExtensibilityPlugin;
import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl11.WSDLRuntimeException;
public class WSDLDefinitionBuilder implements WSDLBuilder<Definition> {
protected static final Logger LOG = LogUtils.getL7dLogger(WSDLDefinitionBuilder.class);
Copied: cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java (from r1502274, cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java?p2=cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java&p1=cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java (original)
+++ cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilderTest.java Thu Jul 11 17:32:37 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.wsdl11;
+package org.apache.cxf.tools.wsdlto.core;
import java.util.Map;
@@ -31,6 +31,7 @@ import javax.wsdl.Service;
import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
+
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/folder with spaces/import_test.wsdl (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/folder with spaces/import_test.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/folder%20with%20spaces/import_test.wsdl?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/folder%20with%20spaces/import_test.wsdl&p1=cxf/trunk/rt/wsdl/src/test/resources/folder%20with%20spaces/import_test.wsdl&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Added: cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world.wsdl?rev=1502292&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world.wsdl (added)
+++ cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world.wsdl Thu Jul 11 17:32:37 2013
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/hello_world_soap_http"
+ xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <schema targetNamespace="http://apache.org/hello_world_soap_http/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://apache.org/hello_world_soap_http/types"
+ elementFormDefault="qualified">
+ <simpleType name="MyStringType">
+ <restriction base="string">
+ <maxLength value="30" />
+ </restriction>
+ </simpleType>
+
+ <element name="sayHi">
+ <complexType/>
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="tns:MyStringType"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeOneWay">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="pingMe">
+ <complexType/>
+ </element>
+ <element name="pingMeResponse">
+ <complexType/>
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor" type="short"/>
+ <element name="major" type="short"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeOneWayRequest">
+ <wsdl:part element="x1:greetMeOneWay" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+ <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+ <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHiRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeOneWayRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="pingMeFault">
+ <soap:fault name="pingMeFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+ <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
+
Added: cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_bindings.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_bindings.wsdl?rev=1502292&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_bindings.wsdl (added)
+++ cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_bindings.wsdl Thu Jul 11 17:32:37 2013
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"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
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<wsdl:definitions name="HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:x2="http://apache.org/hello_world"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://apache.org/hello_world/bindings">
+
+
+ <wsdl:import
+ namespace="http://apache.org/hello_world"
+ location="hello_world_wsdl_import.wsdl"/>
+
+ <wsdl:binding name="SOAPBinding" type="x2:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="sayHi">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="greetMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="pingMeFault">
+ <soap:fault name="pingMeFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+</wsdl:definitions>
Added: cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_messages.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_messages.wsdl?rev=1502292&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_messages.wsdl (added)
+++ cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_messages.wsdl Thu Jul 11 17:32:37 2013
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/hello_world/messages"
+ xmlns:x1="http://apache.org/hello_world/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://apache.org/hello_world/messages">
+ <wsdl:types>
+ <schema
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:x1="http://apache.org/hello_world/types"
+ targetNamespace="http://apache.org/hello_world/types"
+ elementFormDefault="qualified">
+ <element name="sayHi">
+ <complexType/>
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="pingMe">
+ <complexType/>
+ </element>
+ <element name="pingMeResponse">
+ <complexType/>
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor" type="short" form="qualified" minOccurs="0"/>
+ <element name="major" type="short" form="qualified" minOccurs="0"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part name="in" element="x1:sayHi"/>
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part name="out" element="x1:sayHiResponse"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part name="in" element="x1:greetMe"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part name="out" element="x1:greetMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+ </wsdl:message>
+</wsdl:definitions>
Added: cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_services.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_services.wsdl?rev=1502292&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_services.wsdl (added)
+++ cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_services.wsdl Thu Jul 11 17:32:37 2013
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"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
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<wsdl:definitions name="HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://apache.org/hello_world/services"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:x1="http://apache.org/hello_world/bindings"
+ xmlns:x2="http://apache.org/hello_world"
+ targetNamespace="http://apache.org/hello_world/services">
+
+ <wsdl:import
+ namespace="http://apache.org/hello_world/bindings"
+ location="hello_world_bindings.wsdl"/>
+
+ <wsdl:service name="SOAPService">
+ <wsdl:port name="SoapPort" binding="x1:SOAPBinding">
+ <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
+
Added: cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_wsdl_import.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_wsdl_import.wsdl?rev=1502292&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_wsdl_import.wsdl (added)
+++ cxf/trunk/tools/wsdlto/core/src/test/resources/org/apache/cxf/tools/wsdlto/core/hello_world_wsdl_import.wsdl Thu Jul 11 17:32:37 2013
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorldImport"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/hello_world"
+ xmlns:x1="http://apache.org/hello_world/messages"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://apache.org/hello_world">
+
+ <wsdl:import
+ namespace="http://apache.org/hello_world/messages"
+ location="hello_world_messages.wsdl"/>
+
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="x1:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="x1:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="x1:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="x1:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest" message="x1:pingMeRequest"/>
+ <wsdl:output name="pingMeResponse" message="x1:pingMeResponse"/>
+ <wsdl:fault name="pingMeFault" message="x1:pingMeFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+</wsdl:definitions>
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema1_In.xsd (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_In.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema1_In.xsd?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema1_In.xsd&p1=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema1_In.xsd&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema1_Out.xsd (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema1_Out.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema1_Out.xsd?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema1_Out.xsd&p1=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema1_Out.xsd&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema2_In.xsd (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_In.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema2_In.xsd?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema2_In.xsd&p1=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema2_In.xsd&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema2_Out.xsd (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema2_Out.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema2_Out.xsd?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema2_Out.xsd&p1=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema2_Out.xsd&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema3_In.xsd (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_In.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema3_In.xsd?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema3_In.xsd&p1=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema3_In.xsd&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Copied: cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder with spaces/Schema3_Out.xsd (from r1502274, cxf/trunk/rt/wsdl/src/test/resources/schema/folder with spaces/Schema3_Out.xsd)
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema3_Out.xsd?p2=cxf/trunk/tools/wsdlto/core/src/test/resources/schema/folder%20with%20spaces/Schema3_Out.xsd&p1=cxf/trunk/rt/wsdl/src/test/resources/schema/folder%20with%20spaces/Schema3_Out.xsd&r1=1502274&r2=1502292&rev=1502292&view=diff
==============================================================================
(empty)
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java Thu Jul 11 17:32:37 2013
@@ -37,6 +37,7 @@ import javax.wsdl.extensions.ExtensionRe
import javax.wsdl.xml.WSDLReader;
import org.w3c.dom.Element;
+
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
@@ -49,12 +50,12 @@ import org.apache.cxf.tools.common.ToolC
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.validator.internal.WSDL11Validator;
import org.apache.cxf.tools.wsdlto.core.AbstractWSDLBuilder;
+import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.CustomizationParser;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingDeserializer;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingSerializer;
import org.apache.cxf.wsdl.WSDLManager;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
public class JAXWSDefinitionBuilder extends AbstractWSDLBuilder {
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java?rev=1502292&r1=1502291&r2=1502292&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/AbstractWSDLToProcessor.java Thu Jul 11 17:32:37 2013
@@ -24,6 +24,7 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
+
import javax.wsdl.Definition;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
@@ -42,9 +43,9 @@ import org.apache.cxf.tools.util.ClassCo
import org.apache.cxf.tools.util.FileWriterUtil;
import org.apache.cxf.tools.util.OutputStreamCreator;
import org.apache.cxf.tools.validator.internal.WSDL11Validator;
+import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder;
import org.apache.cxf.wsdl.WSDLExtensibilityPlugin;
import org.apache.cxf.wsdl.WSDLManager;
-import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
public class AbstractWSDLToProcessor implements Processor {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractWSDLToProcessor.class);