Author: veithen
Date: Sat Sep 22 18:52:15 2012
New Revision: 1388868
URL: http://svn.apache.org/viewvc?rev=1388868&view=rev
Log:
Migrated test/wsdl/query to the Maven build.
Added:
axis/axis1/java/trunk/axis-testutils/ (with props)
axis/axis1/java/trunk/axis-testutils/pom.xml (with props)
axis/axis1/java/trunk/axis-testutils/src/
axis/axis1/java/trunk/axis-testutils/src/main/
axis/axis1/java/trunk/axis-testutils/src/main/java/
axis/axis1/java/trunk/axis-testutils/src/main/java/test/
axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
- copied unchanged from r1388857,
axis/axis1/java/trunk/axis-ant/src/test/java/test/AxisFileGenTestBase.java
axis/axis1/java/trunk/axis-testutils/src/main/java/test/AxisTestBase.java
- copied unchanged from r1388857,
axis/axis1/java/trunk/axis-ant/src/test/java/test/AxisTestBase.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryBean.java
- copied, changed from r1388857,
axis/axis1/java/trunk/test/wsdl/query/QueryBean.java
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryTest.java
- copied, changed from r1388857,
axis/axis1/java/trunk/test/wsdl/query/QueryTest.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
- copied, changed from r1388857,
axis/axis1/java/trunk/test/wsdl/query/FileGenWrappedTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/QueryTestServiceTestCase.java
- copied, changed from r1388857,
axis/axis1/java/trunk/test/wsdl/query/QueryTestServiceTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/QueryTestSoapBindingImpl.java
- copied unchanged from r1388857,
axis/axis1/java/trunk/test/wsdl/query/QueryTestSoapBindingImpl.java
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/query/
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/query/deploy.wsdd
- copied unchanged from r1388857,
axis/axis1/java/trunk/test/wsdl/query/deploy.wsdd
axis/axis1/java/trunk/integration/src/test/wsdd/wsdl/query/undeploy.wsdd
- copied unchanged from r1388857,
axis/axis1/java/trunk/test/wsdl/query/undeploy.wsdd
Removed:
axis/axis1/java/trunk/axis-ant/src/test/java/test/AxisFileGenTestBase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/AxisTestBase.java
axis/axis1/java/trunk/test/wsdl/query/
Modified:
axis/axis1/java/trunk/axis-ant/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-ant/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/pom.xml?rev=1388868&r1=1388867&r2=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Sat Sep 22 18:52:15 2012
@@ -46,13 +46,9 @@
<version>1.5.1</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-testutils</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: axis/axis1/java/trunk/axis-testutils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 22 18:52:15 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: axis/axis1/java/trunk/axis-testutils/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-testutils/pom.xml?rev=1388868&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-testutils/pom.xml (added)
+++ axis/axis1/java/trunk/axis-testutils/pom.xml Sat Sep 22 18:52:15 2012
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>axis-testutils</artifactId>
+ <name>Test Utilities</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/axis-testutils/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388868&r1=1388867&r2=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sat Sep 22 18:52:15 2012
@@ -40,13 +40,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-testutils</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -162,6 +158,26 @@
</mappings>
</configuration>
</execution>
+ <execution>
+ <id>query</id>
+ <goals>
+ <goal>generate-wsdl</goal>
+ </goals>
+ <phase>process-classes</phase>
+ <configuration>
+
<output>${project.build.directory}/work/test/wsdl/query/QueryTest.wsdl</output>
+
<className>test.wsdl.query.org.QueryTest</className>
+ <style>wrapped</style>
+ <namespace>http://query.wsdl.test</namespace>
+
<location>http://localhost:8080/axis/services/QueryTest</location>
+ <mappings>
+ <mapping>
+ <package>test.wsdl.query.org</package>
+
<namespace>http://query.wsdl.test</namespace>
+ </mapping>
+ </mappings>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -971,6 +987,18 @@
</configuration>
</execution>
<execution>
+ <id>query</id>
+ <goals>
+ <goal>generate-test-sources</goal>
+ </goals>
+ <configuration>
+
<file>${project.build.directory}/work/test/wsdl/query/QueryTest.wsdl</file>
+ <generate>both</generate>
+ <deployScope>session</deployScope>
+ <!-- Test has static WSDD; don't generate
deploy.wsdd -->
+ </configuration>
+ </execution>
+ <execution>
<id>ram</id>
<goals>
<goal>generate-test-sources</goal>
@@ -1317,6 +1345,8 @@
<exclude>test/dynamic/TestJAXRPCDII.java</exclude>
<!-- Excluded in r257238; see AXIS-750 -->
<exclude>test/wsdl/adaptive/**</exclude>
+ <!-- Excluded in r261718; see AXIS-2107 -->
+
<exclude>test/wsdl/query/FileGenWrappedTestCase.java</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 -->
Copied:
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryBean.java
(from r1388857, axis/axis1/java/trunk/test/wsdl/query/QueryBean.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryBean.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryBean.java&p1=axis/axis1/java/trunk/test/wsdl/query/QueryBean.java&r1=1388857&r2=1388868&rev=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/query/QueryBean.java (original)
+++
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryBean.java
Sat Sep 22 18:52:15 2012
@@ -1,7 +1,7 @@
/*
* This is a ColdFusion QueryBean object, including meta data.
*/
-package test.wsdl.query;
+package test.wsdl.query.org;
import java.io.Serializable;
Copied:
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryTest.java
(from r1388857, axis/axis1/java/trunk/test/wsdl/query/QueryTest.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryTest.java?p2=axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryTest.java&p1=axis/axis1/java/trunk/test/wsdl/query/QueryTest.java&r1=1388857&r2=1388868&rev=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/query/QueryTest.java (original)
+++
axis/axis1/java/trunk/integration/src/main/java/test/wsdl/query/org/QueryTest.java
Sat Sep 22 18:52:15 2012
@@ -5,12 +5,12 @@
*
*/
-package test.wsdl.query;
+package test.wsdl.query.org;
public class QueryTest {
/* echo query */
- public test.wsdl.query.QueryBean echoQuery(test.wsdl.query.QueryBean
argQuery) throws java.rmi.RemoteException {
+ public QueryBean echoQuery(QueryBean argQuery) throws
java.rmi.RemoteException {
return argQuery;
}
}
Copied:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
(from r1388857,
axis/axis1/java/trunk/test/wsdl/query/FileGenWrappedTestCase.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java?p2=axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/query/FileGenWrappedTestCase.java&r1=1388857&r2=1388868&rev=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/query/FileGenWrappedTestCase.java (original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
Sat Sep 22 18:52:15 2012
@@ -40,15 +40,9 @@ public class FileGenWrappedTestCase exte
HashSet set = new HashSet();
set.add("QueryBean.java");
set.add("QueryTest.java");
- set.add("QueryTestSoapBindingImpl.java");
set.add("QueryTestSoapBindingStub.java");
set.add("QueryTestService.java");
set.add("QueryTestServiceLocator.java");
- set.add("QueryTestServiceTestCase.java");
- set.add("FileGenWrappedTestCase.java");
- set.add("QueryTest.wsdl");
- set.add("deploy.wsdd");
- set.add("undeploy.wsdd");
return set;
} // shouldExist
@@ -65,7 +59,9 @@ public class FileGenWrappedTestCase exte
* The directory containing the files that should exist.
*/
protected String rootDir() {
- return "build" + File.separator + "work" + File.separator +
+ return System.getProperty("basedir", ".") + File.separator +
+ "target" + File.separator + "generated-test-sources" +
File.separator +
+ "wsdl2java" + File.separator +
"test" + File.separator + "wsdl" + File.separator +
"query";
} // rootDir
Copied:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/QueryTestServiceTestCase.java
(from r1388857,
axis/axis1/java/trunk/test/wsdl/query/QueryTestServiceTestCase.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/QueryTestServiceTestCase.java?p2=axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/QueryTestServiceTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/query/QueryTestServiceTestCase.java&r1=1388857&r2=1388868&rev=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/query/QueryTestServiceTestCase.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/QueryTestServiceTestCase.java
Sat Sep 22 18:52:15 2012
@@ -7,6 +7,8 @@
package test.wsdl.query;
+import test.HttpTestUtil;
+
public class QueryTestServiceTestCase extends junit.framework.TestCase {
public QueryTestServiceTestCase(java.lang.String name) {
super(name);
@@ -14,7 +16,7 @@ public class QueryTestServiceTestCase ex
public void testQueryTestWSDL() throws Exception {
javax.xml.rpc.ServiceFactory serviceFactory =
javax.xml.rpc.ServiceFactory.newInstance();
- java.net.URL url = new java.net.URL(new
test.wsdl.query.QueryTestServiceLocator().getQueryTestAddress() + "?WSDL");
+ java.net.URL url = HttpTestUtil.getTestEndpoint(new
test.wsdl.query.QueryTestServiceLocator().getQueryTestAddress() + "?WSDL");
javax.xml.rpc.Service service = serviceFactory.createService(url, new
test.wsdl.query.QueryTestServiceLocator().getServiceName());
assertTrue(service != null);
}
@@ -23,8 +25,8 @@ public class QueryTestServiceTestCase ex
public void test2QueryTestEchoQuery() throws Exception {
test.wsdl.query.QueryTestSoapBindingStub binding;
try {
- binding = (test.wsdl.query.QueryTestSoapBindingStub)
- new
test.wsdl.query.QueryTestServiceLocator().getQueryTest();
+ QueryTestServiceLocator loc = new QueryTestServiceLocator();
+ binding =
(QueryTestSoapBindingStub)loc.getQueryTest(HttpTestUtil.getTestEndpoint(loc.getQueryTestAddress()));
}
catch (javax.xml.rpc.ServiceException jre) {
if(jre.getLinkedCause()!=null)
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1388868&r1=1388867&r2=1388868&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Sat Sep 22 18:52:15 2012
@@ -66,6 +66,7 @@
<module>axis-castor</module>
<module>axis-rt-transports-http-javanet</module>
<module>axis-jms</module>
+ <module>axis-testutils</module>
<module>integration</module>
<module>axis-war</module>
<module>samples</module>
