Author: veithen
Date: Fri Aug 25 22:54:46 2017
New Revision: 1806252
URL: http://svn.apache.org/viewvc?rev=1806252&view=rev
Log:
Don't add generated code to the sources; instead generate it during the build.
Removed:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/sei/
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java
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=1806252&r1=1806251&r2=1806252&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Fri Aug 25
22:54:46 2017
@@ -605,19 +605,6 @@
</configuration>
</execution>
<execution>
- <id>xjc-AnyType</id>
- <goals>
- <goal>testXjc</goal>
- </goals>
- <configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
-
<testSource>test-resources/wsdl/AnyType.wsdl</testSource>
- </testSources>
-
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AnyType</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>xjc-MessageContext</id>
<goals>
<goal>testXjc</goal>
@@ -726,6 +713,18 @@
</wsdlFiles>
</configuration>
</execution>
+ <execution>
+ <id>wsimport-AnyType</id>
+ <goals>
+ <goal>wsimport-test</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/anytype/META-INF/AnyType.wsdl</wsdlFile>
+ </wsdlFiles>
+
<packageName>org.apache.axis2.jaxws.anytype</packageName>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java?rev=1806252&r1=1806251&r2=1806252&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/AnyTypeMessagePortTypeImpl.java
Fri Aug 25 22:54:46 2017
@@ -19,13 +19,11 @@
package org.apache.axis2.jaxws.anytype;
-import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType;
-
import javax.jws.WebService;
@WebService(serviceName="AnyTypeMessageService",
targetNamespace="http://anytype.test.org";,
-
endpointInterface="org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType")
+
endpointInterface="org.apache.axis2.jaxws.anytype.AnyTypeMessagePortType")
public class AnyTypeMessagePortTypeImpl implements AnyTypeMessagePortType {
/* (non-Javadoc)
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java?rev=1806252&r1=1806251&r2=1806252&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/anytype/tests/AnyTypeTests.java
Fri Aug 25 22:54:46 2017
@@ -20,8 +20,8 @@
package org.apache.axis2.jaxws.anytype.tests;
import org.apache.axis2.jaxws.TestLogger;
-import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessagePortType;
-import org.apache.axis2.jaxws.anytype.sei.AnyTypeMessageService;
+import org.apache.axis2.jaxws.anytype.AnyTypeMessagePortType;
+import org.apache.axis2.jaxws.anytype.AnyTypeMessageService;
import org.apache.axis2.testutils.Axis2Server;
import org.junit.ClassRule;
import org.junit.Test;
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java?rev=1806252&r1=1806251&r2=1806252&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/misc/JAXBContextTest.java
Fri Aug 25 22:54:46 2017
@@ -49,22 +49,22 @@ public class JAXBContextTest extends Abs
// Get a JAXBContext
TreeSet<String> context1 = new TreeSet<String>();
context1.add("org.test.addnumbers");
- context1.add("org.test.anytype");
+ context1.add("org.apache.axis2.jaxws.anytype");
JAXBContext jaxbContext1 = JAXBUtils.getJAXBContext(context1);
// Assert that the JAXBContext was found and the context contains the
two valid packages
assertTrue(jaxbContext1 != null);
assertTrue(context1.contains("org.test.addnumbers"));
- assertTrue(context1.contains("org.test.anytype"));
+ assertTrue(context1.contains("org.apache.axis2.jaxws.anytype"));
String context1String = jaxbContext1.toString();
assertTrue(context1String.contains("org.test.addnumbers"));
- assertTrue(context1String.contains("org.test.anytype"));
+ assertTrue(context1String.contains("org.apache.axis2.jaxws.anytype"));
// Repeat with the same packages
TreeSet<String> context2 = new TreeSet<String>();
context2.add("org.test.addnumbers");
- context2.add("org.test.anytype");
+ context2.add("org.apache.axis2.jaxws.anytype");
JAXBContext jaxbContext2 = JAXBUtils.getJAXBContext(context2);
@@ -73,16 +73,16 @@ public class JAXBContextTest extends Abs
assertTrue(jaxbContext2 != null);
assertTrue(jaxbContext2.toString().equals(jaxbContext1.toString()));
assertTrue(context2.contains("org.test.addnumbers"));
- assertTrue(context2.contains("org.test.anytype"));
+ assertTrue(context2.contains("org.apache.axis2.jaxws.anytype"));
String context2String = jaxbContext2.toString();
assertTrue(context2String.contains("org.test.addnumbers"));
- assertTrue(context2String.contains("org.test.anytype"));
+ assertTrue(context2String.contains("org.apache.axis2.jaxws.anytype"));
// Repeat with the same packages + an invalid package
TreeSet<String> context3 = new TreeSet<String>();
context3.add("org.test.addnumbers");
- context3.add("org.test.anytype");
+ context3.add("org.apache.axis2.jaxws.anytype");
context3.add("my.grandma.loves.jaxws");
JAXBContext jaxbContext3 = JAXBUtils.getJAXBContext(context3);
@@ -92,11 +92,11 @@ public class JAXBContextTest extends Abs
assertTrue(jaxbContext3 != null);
assertTrue(context3.contains("org.test.addnumbers"));
- assertTrue(context3.contains("org.test.anytype"));
+ assertTrue(context3.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(context3.contains("my.grandma.loves.jaxws"));
String context3String = jaxbContext3.toString();
assertTrue(context3String.contains("org.test.addnumbers"));
- assertTrue(context3String.contains("org.test.anytype"));
+ assertTrue(context3String.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(!context3String.contains("my.grandma.loves.jaxws"));
// Repeat with a subset of packages
@@ -119,7 +119,7 @@ public class JAXBContextTest extends Abs
// Get a JAXBContext
TreeSet<String> context1 = new TreeSet<String>();
context1.add("org.test.addnumbers");
- context1.add("org.test.anytype");
+ context1.add("org.apache.axis2.jaxws.anytype");
context1.add("org.apache.axis2.jaxws.misc.jaxbexclude");
JAXBContext jaxbContext1 = JAXBUtils.getJAXBContext(context1);
@@ -127,17 +127,17 @@ public class JAXBContextTest extends Abs
// Assert that the JAXBContext was found and the context contains the
two valid packages
assertTrue(jaxbContext1 != null);
assertTrue(context1.contains("org.test.addnumbers"));
- assertTrue(context1.contains("org.test.anytype"));
+ assertTrue(context1.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(context1.contains("org.apache.axis2.jaxws.misc.jaxbexclude"));
String context1String = jaxbContext1.toString();
assertTrue(context1String.contains("org.test.addnumbers"));
- assertTrue(context1String.contains("org.test.anytype"));
+ assertTrue(context1String.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(!context1String.contains("org.apache.axis2.jaxws.misc.jaxbexclude"));
// Repeat with the same packages
TreeSet<String> context2 = new TreeSet<String>();
context2.add("org.test.addnumbers");
- context2.add("org.test.anytype");
+ context2.add("org.apache.axis2.jaxws.anytype");
context2.add("org.apache.axis2.jaxws.misc.jaxbexclude");
JAXBContext jaxbContext2 = JAXBUtils.getJAXBContext(context2);
@@ -147,16 +147,16 @@ public class JAXBContextTest extends Abs
assertTrue(jaxbContext2 != null);
assertTrue(jaxbContext2.toString().equals(jaxbContext1.toString()));
assertTrue(context2.contains("org.test.addnumbers"));
- assertTrue(context2.contains("org.test.anytype"));
+ assertTrue(context2.contains("org.apache.axis2.jaxws.anytype"));
String context2String = jaxbContext2.toString();
assertTrue(context2String.contains("org.test.addnumbers"));
- assertTrue(context2String.contains("org.test.anytype"));
+ assertTrue(context2String.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(!context2String.contains("org.apache.axis2.jaxws.misc.jaxbexclude"));
// Repeat with the same packages + an invalid package
TreeSet<String> context3 = new TreeSet<String>();
context3.add("org.test.addnumbers");
- context3.add("org.test.anytype");
+ context3.add("org.apache.axis2.jaxws.anytype");
context3.add("my.grandma.loves.jaxws");
context3.add("org.apache.axis2.jaxws.misc.jaxbexclude");
@@ -167,11 +167,11 @@ public class JAXBContextTest extends Abs
assertTrue(jaxbContext3 != null);
assertTrue(jaxbContext3.toString().equals(jaxbContext3.toString()));
assertTrue(context3.contains("org.test.addnumbers"));
- assertTrue(context3.contains("org.test.anytype"));
+ assertTrue(context3.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(context3.contains("my.grandma.loves.jaxws"));
String context3String = jaxbContext3.toString();
assertTrue(context3String.contains("org.test.addnumbers"));
- assertTrue(context3String.contains("org.test.anytype"));
+ assertTrue(context3String.contains("org.apache.axis2.jaxws.anytype"));
assertTrue(!context3String.contains("my.grandma.loves.jaxws"));
assertTrue(!context3String.contains("org.apache.axis2.jaxws.misc.jaxbexclude"));
