Author: veithen
Date: Sun Sep 30 10:28:18 2012
New Revision: 1391981
URL: http://svn.apache.org/viewvc?rev=1391981&view=rev
Log:
Migrated test/wsdl/schema2 to the Maven build.
Added:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Document.java
- copied unchanged from r1391765,
axis/axis1/java/trunk/test/wsdl/schema2/Document.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Schema2ServiceSoapBindingImpl.java
- copied unchanged from r1391765,
axis/axis1/java/trunk/test/wsdl/schema2/Schema2ServiceSoapBindingImpl.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Schema2ServiceTestCase.java
- copied, changed from r1391765,
axis/axis1/java/trunk/test/wsdl/schema2/Schema2ServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/wsdl/schema2/
axis/axis1/java/trunk/integration/src/test/wsdl/schema2/schema2.wsdl
- copied unchanged from r1391765,
axis/axis1/java/trunk/test/wsdl/schema2/schema2.wsdl
Removed:
axis/axis1/java/trunk/test/wsdl/schema2/
Modified:
axis/axis1/java/trunk/integration/pom.xml
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1391981&r1=1391980&r2=1391981&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sun Sep 30 10:28:18 2012
@@ -1071,6 +1071,25 @@
</configuration>
</execution>
<execution>
+ <id>schema2</id>
+ <goals>
+ <goal>generate-test-sources</goal>
+ </goals>
+ <configuration>
+ <file>src/test/wsdl/schema2/schema2.wsdl</file>
+ <deployScope>session</deployScope>
+ <generate>both</generate>
+ <typeMappingVersion>1.3</typeMappingVersion>
+ <mappings>
+ <mapping>
+ <namespace>urn:CityBBB</namespace>
+ <package>test.wsdl.schema2</package>
+ </mapping>
+ </mappings>
+
<deployWsdd>${project.build.directory}/wsdd/schema2.wsdd</deployWsdd>
+ </configuration>
+ </execution>
+ <execution>
<id>session</id>
<goals>
<goal>generate-test-sources</goal>
@@ -1348,6 +1367,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>generate-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
@@ -1360,6 +1380,19 @@
</target>
</configuration>
</execution>
+ <execution>
+ <id>process-test-sources</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- The schema2 test replaces a generated
bean by a simple JavaBean. Remove the generated class. -->
+ <delete
file="${project.build.directory}/generated-test-sources/wsdl2java/test/wsdl/schema2/Document.java"/>
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Copied:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Schema2ServiceTestCase.java
(from r1391765,
axis/axis1/java/trunk/test/wsdl/schema2/Schema2ServiceTestCase.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Schema2ServiceTestCase.java?p2=axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Schema2ServiceTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/schema2/Schema2ServiceTestCase.java&r1=1391765&r2=1391981&rev=1391981&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/schema2/Schema2ServiceTestCase.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/schema2/Schema2ServiceTestCase.java
Sun Sep 30 10:28:18 2012
@@ -7,6 +7,8 @@
package test.wsdl.schema2;
+import test.HttpTestUtil;
+
public class Schema2ServiceTestCase extends junit.framework.TestCase {
public Schema2ServiceTestCase(java.lang.String name) {
super(name);
@@ -14,16 +16,18 @@ public class Schema2ServiceTestCase exte
public void testSchema2ServiceWSDL() throws Exception {
javax.xml.rpc.ServiceFactory serviceFactory =
javax.xml.rpc.ServiceFactory.newInstance();
- java.net.URL url = new java.net.URL(new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2ServiceAddress() + "?WSDL");
- javax.xml.rpc.Service service = serviceFactory.createService(url, new
test.wsdl.schema2.Schema2ServiceLocator().getServiceName());
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ javax.xml.rpc.Service service = serviceFactory.createService(
+ HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress() +
"?WSDL"), loc.getServiceName());
assertTrue(service != null);
}
public void test1Schema2ServiceEchoLanguageTypeTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -42,10 +46,11 @@ public class Schema2ServiceTestCase exte
}
public void test2Schema2ServiceEchoTokenTypeTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -64,10 +69,11 @@ public class Schema2ServiceTestCase exte
}
public void test3Schema2ServiceEchoNameTypeTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -86,10 +92,11 @@ public class Schema2ServiceTestCase exte
}
public void test4Schema2ServiceEchoNCNameTypeTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -108,10 +115,11 @@ public class Schema2ServiceTestCase exte
}
public void test5Schema2ServiceEchoIDTypeTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -130,10 +138,11 @@ public class Schema2ServiceTestCase exte
}
public void test6Schema2ServiceEchoUnsignedShortTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -152,10 +161,11 @@ public class Schema2ServiceTestCase exte
}
public void test7Schema2ServiceEchoUnsignedIntTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -174,10 +184,11 @@ public class Schema2ServiceTestCase exte
}
public void test8Schema2ServiceEchoUnsignedByteTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -196,10 +207,11 @@ public class Schema2ServiceTestCase exte
}
public void test9Schema2ServiceEchoUnsignedLongTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -218,10 +230,11 @@ public class Schema2ServiceTestCase exte
}
public void test10Schema2ServiceEchoNonPositiveIntegerTest() throws
Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -240,10 +253,11 @@ public class Schema2ServiceTestCase exte
}
public void test11Schema2ServiceEchoNonNegativeIntegerTest() throws
Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -262,10 +276,11 @@ public class Schema2ServiceTestCase exte
}
public void test12Schema2ServiceEchoPositiveIntegerTest() throws Exception
{
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -284,10 +299,11 @@ public class Schema2ServiceTestCase exte
}
public void test13Schema2ServiceEchoNegativeIntegerTest() throws Exception
{
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -306,10 +322,11 @@ public class Schema2ServiceTestCase exte
}
public void test14Schema2ServiceEchoTimeTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -328,10 +345,11 @@ public class Schema2ServiceTestCase exte
}
public void test15Schema2ServiceEchoDateTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
@@ -350,10 +368,11 @@ public class Schema2ServiceTestCase exte
}
public void test16Schema2ServiceEchoDocumentTest() throws Exception {
- test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
+ Schema2ServiceSoapBindingStub binding;
try {
- binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
- new
test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
+ Schema2ServiceLocator loc = new Schema2ServiceLocator();
+ binding = (Schema2ServiceSoapBindingStub)
+
loc.getSchema2Service(HttpTestUtil.getTestEndpoint(loc.getSchema2ServiceAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
