Moved new WSDL design over from sandbox

Author: poutsma

sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java renamed to core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java

@@ -33,6 +33,19 @@
  * 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.
+ * <p/>
+ * Example configuration:
+ * <pre>
+ * &lt;bean id=&quot;airline&quot; class=&quot;org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition&quot;&gt;
+ *   &lt;property name=&quot;schema&quot;&gt;
+ *     &lt;bean class=&quot;org.springframework.xml.xsd.SimpleXsdSchema&quot;&gt;
+ *       &lt;property name=&quot;xsd&quot; value=&quot;/WEB-INF/airline.xsd&quot;/&gt;
+ *     &lt;/bean&gt;
+ *   &lt;/property&gt;
+ *   &lt;property name=&quot;portTypeName&quot; value=&quot;Airline&quot;/&gt;
+ *   &lt;property name=&quot;locationUri&quot; value=&quot;http://localhost:8080/airline/services&quot;/&gt;
+ * &lt;/bean&gt;
+ * </pre>
  *
  * @author Arjen Poutsma
  * @since 1.5.0

sandbox/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java renamed to core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java

@@ -41,6 +41,8 @@
  *
  * @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 {
 

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java

@@ -45,6 +45,8 @@
  * @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 {
 

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java

@@ -46,16 +46,16 @@
  * @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 {
 
     private static final String WSDL_SOAP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/soap12/";
 
     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 void setTransportUri(String transportUri) {
         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);
     }

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java

@@ -25,6 +25,7 @@
 
 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 @@
  *
  * @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 {
 

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractWsdl4jDefinitionBuilder.java

@@ -82,6 +82,8 @@
  * @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 {

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java

@@ -83,6 +83,8 @@
  * @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 @@ protected void buildMessages(Definition definition) throws WSDLException {
                             definition.addNamespace(prefix, elementName.getNamespaceURI());
                             break;
                         }
-                        i++;                        
+                        i++;
                     }
                 }
                 Message message = definition.createMessage();

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java

@@ -26,23 +26,26 @@
 
 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 {
 

core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdSchemaHelper.java

@@ -1,5 +1,6 @@
 <html>
 <body>
-Provides a strategy for WSDL building. Used by DynamicWsdl11Definition to generate WSDL definitions at runtime.
+<strong>Deprecated</strong> as of Spring Web Services 1.5: superseded by the <code>DefaultWsdl11Definition</code>
+and <code>org.springframework.ws.wsdl.wsdl11.provider</code> package.
 </body>
 </html>