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:20:44 UTC
svn commit: r1793353 - in /axis/axis2/java/core/trunk:
databinding-tests/jaxbri-tests/ modules/adb-tests/ modules/jaxws-integration/
modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/
Author: veithen
Date: Mon May 1 15:20:44 2017
New Revision: 1793353
URL: http://svn.apache.org/viewvc?rev=1793353&view=rev
Log:
Use the more meaningful parameter name 'namespaceMappings' instead of 'namespaceURIs' in axis2-wsdl2code-maven-plugin.
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/trunk/modules/adb-tests/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java
Modified: axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml?rev=1793353&r1=1793352&r2=1793353&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml Mon May 1 15:20:44 2017
@@ -105,16 +105,16 @@
<generateServerSide>true</generateServerSide>
<generateServerSideInterface>true</generateServerSideInterface>
<generateServicesXml>true</generateServicesXml>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://www.example.org/data</uri>
<packageName>org.apache.axis2.jaxbri.processor.data</packageName>
- </namespaceURI>
- <namespaceURI>
+ </namespaceMapping>
+ <namespaceMapping>
<uri>http://www.example.org/ws</uri>
<packageName>org.apache.axis2.jaxbri.processor.service</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<outputDirectory>${project.build.directory}/gen/processor</outputDirectory>
</configuration>
</execution>
@@ -125,16 +125,16 @@
</goals>
<configuration>
<wsdlFile>src/test/wsdl/processor.wsdl</wsdlFile>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://www.example.org/data</uri>
<packageName>org.apache.axis2.jaxbri.processor.data</packageName>
- </namespaceURI>
- <namespaceURI>
+ </namespaceMapping>
+ <namespaceMapping>
<uri>http://www.example.org/ws</uri>
<packageName>org.apache.axis2.jaxbri.processor.client</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<outputDirectory>${project.build.directory}/gen/processor</outputDirectory>
</configuration>
</execution>
@@ -150,12 +150,12 @@
<generateServicesXml>true</generateServicesXml>
<generateAllClasses>true</generateAllClasses>
<packageName>org.apache.axis2.jaxbri.identityservice</packageName>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://www.example.org/identity</uri>
<packageName>org.apache.axis2.jaxbri.identityservice</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<outputDirectory>${project.build.directory}/gen/identityservice</outputDirectory>
</configuration>
</execution>
@@ -171,12 +171,12 @@
<generateServicesXml>true</generateServicesXml>
<generateAllClasses>true</generateAllClasses>
<packageName>org.apache.axis2.jaxbri.mtom</packageName>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://www.example.org/mtom/</uri>
<packageName>org.apache.axis2.jaxbri.mtom</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<outputDirectory>${project.build.directory}/gen/mtom</outputDirectory>
</configuration>
</execution>
Modified: axis/axis2/java/core/trunk/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests/pom.xml?rev=1793353&r1=1793352&r2=1793353&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-tests/pom.xml Mon May 1 15:20:44 2017
@@ -189,12 +189,12 @@
<wsdlFile>src/test/wsdl/AXIS2-5750.wsdl</wsdlFile>
<syncMode>sync</syncMode>
<unpackClasses>true</unpackClasses>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://ise-online.com/FixedValueService/</uri>
<packageName>org.apache.axis2.databinding.axis2_5750.client</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<packageName>org.apache.axis2.databinding.axis2_5750.client</packageName>
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5750</outputDirectory>
</configuration>
@@ -208,12 +208,12 @@
<wsdlFile>src/test/wsdl/AXIS2-5758.wsdl</wsdlFile>
<syncMode>sync</syncMode>
<unpackClasses>true</unpackClasses>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://example.com/stockquote.xsd</uri>
<packageName>org.apache.axis2.databinding.axis2_5758.client</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<packageName>org.apache.axis2.databinding.axis2_5758.client</packageName>
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5758</outputDirectory>
</configuration>
@@ -227,12 +227,12 @@
<wsdlFile>src/test/wsdl/AXIS2-5799.wsdl</wsdlFile>
<syncMode>sync</syncMode>
<unpackClasses>true</unpackClasses>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>urn:echo</uri>
<packageName>org.apache.axis2.databinding.axis2_5799.client</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<packageName>org.apache.axis2.databinding.axis2_5799.client</packageName>
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5799</outputDirectory>
</configuration>
@@ -246,12 +246,12 @@
<wsdlFile>src/test/wsdl/AXIS2-5809.wsdl</wsdlFile>
<syncMode>sync</syncMode>
<unpackClasses>true</unpackClasses>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://apache.org/axis2/echo</uri>
<packageName>org.apache.axis2.databinding.axis2_5809</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
<packageName>org.apache.axis2.databinding.axis2_5809</packageName>
<generateServerSide>true</generateServerSide>
<generateAllClasses>true</generateAllClasses>
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1793353&r1=1793352&r2=1793353&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Mon May 1 15:20:44 2017
@@ -187,12 +187,12 @@
<wsdlFile>test-resources/wsdl/echo.wsdl</wsdlFile>
<databindingName>adb</databindingName>
<generateServerSide>true</generateServerSide>
- <namespaceURIs>
- <namespaceURI>
+ <namespaceMappings>
+ <namespaceMapping>
<uri>http://test</uri>
<packageName>server</packageName>
- </namespaceURI>
- </namespaceURIs>
+ </namespaceMapping>
+ </namespaceMappings>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java?rev=1793353&r1=1793352&r2=1793353&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/AbstractWSDL2CodeMojo.java Mon May 1 15:20:44 2017
@@ -241,16 +241,22 @@ public abstract class AbstractWSDL2CodeM
/**
* Map of namespace URI to packages. Example:
* <pre>
- * <namespaceURIs>
- * <namespaceURI>
+ * <namespaceMappings>
+ * <namespaceMapping>
* <uri>uri1</uri>
* <packageName>package1</packageName>
- * </namespaceURI>
+ * </namespaceMapping>
* ...
- * </namespaceURI></pre>
+ * </namespaceMapping></pre>
*
* @parameter
*/
+ private NamespaceMapping[] namespaceMappings;
+
+ /**
+ * @parameter
+ * @deprecated Use {@code namespaceMappings} instead.
+ */
private NamespaceMapping[] namespaceURIs = null;
/**
@@ -343,6 +349,7 @@ public abstract class AbstractWSDL2CodeM
}
}
NamespaceMappingUtil.addToMap(namespaceURIs, map);
+ NamespaceMappingUtil.addToMap(namespaceMappings, map);
return map;
}