Author: veithen
Date: Wed Jan 4 20:50:36 2012
New Revision: 1227316
URL: http://svn.apache.org/viewvc?rev=1227316&view=rev
Log:
Mavenized another bunch of tests.
Added:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays/PersonalInfoBookSOAPBindingImpl.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays/PersonalInfoBookSOAPBindingImpl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays/PersonalInfoBookServiceTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays/PersonalInfoBookServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays2/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays2/TestArrays2TestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays2/TestArrays2TestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays4/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays4/ArrayTest4SOAPBindingImpl.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays4/ArrayTest4SOAPBindingImpl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/arrays4/StructureTypeTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays4/StructureTypeTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/attachments/AttachmentTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attachments/B1Impl.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/attachments/B1Impl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attrGroup/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/attrGroup/AttrGroupServiceTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/attrGroup/AttrGroupServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/dataset/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/dataset/DataServiceTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/dataset/DataServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/datatypes/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/datatypes/DataTypesTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/datatypes/DataTypesTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/datatypes/DataTypes_BindingImpl.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/datatypes/DataTypes_BindingImpl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/date/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/date/MyServiceServiceTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/date/MyServiceServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/date/TestdateSoapBindingImpl.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/date/TestdateSoapBindingImpl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/echo/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/echo/ComplexEchoServiceSoapBindingImpl.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/echo/ComplexEchoServiceSoapBindingImpl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/echo/ComplexEchoServiceTestCase.java
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/echo/ComplexEchoServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/wsdl/arrays/
axis/axis1/java/trunk/integration/src/test/wsdl/arrays/ArrayTest.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays/ArrayTest.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/arrays2/
axis/axis1/java/trunk/integration/src/test/wsdl/arrays2/arraytest.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays2/arraytest.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/arrays2/dataType.xsd
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays2/dataType.xsd
axis/axis1/java/trunk/integration/src/test/wsdl/arrays2/innerDataType.xsd
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays2/innerDataType.xsd
axis/axis1/java/trunk/integration/src/test/wsdl/arrays4/
axis/axis1/java/trunk/integration/src/test/wsdl/arrays4/ArrayTest.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/arrays4/ArrayTest.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/attachments/
axis/axis1/java/trunk/integration/src/test/wsdl/attachments/mime.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/attachments/mime.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/attrGroup/
axis/axis1/java/trunk/integration/src/test/wsdl/attrGroup/AttrGroupService.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/attrGroup/AttrGroupService.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/dataset/
axis/axis1/java/trunk/integration/src/test/wsdl/dataset/DataService.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/dataset/DataService.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/datatypes/
axis/axis1/java/trunk/integration/src/test/wsdl/datatypes/DataTypes.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/datatypes/DataTypes.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/date/
axis/axis1/java/trunk/integration/src/test/wsdl/date/testdate.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/date/testdate.wsdl
axis/axis1/java/trunk/integration/src/test/wsdl/echo/
axis/axis1/java/trunk/integration/src/test/wsdl/echo/echo.wsdl
- copied unchanged from r1227001,
axis/axis1/java/trunk/test/wsdl/echo/echo.wsdl
Removed:
axis/axis1/java/trunk/test/wsdl/arrays/
axis/axis1/java/trunk/test/wsdl/arrays2/
axis/axis1/java/trunk/test/wsdl/arrays4/
axis/axis1/java/trunk/test/wsdl/attachments/
axis/axis1/java/trunk/test/wsdl/attrGroup/
axis/axis1/java/trunk/test/wsdl/dataset/
axis/axis1/java/trunk/test/wsdl/datatypes/
axis/axis1/java/trunk/test/wsdl/date/
axis/axis1/java/trunk/test/wsdl/echo/
Modified:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
axis/axis1/java/trunk/integration/pom.xml
Modified:
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java?rev=1227316&r1=1227315&r2=1227316&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
(original)
+++
axis/axis1/java/trunk/axis-maven-plugin/src/main/java/org/apache/axis/maven/AbstractWsdl2JavaMojo.java
Wed Jan 4 20:50:36 2012
@@ -106,6 +106,15 @@ public abstract class AbstractWsdl2JavaM
*/
private boolean all;
+ /**
+ * Set the wrap arrays flag - if true this will make new classes
+ * like "ArrayOfString" for literal "wrapped" arrays. Otherwise it
+ * will use "String []" and generate appropriate metadata.
+ *
+ * @parameter default-value="false"
+ */
+ private boolean wrapArrays;
+
public void execute() throws MojoExecutionException, MojoFailureException {
String wsdlUrl;
if (file != null && url != null) {
@@ -160,7 +169,7 @@ public abstract class AbstractWsdl2JavaM
emitter.setTypeMappingVersion(typeMappingVersion);
// emitter.setNowrap(noWrapped);
// emitter.setAllowInvalidURL(allowInvalidURL);
-// emitter.setWrapArrays(wrapArrays);
+ emitter.setWrapArrays(wrapArrays);
// if (namespaceMappingFile != null) {
// emitter.setNStoPkg(namespaceMappingFile.toString());
// }
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1227316&r1=1227315&r2=1227316&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Wed Jan 4 20:50:36 2012
@@ -55,7 +55,7 @@
</configuration>
<executions>
<execution>
- <id>echo</id>
+ <id>samples-echo</id>
<goals>
<goal>wsdl2java-test</goal>
</goals>
@@ -75,7 +75,7 @@
</configuration>
</execution>
<execution>
- <id>addr</id>
+ <id>samples-addr</id>
<goals>
<goal>wsdl2java-test</goal>
</goals>
@@ -227,6 +227,160 @@
</configuration>
</execution>
<execution>
+ <id>arrays</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/arrays/ArrayTest.wsdl</file>
+ <deployScope>session</deployScope>
+ <serverSide>true</serverSide>
+ <skeleton>true</skeleton>
+ <mappings>
+ <mapping>
+ <namespace>urn:ArrayTest2</namespace>
+ <package>test.wsdl.arrays</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <execution>
+ <id>arrays2</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/arrays2/arraytest.wsdl</file>
+ <deployScope>session</deployScope>
+ <mappings>
+ <mapping>
+
<namespace>http://www.xyz.net/webservices/arraytest/1.0</namespace>
+ <package>test.wsdl.arrays2</package>
+ </mapping>
+ <mapping>
+
<namespace>http://www.xyz.net/schemas/arraytest/data/1.0</namespace>
+ <package>test.wsdl.arrays2.data</package>
+ </mapping>
+ <mapping>
+
<namespace>http://www.xyz.net/schemas/arraytest/innerdata/1.0</namespace>
+
<package>test.wsdl.arrays2.data.inner</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <execution>
+ <id>arrays4</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/arrays4/ArrayTest.wsdl</file>
+ <deployScope>session</deployScope>
+ <serverSide>true</serverSide>
+ <skeleton>true</skeleton>
+ <mappings>
+ <mapping>
+ <namespace>urn:ArrayTest4</namespace>
+ <package>test.wsdl.arrays4</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attachments</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/attachments/mime.wsdl</file>
+ <serverSide>true</serverSide>
+ <skeleton>true</skeleton>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attrGroup</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+
<file>src/test/wsdl/attrGroup/AttrGroupService.wsdl</file>
+ <mappings>
+ <mapping>
+ <namespace>http://tempuri.org/</namespace>
+ <package>test.wsdl.attrGroup</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <!-- This is a DII test with multiple output params -->
+ <execution>
+ <id>dataset</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/dataset/DataService.wsdl</file>
+ <mappings>
+ <mapping>
+ <namespace>http://tempuri.org/</namespace>
+ <package>test.wsdl.dataset</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <!-- DataType Structure Test -->
+ <execution>
+ <id>datatypes</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/datatypes/DataTypes.wsdl</file>
+ <deployScope>session</deployScope>
+ <serverSide>true</serverSide>
+ <skeleton>true</skeleton>
+ <wrapArrays>true</wrapArrays>
+ <mappings>
+ <mapping>
+ <namespace>urn:dataTypes</namespace>
+ <package>test.wsdl.datatypes</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <!-- This tests Bug 9642 - Java Date not deserialize
properly. -->
+ <execution>
+ <id>date</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/date/testdate.wsdl</file>
+ <serverSide>true</serverSide>
+ </configuration>
+ </execution>
+ <!-- This tests holders for complextype Bug:10247 -->
+ <execution>
+ <id>echo</id>
+ <goals>
+ <goal>wsdl2java-test</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/echo/echo.wsdl</file>
+ <serverSide>true</serverSide>
+ <mappings>
+ <mapping>
+ <namespace>http://echo.services</namespace>
+ <package>test.wsdl.echo</package>
+ </mapping>
+ <mapping>
+
<namespace>http://types.echo.services</namespace>
+ <package>test.wsdl.echo</package>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
+ <execution>
<id>wrapped</id>
<goals>
<goal>wsdl2java-test</goal>
@@ -316,6 +470,10 @@
<exclude>test/dynamic/TestJAXRPCDII.java</exclude>
<!-- Excluded in r257238; see AXIS-750 -->
<exclude>test/wsdl/adaptive/**</exclude>
+ <!-- TODO: remote service no longer available
-->
+ <exclude>test/wsdl/dataset/**</exclude>
+ <!-- These are not test cases -->
+
<exclude>test/wsdl/date/TestdateSoapBinding*</exclude>
</excludes>
</configuration>
</execution>
