diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java similarity index 91% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java index 5e282e34..80e62568 100644 --- a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java @@ -33,6 +33,19 @@ import org.springframework.xml.xsd.XsdSchemaCollection; * conventions in one or more inlined XSD schemas. Delegates to {@link InliningXsdSchemaTypesProvider}, {@link * DefaultMessagesProvider}, {@link SuffixBasedPortTypesProvider}, {@link SoapProvider} underneath; effectively * equivalent to using a {@link ProviderBasedWsdl4jDefinition} with all these providers. + *

+ * Example configuration: + * 

+ * <bean id="airline" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
+ *   <property name="schema">
+ *     <bean class="org.springframework.xml.xsd.SimpleXsdSchema">
+ *       <property name="xsd" value="/WEB-INF/airline.xsd"/>
+ *     </bean>
+ *   </property>
+ *   <property name="portTypeName" value="Airline"/>
+ *   <property name="locationUri" value="http://localhost:8080/airline/services"/>
+ * </bean>
+ *
* * @author Arjen Poutsma * @since 1.5.0 diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java index b728d495..9216b499 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java @@ -41,6 +41,8 @@ import javax.xml.namespace.QName; * * @author Arjen Poutsma * @since 1.0.0 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ public abstract class AbstractBindingWsdl4jDefinitionBuilder extends AbstractWsdl4jDefinitionBuilder { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java index 8f9af5af..60409b1a 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java @@ -45,6 +45,8 @@ import javax.xml.namespace.QName; * @author Arjen Poutsma * @see #setLocationUri(String) * @since 1.0.0 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBindingWsdl4jDefinitionBuilder { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java index 5cf3a5b1..2d139a2b 100755 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java @@ -46,6 +46,8 @@ import javax.xml.namespace.QName; * @author Alex Marshall * @see #setLocationUri(String) * @since 1.5.0 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBindingWsdl4jDefinitionBuilder { @@ -53,9 +55,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind private static final String WSDL_SOAP_PREFIX = "soap12"; - /** - * The default soap12:binding transport attribute value. - */ + /** The default soap12:binding transport attribute value. */ public static final String DEFAULT_TRANSPORT_URI = "http://schemas.xmlsoap.org/soap/http"; private String transportUri = DEFAULT_TRANSPORT_URI; @@ -72,16 +72,12 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind this.transportUri = transportUri; } - /** - * Sets the value used for the soap12:address location attribute value. - */ + /** Sets the value used for the soap12:address location attribute value. */ public void setLocationUri(String locationUri) { this.locationUri = locationUri; } - /** - * Adds the WSDL SOAP namespace to the definition. - */ + /** Adds the WSDL SOAP namespace to the definition. */ protected void populateDefinition(Definition definition) throws WSDLException { definition.addNamespace(WSDL_SOAP_PREFIX, WSDL_SOAP_NAMESPACE_URI); } diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java index e8abbded..ae7a6a16 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.ws.wsdl.WsdlDefinitionException; import org.springframework.ws.wsdl.wsdl11.Wsdl11Definition; import org.springframework.ws.wsdl.wsdl11.Wsdl11DefinitionBuilder; @@ -37,6 +38,8 @@ import org.springframework.ws.wsdl.wsdl11.Wsdl4jDefinitionException; * * @author Arjen Poutsma * @since 1.0.0 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ public abstract class AbstractWsdl4jDefinitionBuilder implements Wsdl11DefinitionBuilder { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java index d72b56e2..2539ba3a 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java @@ -82,6 +82,8 @@ import org.springframework.xml.namespace.QNameUtils; * @see #setRequestSuffix(String) * @see #setResponseSuffix(String) * @since 1.0.0 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jDefinitionBuilder implements InitializingBean { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java index 55edcda0..362a0a31 100755 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java @@ -83,6 +83,8 @@ import org.springframework.xml.namespace.QNameUtils; * @see #setRequestSuffix(String) * @see #setResponseSuffix(String) * @since 1.5.0 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jDefinitionBuilder implements InitializingBean { @@ -288,7 +290,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD definition.addNamespace(prefix, elementName.getNamespaceURI()); break; } - i++; + i++; } } Message message = definition.createMessage(); diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdSchemaHelper.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdSchemaHelper.java index bccd9326..11ad489d 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdSchemaHelper.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdSchemaHelper.java @@ -26,23 +26,26 @@ import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; -import org.springframework.xml.namespace.QNameUtils; -import org.springframework.xml.sax.SaxUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import org.springframework.core.io.Resource; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; +import org.springframework.xml.namespace.QNameUtils; +import org.springframework.xml.sax.SaxUtils; + /** * Helper class for dealing with XSD schemas. Exposes the target namespace, and the list of qualified names declared in * a schema. * * @author Arjen Poutsma * @since 1.0.2 + * @deprecated as of Spring Web Services 1.5: superseded by {@link org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition} + * and the {@link org.springframework.ws.wsdl.wsdl11.provider} package */ class XsdSchemaHelper { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/package.html b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/package.html index f618f3b6..cde2b794 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/package.html +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/package.html @@ -1,5 +1,6 @@ -Provides a strategy for WSDL building. Used by DynamicWsdl11Definition to generate WSDL definitions at runtime. +Deprecated as of Spring Web Services 1.5: superseded by the DefaultWsdl11Definition +and org.springframework.ws.wsdl.wsdl11.provider package. diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingsProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ImportsProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/MessagesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/PortTypesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServicesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/TypesProvider.java diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html rename to core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/package.html diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java rename to core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java rename to core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java rename to core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java rename to core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java rename to core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java rename to core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/A.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/A.xsd rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/ABC.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/ABC.xsd rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/B.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/B.xsd rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/C.xsd diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/D.xsd diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd b/core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd rename to core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/schema.xsd diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingProvider.java b/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingProvider.java deleted file mode 100644 index 444160cf..00000000 --- a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/BindingProvider.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2008 the original author or authors. - * - * Licensed 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. - */ - -package org.springframework.ws.wsdl.wsdl11.provider; - -import javax.wsdl.Binding; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; - -/** - * @author Arjen Poutsma - * @since 1.5.0 - */ -public interface BindingProvider { - - void addBinding(Definition definition) throws WSDLException; - -} diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultBindingProvider.java b/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultBindingProvider.java deleted file mode 100644 index c30f935d..00000000 --- a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultBindingProvider.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright 2008 the original author or authors. - * - * Licensed 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. - */ - -package org.springframework.ws.wsdl.wsdl11.provider; - -import java.util.Iterator; -import javax.wsdl.Binding; -import javax.wsdl.BindingFault; -import javax.wsdl.BindingInput; -import javax.wsdl.BindingOperation; -import javax.wsdl.BindingOutput; -import javax.wsdl.Definition; -import javax.wsdl.Fault; -import javax.wsdl.Input; -import javax.wsdl.Operation; -import javax.wsdl.OperationType; -import javax.wsdl.Output; -import javax.wsdl.PortType; -import javax.wsdl.WSDLException; -import javax.xml.namespace.QName; - -/** - * @author Arjen Poutsma - * @since 1.5.0 - */ -public class DefaultBindingProvider implements BindingProvider { - - /** The suffix used to create a binding name from a port type name. */ - public static final String DEFAULT_BINDING_SUFFIX = "Binding"; - - private String bindingSuffix = DEFAULT_BINDING_SUFFIX; - - public String getBindingSuffix() { - return bindingSuffix; - } - - public void setBindingSuffix(String bindingSuffix) { - this.bindingSuffix = bindingSuffix; - } - - /** - * Creates a {@link Binding} for each {@link PortType} in the definition, and calls {@link - * #populateBinding(javax.wsdl.Definition,javax.wsdl.Binding)} with it. Creates a {@link BindingOperation} for each - * {@link Operation} in the port type, a {@link BindingInput} for each {@link Input} in the operation, etc. - *

- * Calls the various populate methods with the created WSDL4J objects. - * - * @param definition the WSDL4J Definition - * @throws WSDLException in case of errors - * @see #populateBinding(javax.wsdl.Definition,javax.wsdl.Binding) - * @see #populateBindingOperation(javax.wsdl.Definition,javax.wsdl.BindingOperation) - * @see #populateBindingInput(javax.wsdl.Definition,javax.wsdl.BindingInput,javax.wsdl.Input) - * @see #populateBindingOutput(javax.wsdl.Definition,javax.wsdl.BindingOutput,javax.wsdl.Output) - * @see #populateBindingFault(javax.wsdl.Definition,javax.wsdl.BindingFault,javax.wsdl.Fault) - */ - public void addBinding(Definition definition) throws WSDLException { - for (Iterator iterator = definition.getPortTypes().values().iterator(); iterator.hasNext();) { - PortType portType = (PortType) iterator.next(); - Binding binding = definition.createBinding(); - binding.setPortType(portType); - populateBinding(definition, binding); - createBindingOperations(definition, binding, portType); - binding.setUndefined(false); - definition.addBinding(binding); - } - } - - /** - * Called after the {@link Binding} has been created, but before any sub-elements are added. Subclasses can override - * this method to define the binding name, or add extensions to it. - *

- * Default implementation sets the binding name to the port type name with the {@link #getBindingSuffix() suffix} - * appended to it. - * - * @param definition the WSDL4J Definition - * @param binding the WSDL4J Binding - */ - protected void populateBinding(Definition definition, Binding binding) throws WSDLException { - QName portTypeName = binding.getPortType().getQName(); - if (portTypeName != null) { - binding.setQName( - new QName(portTypeName.getNamespaceURI(), portTypeName.getLocalPart() + getBindingSuffix())); - } - } - - private void createBindingOperations(Definition definition, Binding binding, PortType portType) - throws WSDLException { - for (Iterator operationIterator = portType.getOperations().iterator(); operationIterator.hasNext();) { - Operation operation = (Operation) operationIterator.next(); - BindingOperation bindingOperation = definition.createBindingOperation(); - bindingOperation.setOperation(operation); - populateBindingOperation(definition, bindingOperation); - if (operation.getStyle() == null || operation.getStyle().equals(OperationType.REQUEST_RESPONSE)) { - createBindingInput(definition, operation, bindingOperation); - createBindingOutput(definition, operation, bindingOperation); - } - else if (operation.getStyle().equals(OperationType.ONE_WAY)) { - createBindingInput(definition, operation, bindingOperation); - } - else if (operation.getStyle().equals(OperationType.NOTIFICATION)) { - createBindingOutput(definition, operation, bindingOperation); - } - else if (operation.getStyle().equals(OperationType.SOLICIT_RESPONSE)) { - createBindingOutput(definition, operation, bindingOperation); - createBindingInput(definition, operation, bindingOperation); - } - for (Iterator faultIterator = operation.getFaults().values().iterator(); faultIterator.hasNext();) { - Fault fault = (Fault) faultIterator.next(); - BindingFault bindingFault = definition.createBindingFault(); - populateBindingFault(definition, bindingFault, fault); - bindingOperation.addBindingFault(bindingFault); - } - binding.addBindingOperation(bindingOperation); - } - } - - private void createBindingInput(Definition definition, Operation operation, BindingOperation bindingOperation) - throws WSDLException { - BindingInput bindingInput = definition.createBindingInput(); - populateBindingInput(definition, bindingInput, operation.getInput()); - bindingOperation.setBindingInput(bindingInput); - } - - private void createBindingOutput(Definition definition, Operation operation, BindingOperation bindingOperation) - throws WSDLException { - BindingOutput bindingOutput = definition.createBindingOutput(); - populateBindingOutput(definition, bindingOutput, operation.getOutput()); - bindingOperation.setBindingOutput(bindingOutput); - } - - /** - * Called after the {@link BindingOperation} has been created, but before any sub-elements are added. Subclasses can - * implement this method to define the binding name, or add extensions to it. - *

- * Default implementation sets the name of the binding operation to the name of the operation. - * - * @param definition the WSDL4J Definition - * @param bindingOperation the WSDL4J BindingOperation - * @throws WSDLException in case of errors - */ - protected void populateBindingOperation(Definition definition, BindingOperation bindingOperation) - throws WSDLException { - bindingOperation.setName(bindingOperation.getOperation().getName()); - } - - /** - * Called after the {@link BindingInput} has been created. Subclasses can implement this method to define the name, - * or add extensions to it. - *

- * Default implementation set the name of the binding input to the name of the input. - * - * @param bindingInput the WSDL4J BindingInput - * @param input the corresponding WSDL4J Input @throws WSDLException in case of errors - */ - protected void populateBindingInput(Definition definition, BindingInput bindingInput, Input input) - throws WSDLException { - bindingInput.setName(input.getName()); - } - - /** - * Called after the {@link BindingOutput} has been created. Subclasses can implement this method to define the name, - * or add extensions to it. - *

- * Default implementation sets the name of the binding output to the name of the output. - * - * @param bindingOutput the WSDL4J BindingOutput - * @param output the corresponding WSDL4J Output @throws WSDLException in case of errors - */ - protected void populateBindingOutput(Definition definition, BindingOutput bindingOutput, Output output) - throws WSDLException { - bindingOutput.setName(output.getName()); - } - - /** - * Called after the {@link BindingFault} has been created. Subclasses can implement this method to define the name, - * or add extensions to it. - *

- * Default implementation set the name of the binding fault to the name of the fault. - * - * @param bindingFault the WSDL4J BindingFault - * @param fault the corresponding WSDL4J Fault @throws WSDLException in case of errors - */ - protected void populateBindingFault(Definition definition, BindingFault bindingFault, Fault fault) - throws WSDLException { - bindingFault.setName(fault.getName()); - } -} diff --git a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServiceProvider.java b/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServiceProvider.java deleted file mode 100644 index 7a461e66..00000000 --- a/sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/ServiceProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2008 the original author or authors. - * - * Licensed 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. - */ - -package org.springframework.ws.wsdl.wsdl11.provider; - -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; - -/** - * @author Arjen Poutsma - * @since 1.5.0 - */ -public interface ServiceProvider { - - void addService(Definition definition) throws WSDLException; - -} diff --git a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java b/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java deleted file mode 100644 index 1e8bdb0b..00000000 --- a/sandbox/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright ${YEAR} the original author or authors. - * - * Licensed 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. - */ - -package org.springframework.ws.wsdl.wsdl11; - -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; - -import junit.framework.TestCase; - -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.ws.wsdl.wsdl11.provider.InliningXsdSchemaTypesProviderTest; -import org.springframework.xml.xsd.SimpleXsdSchema; -import org.springframework.xml.xsd.commons.CommonsXsdSchemaCollection; - -public class DefaultWsdl11DefinitionTest extends TestCase { - - private DefaultWsdl11Definition definition; - - private Transformer transformer; - - protected void setUp() throws Exception { - definition = new DefaultWsdl11Definition(); - TransformerFactory transformerFactory = TransformerFactory.newInstance(); - transformer = transformerFactory.newTransformer(); - } - - public void testSingle() throws Exception { - Resource resource = new ClassPathResource("single.xsd", getClass()); - SimpleXsdSchema schema = new SimpleXsdSchema(resource); - schema.afterPropertiesSet(); - definition.setSchema(schema); - - definition.setTargetNamespace("http://www.springframework.org/spring-ws/single/definitions"); - definition.setPortTypeName("Order"); - definition.setLocationUri("http://localhost:8080/"); - - definition.afterPropertiesSet(); - - transformer.transform(definition.getSource(), new StreamResult(System.out)); - - } - - public void testComplex() throws Exception { - Resource resource = new ClassPathResource("A.xsd", InliningXsdSchemaTypesProviderTest.class); - CommonsXsdSchemaCollection collection = new CommonsXsdSchemaCollection(new Resource[]{resource}); - collection.setInline(true); - collection.afterPropertiesSet(); - definition.setSchemaCollection(collection); - - definition.setTargetNamespace("http://www.springframework.org/spring-ws/single/definitions"); - definition.setPortTypeName("Order"); - definition.setLocationUri("http://localhost:8080/"); - - definition.afterPropertiesSet(); - - transformer.transform(definition.getSource(), new StreamResult(System.out)); - - } -} \ No newline at end of file diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd b/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd deleted file mode 100644 index dd680b01..00000000 --- a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/A.xsd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd b/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd deleted file mode 100644 index 257821fe..00000000 --- a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/ABC.xsd +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd b/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd deleted file mode 100644 index cb797af5..00000000 --- a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd b/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd deleted file mode 100644 index df338465..00000000 --- a/sandbox/src/test/resources/org/springframework/ws/wsdl/wsdl11/single.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file