You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/10/23 20:37:03 UTC
svn commit: r1401380 - in /axis/axis1/java/trunk: axis-ant/
axis-ant/src/test/ant/groups/ axis-ant/src/test/java/test/wsdl/groups/
axis-ant/src/test/wsdl/groups/ test/wsdl/groups/
Author: veithen
Date: Tue Oct 23 18:37:03 2012
New Revision: 1401380
URL: http://svn.apache.org/viewvc?rev=1401380&view=rev
Log:
Migrated test/wsdl/groups to the Maven build.
Added:
axis/axis1/java/trunk/axis-ant/src/test/ant/groups/
axis/axis1/java/trunk/axis-ant/src/test/ant/groups/build.xml
- copied, changed from r1401069, axis/axis1/java/trunk/test/wsdl/groups/build.xml
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
- copied, changed from r1401069, axis/axis1/java/trunk/test/wsdl/groups/GroupsTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/wsdl/groups/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/groups/Groups.wsdl
- copied unchanged from r1401069, axis/axis1/java/trunk/test/wsdl/groups/Groups.wsdl
Removed:
axis/axis1/java/trunk/test/wsdl/groups/
Modified:
axis/axis1/java/trunk/axis-ant/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=1401380&r1=1401379&r2=1401380&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Tue Oct 23 18:37:03 2012
@@ -82,6 +82,7 @@
<ant antfile="src/test/ant/extra/build.xml" target="test" inheritrefs="true" />
<ant antfile="src/test/ant/filegen/build.xml" target="test" inheritrefs="true" />
<ant antfile="src/test/ant/generatorfactory/build.xml" target="test" inheritrefs="true" />
+ <ant antfile="src/test/ant/groups/build.xml" target="test" inheritrefs="true" />
<ant antfile="src/test/ant/header/build.xml" target="test" inheritrefs="true" />
<ant antfile="src/test/ant/literal/build.xml" target="test" inheritrefs="true" />
<ant antfile="src/test/ant/multibinding/build.xml" target="test" inheritrefs="true" />
@@ -93,6 +94,52 @@
</execution>
</executions>
</plugin>
+ <!-- Add the generated files to the test sources ... -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/work</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- ... and execute a second compilation phase to compile them. We do this for two reasons:
+ * To check that the generated sources are compilable.
+ * Some test cases need to load classes to inspect them using reflection. -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>testCompile-phase2</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- These are test cases generated by wsdl2java; they are not executable
+ because we don't start an Axis test server (such tests would belong
+ to the integration tests). -->
+ <exclude>test/wsdl/clash/SharedName_ServiceTestCase.java</exclude>
+ <exclude>test/wsdl/header/HeaderServiceTestCase.java</exclude>
+ <exclude>test/wsdl/multibinding/MbServiceTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
Copied: axis/axis1/java/trunk/axis-ant/src/test/ant/groups/build.xml (from r1401069, axis/axis1/java/trunk/test/wsdl/groups/build.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/groups/build.xml?p2=axis/axis1/java/trunk/axis-ant/src/test/ant/groups/build.xml&p1=axis/axis1/java/trunk/test/wsdl/groups/build.xml&r1=1401069&r2=1401380&rev=1401380&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/groups/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/groups/build.xml Tue Oct 23 18:37:03 2012
@@ -1,62 +1,9 @@
<?xml version="1.0" ?>
-<!DOCTYPE project [
- <!ENTITY properties SYSTEM "../../../xmls/properties.xml">
- <!ENTITY paths SYSTEM "../../../xmls/path_refs.xml">
- <!ENTITY taskdefs SYSTEM "../../../xmls/taskdefs.xml">
- <!ENTITY taskdefs_post_compile SYSTEM "../../../xmls/taskdefs_post_compile.xml">
- <!ENTITY targets SYSTEM "../../../xmls/targets.xml">
-]>
-
-<!-- ===================================================================
-<description>
- Test/Sample Component file for Axis
-
-Notes:
- This is a build file for use with the Jakarta Ant build tool.
-
-Prerequisites:
-
- jakarta-ant from http://jakarta.apache.org
-
-Build Instructions:
- To compile
- ant compile
- To execute
- ant run
-
-Author:
- Matt Seibert mseibert@us.ibm.com
-
-Copyright:
- Copyright (c) 2002-2003 Apache Software Foundation.
-</description>
-==================================================================== -->
-
-<project default="compile">
-
-<property name="axis.home" location="../../.." />
-<property name="componentName" value="test/wsdl/groups" />
- &properties;
- &paths;
- &taskdefs;
- &taskdefs_post_compile;
- &targets;
-
-<target name="clean" depends="setenv">
- <echo message="Removing ${build.dir}/**/test/wsdl/groups" />
- <echo message="componentName is ${componentName}"/>
- <delete dir="${build.dir}/classes/test/wsdl/groups"/>
- <delete dir="${build.dir}/work/test/wsdl/groups"/>
- <delete dir="${build.dir}/classes/test/wsdl/groupsAll"/>
- <delete dir="${build.dir}/work/test/wsdl/groupsAll"/>
-</target>
-
-
-<target name="compile" depends="clean">
- <echo message="Compiling test.wsdl.groups"/>
+<project>
+ <target name="test">
<!-- Verify files generated based on what is referenced in WSDL -->
- <wsdl2java url="${axis.home}/test/wsdl/groups/Groups.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="src/test/wsdl/groups/Groups.wsdl"
+ output="${project.build.directory}/work"
deployscope="none"
serverSide="no"
noimports="no"
@@ -66,31 +13,11 @@ Copyright:
</wsdl2java>
<!-- Same test as above but this time the -a flag is turned on -->
- <wsdl2java url="${axis.home}/test/wsdl/groups/Groups.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="src/test/wsdl/groups/Groups.wsdl"
+ output="${project.build.directory}/work"
serverSide="no"
all="yes">
<mapping namespace="http://test.com/reference" package="test.wsdl.groupsAll"/>
</wsdl2java>
-
- <copy todir="${build.dir}/work/test/wsdl/groups" overwrite="yes">
- <fileset dir="${axis.home}/test/wsdl/groups">
- <include name="*TestCase.java"/>
- <include name="*Impl.java"/>
- </fileset>
- </copy>
-
- <javac srcdir="${build.dir}/work" destdir="${build.dest}" nowarn="${nowarn}" source="${source}" fork="${javac.fork}"
- debug="${debug}">
- <classpath refid="classpath" />
- <include name="test/wsdl/groups/*.java" />
- <include name="test/wsdl/groupsAll/*.java" />
- </javac>
-
-</target>
-
-<target name="run" >
- <antcall target="execute-Component-noServer" />
-</target>
-
+ </target>
</project>
Copied: axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java (from r1401069, axis/axis1/java/trunk/test/wsdl/groups/GroupsTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java?p2=axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/groups/GroupsTestCase.java&r1=1401069&r2=1401380&rev=1401380&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/groups/GroupsTestCase.java (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java Tue Oct 23 18:37:03 2012
@@ -39,7 +39,6 @@ public class GroupsTestCase extends juni
*/
protected Set shouldExist() {
HashSet set = new HashSet();
- set.add("GroupsTestCase.java");
set.add("SomeType.java");
return set;
}
@@ -57,7 +56,8 @@ public class GroupsTestCase extends juni
* 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 + "work" + File.separator +
"test" + File.separator + "wsdl" + File.separator +
"groups";
}