This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 9cffb0df66314f47a68c007dc85c9bb2cfa6c5d2 Author: Robert Lazarski <[email protected]> AuthorDate: Mon Apr 13 10:53:23 2026 -1000 AXIS2-6102 Remove WSDL 2.0 references from user-facing docs Follow-up to WSDL 2.0 code removal. Scrubs WSDL 2.0 mentions from published site docs, samples README, and codegen tool reference so documentation matches the 2.0.1 release. - src/site/xdoc/index.xml: drop MEP Support bullet (described MEPs in WSDL 2.0 terms); WSDL support bullet now lists 1.1 only - src/site/xdoc/refLib.xml: remove WSDL 2.0 spec link - src/site/xdoc/docs/migration.xml: rewrite "WSDL 2.0 support" section as "WSDL support" (1.1) - src/site/xdoc/docs/rest-ws.xml: rewrite intro (was framed as "WSDL 2.0 HTTP Binding defines REST"); drop IRI-style link - src/site/xdoc/docs/userguide-samples.xml: remove external FlickrClient entry (WSDL 2.0 code-gen demo from WSO2 nightly) - src/site/xdoc/tools/CodegenToolReference.xml: remove wsdlVersion option row (no longer applicable without WSDL 2.0) - modules/samples/dynamicclient/README.txt: remove WSDL20DynamicClient mvn command - .gitignore: ignore wtf.txt (untracked maven build log artifact) --- .gitignore | 1 + modules/samples/dynamicclient/README.txt | 1 - src/site/xdoc/docs/migration.xml | 6 +++--- src/site/xdoc/docs/rest-ws.xml | 12 ++++-------- src/site/xdoc/docs/userguide-samples.xml | 12 ------------ src/site/xdoc/index.xml | 9 +-------- src/site/xdoc/refLib.xml | 3 +-- src/site/xdoc/tools/CodegenToolReference.xml | 7 ------- 8 files changed, 10 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index bd854acaf2..fc2474595c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ target /modules/tool/axis2-eclipse-service-plugin/META-INF /modules/tool/axis2-eclipse-service-plugin/lib axis2-json-api*.log +wtf.txt diff --git a/modules/samples/dynamicclient/README.txt b/modules/samples/dynamicclient/README.txt index 9a4a1f8892..0b53ef2ba6 100755 --- a/modules/samples/dynamicclient/README.txt +++ b/modules/samples/dynamicclient/README.txt @@ -15,4 +15,3 @@ Running the Clients * Run each clients using a IDE or use following Maven commands. mvn exec:java -Dexec.mainClass="org.apache.axis2.examples.client.WSDL11DynamicClient" -Dexec.classpathScope=compile -mvn exec:java -Dexec.mainClass="org.apache.axis2.examples.client.WSDL20DynamicClient" -Dexec.classpathScope=compile diff --git a/src/site/xdoc/docs/migration.xml b/src/site/xdoc/docs/migration.xml index ab18e04924..6a1815b3af 100644 --- a/src/site/xdoc/docs/migration.xml +++ b/src/site/xdoc/docs/migration.xml @@ -60,9 +60,9 @@ and listeners for SOAP over various protocols such as HTTP, SMTP, etc.), have been abstracted away from the Axis2 engine. Having a transport-independent Axis engine allows far more flexibility in transport options.</p> -<p><strong>WSDL 2.0 support</strong> - Axis2 supports both WSDL -versions 1.1 and 2.0, which are used by Axis2's code generation -tools to create web service skeletons and client stubs.</p> +<p><strong>WSDL support</strong> - Axis2 supports WSDL 1.1, which is +used by Axis2's code generation tools to create web service +skeletons and client stubs.</p> <p><strong>Component-oriented architecture</strong> - Axis2 components consist of handlers and modules in .mar and .aar archives. These easily reusable components allow extended diff --git a/src/site/xdoc/docs/rest-ws.xml b/src/site/xdoc/docs/rest-ws.xml index fe204e1d78..98dee91616 100644 --- a/src/site/xdoc/docs/rest-ws.xml +++ b/src/site/xdoc/docs/rest-ws.xml @@ -43,10 +43,9 @@ GET.</p> <h2>Introduction</h2> -<p>WSDL 2.0 HTTP Binding defines a way to implement REST (Representational -State Transfer) with Web services. Axis2 implements the most defined HTTP -binding specification. REST Web services are a reduced subset of the usual -Web service stack.</p> +<p>REST (Representational State Transfer) Web services are a reduced +subset of the usual Web service stack. Axis2 supports exposing services +over HTTP GET and POST without requiring a SOAP envelope.</p> <p>The Axis2 REST implementation assumes the following properties:</p> <ol> @@ -54,10 +53,7 @@ Web service stack.</p> <li>When REST Web services are accessed via GET, the service and the operations are identified based on the URL. The parameters are assumed as parameters of the Web service. In this case, the GET based REST Web - services support only simple types as arguments and it should adhere to - the <a - href="http://www.w3.org/TR/2006/CR-wsdl20-adjuncts-20060327/#_operation_iri_style";>IRI - style</a>.</li> + services support only simple types as arguments.</li> <li>POST based Web services do not need a SOAP Envelope or a SOAP Body. REST Web Services do not have Headers and the payload is sent directly.</li> diff --git a/src/site/xdoc/docs/userguide-samples.xml b/src/site/xdoc/docs/userguide-samples.xml index e5cd32bf3d..fb3b9bf580 100644 --- a/src/site/xdoc/docs/userguide-samples.xml +++ b/src/site/xdoc/docs/userguide-samples.xml @@ -194,18 +194,6 @@ generated code with Castor.</p> outputs the Apache Axis2 version.</p> <p><strong>yahoorestearch</strong>: A complete example of the use of a REST service rather than a SOAP service.</p> -<h3>External:</h3> -<p><strong>FlickrClient</strong> : Demonstrates code generation -capabilities for WSDL 2.0. The FlickrService.wsdl describes -services offered by flickr in terms of WSDL 2.0. It also -demonstrates how a restful service can be described using the -HTTPBinding of wsdl 2.0.</p> -<p>Extract the <a href= -"http://dist.wso2.org/products/wsas/java/nightly-build/";>WSO2 WSAS -for Java nightly build distribution</a> and you will find the -sample at WSAS_HOME/samples/FlickrClient or checkout sample from -SVN: -http://wso2.org/repos/wso2/trunk/wsas/java/modules/samples/FlickrClient</p> <p><strong>See Next Section</strong> - <a href= "userguide-forfurtherstudy.html">For Further Study</a></p> </body> diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index b07285bb85..8cb1fbc5f0 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -111,12 +111,6 @@ and asynchronous Web services invocation using non-blocking clients and transports.</p> </li> <li> -<p style="margin-bottom: 0in"><strong>MEP Support</strong> - Axis2 -now comes handy with the flexibility to support Message Exchange -Patterns (MEPs) with in-built support for basic MEPs defined in -WSDL 2.0.</p> -</li> -<li> <p style="margin-bottom: 0in"><strong>Flexibility</strong> - The Axis2 architecture gives the developer complete freedom to insert extensions into the engine for custom header processing, system @@ -143,8 +137,7 @@ the core of the engine is completely transport-independent.</p> <li> <p style="margin-bottom: 0in"><strong>WSDL support</strong> - Axis2 supports the Web Service Description Language, version <a href= -"http://www.w3.org/TR/wsdl";>1.1</a> and <a href= -"http://www.w3.org/TR/wsdl20/";>2.0</a>, which allows you to easily +"http://www.w3.org/TR/wsdl";>1.1</a>, which allows you to easily build stubs to access remote services, and also to automatically export machine-readable descriptions of your deployed services from Axis2.</p> diff --git a/src/site/xdoc/refLib.xml b/src/site/xdoc/refLib.xml index 8e1f367799..f7edddc092 100644 --- a/src/site/xdoc/refLib.xml +++ b/src/site/xdoc/refLib.xml @@ -49,8 +49,7 @@ Extensions: Digital Signature Specification</a></b><br /> Adding security to SOAP.</p> <p><b>Other Specifications</b></p> <p>Web Services Description Language (WSDL) <a href= -"http://www.w3c.org/TR/wsdl.html";>1.1</a> <a href= -"http://www.w3.org/TR/wsdl20/";>2.0</a></p> +"http://www.w3c.org/TR/wsdl.html";>1.1</a></p> <p>WS - Addressing <a href= "http://www.w3.org/Submission/ws-addressing/";>submission</a> <a href="http://www.w3.org/TR/2005/WD-ws-addr-core-20050331/";>1.0 diff --git a/src/site/xdoc/tools/CodegenToolReference.xml b/src/site/xdoc/tools/CodegenToolReference.xml index 47d3b6da0c..9ea18fe56c 100644 --- a/src/site/xdoc/tools/CodegenToolReference.xml +++ b/src/site/xdoc/tools/CodegenToolReference.xml @@ -405,13 +405,6 @@ side skeleton.</td> the command line tool.</td> </tr> <tr> -<td>wsdlVersion</td> -<td>Sets the version of the wsdl that is being used during -codegeneration. This deafults to 1.1 and one can set this to 2, -when trying to work with a WSDL 2.0 document. Maps to the -wv -option of the command line tool.</td> -</tr> -<tr> <td>externalMapping</td> <td>Location of the external mapping file to be used. Maps to the -em option of the command line tool.</td>
