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 2017/05/01 15:48:28 UTC
svn commit: r1793363 - in /axis/axis2/java/core/branches/AXIS2-5785/modules:
adb-tests/pom.xml
tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/XSD2JavaMojo.java
tool/axis2-xsd2java-maven-plugin/src/site/markdown/usage.md
Author: veithen
Date: Mon May 1 15:48:27 2017
New Revision: 1793363
URL: http://svn.apache.org/viewvc?rev=1793363&view=rev
Log:
Use the more standard parameter name 'outputDirectory' instead of 'outputFolder'.
Modified:
axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/XSD2JavaMojo.java
axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/site/markdown/usage.md
Modified: axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml?rev=1793363&r1=1793362&r2=1793363&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-5785/modules/adb-tests/pom.xml Mon May 1 15:48:27 2017
@@ -101,7 +101,7 @@
<goal>xsd2java</goal>
</goals>
<configuration>
- <outputFolder>${project.build.directory}/schema/src</outputFolder>
+ <outputDirectory>${project.build.directory}/schema/src</outputDirectory>
<xsdFiles>
<xsdFile>../adb-codegen/test-resources/xsd/simple_maxOccurs2.xsd</xsdFile>
<xsdFile>../adb-codegen/test-resources/xsd/anonymous_complexType.xsd</xsdFile>
Modified: axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/XSD2JavaMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/XSD2JavaMojo.java?rev=1793363&r1=1793362&r2=1793363&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/XSD2JavaMojo.java (original)
+++ axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/main/java/org/apache/axis2/maven/xsd2java/XSD2JavaMojo.java Mon May 1 15:48:27 2017
@@ -43,7 +43,7 @@ public class XSD2JavaMojo extends Abstra
* @parameter
* @required true
*/
- public File outputFolder;
+ private File outputDirectory;
/**
* Mapping of namespaces to target Java packages.
@@ -52,9 +52,9 @@ public class XSD2JavaMojo extends Abstra
private NamespaceMapping[] namespaceMappings;
public void execute() throws MojoExecutionException, MojoFailureException {
- outputFolder.mkdirs();
+ outputDirectory.mkdirs();
CompilerOptions compilerOptions = new CompilerOptions();
- compilerOptions.setOutputLocation(outputFolder);
+ compilerOptions.setOutputLocation(outputDirectory);
compilerOptions.setGenerateAll(true);
NamespaceMappingUtil.addToMap(namespaceMappings, compilerOptions.getNs2PackageMap());
compilerOptions.setWriteOutput(true);
Modified: axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/site/markdown/usage.md
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/site/markdown/usage.md?rev=1793363&r1=1793362&r2=1793363&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/site/markdown/usage.md (original)
+++ axis/axis2/java/core/branches/AXIS2-5785/modules/tool/axis2-xsd2java-maven-plugin/src/site/markdown/usage.md Mon May 1 15:48:27 2017
@@ -38,7 +38,7 @@ To run the plugin, add the following sec
</goals>
</execution>
<configuration>
- <outputFolder>${project.build.directory}/generated-sources/java</outputFolder>
+ <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
<xsdFiles>
<xsdFile>src/main/resources/xsd/attribute.xsd</xsdFile>
</xsdFiles>