Author: veithen
Date: Sun Jan 15 19:22:10 2012
New Revision: 1231734
URL: http://svn.apache.org/viewvc?rev=1231734&view=rev
Log:
Mavenized some auto-types test cases (not yet working).
Added:
axis/axis1/java/trunk/integration/src/test/java/test/functional/
axis/axis1/java/trunk/integration/src/test/java/test/functional/IAutoTypes.java
- copied unchanged from r1231698,
axis/axis1/java/trunk/test/functional/IAutoTypes.java
axis/axis1/java/trunk/integration/src/test/java/test/functional/NestedBean.java
- copied unchanged from r1231698,
axis/axis1/java/trunk/test/functional/NestedBean.java
axis/axis1/java/trunk/integration/src/test/java/test/functional/SimpleBean.java
- copied unchanged from r1231698,
axis/axis1/java/trunk/test/functional/SimpleBean.java
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
- copied, changed from r1231698,
axis/axis1/java/trunk/test/functional/TestAutoTypes.java
axis/axis1/java/trunk/integration/src/test/jws/
axis/axis1/java/trunk/integration/src/test/jws/AutoTypesTest.jws
- copied unchanged from r1231698,
axis/axis1/java/trunk/test/functional/AutoTypesTest.jws
axis/axis1/java/trunk/integration/src/test/wsdd/functional/
axis/axis1/java/trunk/integration/src/test/wsdd/functional/auto-deploy.wsdd
- copied unchanged from r1231698,
axis/axis1/java/trunk/test/functional/auto-deploy.wsdd
axis/axis1/java/trunk/integration/src/test/wsdd/functional/auto-undeploy.wsdd
- copied unchanged from r1231698,
axis/axis1/java/trunk/test/functional/auto-undeploy.wsdd
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/jaxrpchandler2/
- copied from r1231698,
axis/axis1/java/trunk/integration/src/test/wsdd/jaxrpchandler2/
Removed:
axis/axis1/java/trunk/integration/src/test/wsdd/jaxrpchandler2/
axis/axis1/java/trunk/test/functional/AutoTypesTest.jws
axis/axis1/java/trunk/test/functional/IAutoTypes.java
axis/axis1/java/trunk/test/functional/NestedBean.java
axis/axis1/java/trunk/test/functional/SimpleBean.java
axis/axis1/java/trunk/test/functional/TestAutoTypes.java
axis/axis1/java/trunk/test/functional/auto-deploy.wsdd
axis/axis1/java/trunk/test/functional/auto-undeploy.wsdd
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=1231734&r1=1231733&r2=1231734&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sun Jan 15 19:22:10 2012
@@ -901,6 +901,7 @@
</wsdds>
<jwsDirs>
<jwsDir>../axis-war/src/main/webapp</jwsDir>
+ <jwsDir>src/test/jws</jwsDir>
</jwsDirs>
</configuration>
</execution>
@@ -969,6 +970,8 @@
<exclude>test/wsdl/adaptive/**</exclude>
<!-- TODO: remote service no longer available
-->
<exclude>test/wsdl/dataset/**</exclude>
+ <!-- TODO: this causes problems in subsequent
tests because auto types modify a shared TypeMapping -->
+
<exclude>test/functional/TestAutoTypes.java</exclude>
<!-- These are not test cases -->
<exclude>test/wsdl/date/TestdateSoapBinding*</exclude>
<exclude>test/wsdl/inout/TestFailed.java</exclude>
Copied:
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
(from r1231698, axis/axis1/java/trunk/test/functional/TestAutoTypes.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java?p2=axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java&p1=axis/axis1/java/trunk/test/functional/TestAutoTypes.java&r1=1231698&r2=1231734&rev=1231734&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestAutoTypes.java (original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
Sun Jan 15 19:22:10 2012
@@ -32,13 +32,13 @@ public class TestAutoTypes extends TestC
protected void setUp() throws java.lang.Exception {
AxisProperties.setProperty("axis.doAutoTypes", "true");
- String[] args = {"test/functional/auto-deploy.wsdd"};
+ String[] args = { System.getProperty("basedir") +
"/src/test/wsdd/functional/auto-deploy.wsdd" };
AdminClient.main(args);
}
protected void tearDown() throws java.lang.Exception {
AxisProperties.setProperty("axis.doAutoTypes", "false");
- String[] args = {"test/functional/auto-undeploy.wsdd"};
+ String[] args = { System.getProperty("basedir") +
"/src/test/wsdd/functional/auto-undeploy.wsdd" };
AdminClient.main(args);
}
@@ -49,10 +49,10 @@ public class TestAutoTypes extends TestC
//location of wsdl file
String wsdlLocation = "http://"; + thisHost + ":" + thisPort +
- "/jws/AutoTypesTest.jws?wsdl";
+ "/axis/AutoTypesTest.jws?wsdl";
URL urlWsdl = new URL(wsdlLocation);
String nameSpaceUri = "http://"; + thisHost + ":" + thisPort +
- "/jws/AutoTypesTest.jws";
+ "/axis/AutoTypesTest.jws";
String serviceName = "AutoTypesTestService";
String portName = "AutoTypesTest";
ServiceFactory serviceFactory = ServiceFactory.newInstance();
