You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/01/27 22:03:25 UTC
svn commit: r1727194 - in /axis/axis2/java/core/branches/1_7: ./
modules/tool/axis2-wsdl2code-maven-plugin/
modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/
modules/tool/axis2-wsdl2code-maven-plugin/src/site/ m...
Author: veithen
Date: Wed Jan 27 21:03:25 2016
New Revision: 1727194
URL: http://svn.apache.org/viewvc?rev=1727194&view=rev
Log:
Merge latest axis2-wsdl2code-maven-plugin documentation updates to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/
- copied from r1727171, axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/
Removed:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/apt/
axis/axis2/java/core/branches/1_7/src/site/xdoc/tools/maven-plugins/maven-wsdl2code-plugin.xml
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/usage.md
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/site.xml
axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/contents.xml.vm
axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/toc.xml
axis/axis2/java/core/branches/1_7/src/site/xdoc/tools/index.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 27 21:03:25 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180
Modified: axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1727194&r1=1727193&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Wed Jan 27 21:03:25 2016
@@ -31,7 +31,7 @@
<name>Apache Axis2 - tool - WSDL2Code Maven Plugin</name>
<packaging>maven-plugin</packaging>
<description>The Axis 2 Plugin for Maven allows client side and server side sources from a WSDL.</description>
- <url>http://axis.apache.org/axis2/java/core/</url>
+ <url>http://axis.apache.org/axis2/java/core/tools/maven-plugins/axis2-wsdl2code-maven-plugin</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin</developerConnection>
@@ -151,6 +151,10 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
</project>
Modified: axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?rev=1727194&r1=1727193&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java Wed Jan 27 21:03:25 2016
@@ -39,7 +39,8 @@ import java.util.Properties;
/**
- * @description A Mojo for generating Java sources from a WSDL.
+ * A Mojo for generating Java sources from a WSDL.
+ *
* @goal wsdl2code
* @phase generate-sources
* @requiresDependencyResolution test
@@ -49,7 +50,7 @@ public class WSDL2CodeMojo extends Abstr
* The maven project.
*
* @parameter expression="${project}"
- * @read-only
+ * @readonly
* @required
*/
private MavenProject project;
@@ -72,7 +73,7 @@ public class WSDL2CodeMojo extends Abstr
* Package name of the generated sources; will be used to create a package structure below the
* output directory.
*
- * @parameter expression="${axis2.wsdl2code.package}" *
+ * @parameter expression="${axis2.wsdl2code.package}"
*/
private String packageName;
@@ -84,7 +85,7 @@ public class WSDL2CodeMojo extends Abstr
private String language;
/**
- * The databinding framework, which is being used.
+ * The databinding framework, which is being used by the generated sources.
*
* @parameter expression="${axis2.wsdl2code.databindingName}" default-value="adb"
*/
@@ -98,8 +99,8 @@ public class WSDL2CodeMojo extends Abstr
private String jibxBindingFile;
/**
- * Port name, for which to generate sources. By default, sources will be generated for all
- * ports.
+ * Port name, for which to generate sources. By default, sources will be generated for a
+ * randomly picked port.
*
* @parameter expression="${axis2.wsdl2code.portName}"
*/
@@ -128,14 +129,14 @@ public class WSDL2CodeMojo extends Abstr
private boolean generateServerSide;
/**
- * Whether to generate sources for a test case.
+ * Whether a test case is being generated.
*
* @parameter expression="${axis2.wsdl2code.generateTestCase}" default-value="false"
*/
private boolean generateTestcase;
/**
- * Whether to generate a "services.xml" file.
+ * Whether a "services.xml" file is being generated.
*
* @parameter expression="${axis2.wsdl2code.generateServicesXml}" default-value="false"
*/
@@ -189,12 +190,17 @@ public class WSDL2CodeMojo extends Abstr
private String targetResourcesFolderLocation = null;
/**
- * @parameter expression="${axis2.wsdl2code.unwrap}" default-value="false" *
+ * This will select between wrapped and unwrapped during code generation. Maps to the -uw option
+ * of the command line tool.
+ *
+ * @parameter expression="${axis2.wsdl2code.unwrap}" default-value="false"
*/
private boolean unwrap = false;
/**
- * @parameter expression="${axis2.wsdl2code.allPorts}" default-value="false" *
+ * Set this to true to generate code for all ports.
+ *
+ * @parameter expression="${axis2.wsdl2code.allPorts}" default-value="false"
*/
private boolean allPorts = false;
@@ -240,10 +246,28 @@ public class WSDL2CodeMojo extends Abstr
*/
private Properties options;
- /** @parameter expression="${axis2.wsdl2code.namespaceToPackages}" */
+ /**
+ * Map of namespace URI to packages in the format {@code uri1=package1,uri2=package2,...}. Using
+ * this parameter is discouraged. In general, you should use the {@code namespaceUris}
+ * parameter. However, the latter cannot be set on the command line.
+ *
+ * @parameter expression="${axis2.wsdl2code.namespaceToPackages}"
+ */
private String namespaceToPackages = null;
- /** @parameter */
+ /**
+ * Map of namespace URI to packages. Example:
+ * <pre>
+ * <namespaceURIs>
+ * <namespaceURI>
+ * <uri>uri1</uri>
+ * <packageName>package1</packageName>
+ * </namespaceURI>
+ * ...
+ * </namespaceURI></pre>
+ *
+ * @parameter
+ */
private NamespaceURIMapping[] namespaceURIs = null;
/**
Modified: axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/usage.md
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/usage.md?rev=1727194&r1=1727171&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/usage.md (original)
+++ axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/markdown/usage.md Wed Jan 27 21:03:25 2016
@@ -20,9 +20,9 @@
Usage
-----
-The WSDl2Code offers a single goal:
+axis2-wsdl2code-maven-plugin offers a single goal:
-* wsdl2code (default): Reads the WSDL and generates code.
+* wsdl2code: Reads the WSDL and generates code.
To run the plugin, add the following section to your POM:
@@ -48,16 +48,7 @@ To run the plugin, add the following sec
</build>
The plugin will be invoked automatically in the generate-sources
-phase. You can also invoke it directly from the command line by
-running the command
-
- mvn axis2-wsdl2code:wsdl2code
-
-By default, the plugin reads the file `src/main/axis2/service.wsdl`.
-Sources for the Java programming language and the ADB data binding are
-generated into `target/generated-sources/axis2/wsdl2code`.
-Note the configuration element `packageName` above, which sets
-the package name, thus a subdirectory.
+phase.
See the detailed documentation on [properties](wsdl2code-mojo.html) for
how to configure the goal.
Modified: axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/site.xml?rev=1727194&r1=1727193&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/site.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/site/site.xml Wed Jan 27 21:03:25 2016
@@ -19,28 +19,14 @@
~ under the License.
-->
-<project name="Maven Axis 2 WSDL2Code Plugin">
- <bannerLeft>
- <name>Maven Axis 2 WSDL2Code Plugin</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
- </bannerRight>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Webservices" href="http://ws.apache.org/"/>
- <item name="Axis 2" href="http://ws.apache.org/axis2/"/>
- <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
- </links>
-
- <menu name="Overview">
- <item name="Introduction" href="introduction.html"/>
- <item name="How to Use" href="howto.html"/>
- <item name="Configuration" href="configuration.html"/>
- </menu>
- ${reports}
- </body>
+<project name="axis2-wsdl2code-maven-plugin">
+ <body>
+ <menu name="Overview">
+ <item name="About" href="index.html"/>
+ <item name="Usage" href="usage.html"/>
+ <item name="Plugin Documentation" href="plugin-info.html">
+ <item name="wsdl2code" href="wsdl2code-mojo.html"/>
+ </item>
+ </menu>
+ </body>
</project>
Modified: axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/contents.xml.vm
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/contents.xml.vm?rev=1727194&r1=1727193&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/contents.xml.vm (original)
+++ axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/contents.xml.vm Wed Jan 27 21:03:25 2016
@@ -211,7 +211,7 @@ Maven 2 Plug-in that takes a Java class
WSDL, which describes a Web service for invoking the class
methods</li>
<li><a href=
-"../tools/maven-plugins/maven-wsdl2code-plugin.html">
+"../tools/maven-plugins/axis2-wsdl2code-maven-plugin/index.html">
Maven2 WSDL2Code Plug-in Guide</a> - A guide to using this plugin
that takes as input a WSDL and generates client and server stubs
for calling or implementing a Web service matching the WSDL.</li>
Modified: axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/toc.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/toc.xml?rev=1727194&r1=1727193&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/toc.xml (original)
+++ axis/axis2/java/core/branches/1_7/src/site/xdoc/docs/toc.xml Wed Jan 27 21:03:25 2016
@@ -137,7 +137,7 @@ Plug-in</a></li>
<li>25.4 <a href="../tools/eclipse/wsdl2java-plugin.html">Code Generator Wizard - Eclipse Plug-in</a></li>
<li>25.5 <a href="../tools/maven-plugins/maven-aar-plugin.html">AAR Maven2 Plug-in</a></li>
<li>25.6 <a href="../tools/maven-plugins/maven-java2wsdl-plugin.html">Java2WSDL Maven2 Plug-in</a></li>
-<li>25.7 <a href="../tools/maven-plugins/maven-wsdl2code-plugin.html">WSDL2Code Maven2 Plug-in</a></li>
+<li>25.7 <a href="../tools/maven-plugins/axis2-wsdl2code-maven-plugin/index.html">WSDL2Code Maven2 Plug-in</a></li>
</ul>
</li>
<li><a href="migration.html">Migration Guide
Modified: axis/axis2/java/core/branches/1_7/src/site/xdoc/tools/index.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/xdoc/tools/index.xml?rev=1727194&r1=1727193&r2=1727194&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/xdoc/tools/index.xml (original)
+++ axis/axis2/java/core/branches/1_7/src/site/xdoc/tools/index.xml Wed Jan 27 21:03:25 2016
@@ -93,7 +93,7 @@ which describes a Web service for invoki
</tr>
<tr>
<td>
- <a href="maven-plugins/maven-wsdl2code-plugin.html">axis2-wsdl2java-maven-plugin</a>
+ <a href="maven-plugins/axis2-wsdl2code-maven-plugin/index.html">axis2-wsdl2code-maven-plugin</a>
</td>
<td>
<p>This plugin takes as input a WSDL and generates client and