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/02/26 15:32:22 UTC
svn commit: r1293843 - in /axis/axis1/java/trunk: axis-ant/
axis-ant/src/test/ant/filegen/ axis-ant/src/test/java/test/
axis-ant/src/test/java/test/wsdl/filegen/ axis-ant/src/test/wsdl/
axis-ant/src/test/wsdl/filegen/ test/ test/wsdl/filegen/
Author: veithen
Date: Sun Feb 26 14:32:21 2012
New Revision: 1293843
URL: http://svn.apache.org/viewvc?rev=1293843&view=rev
Log:
Mavenized test.wsdl.filegen.
Added:
axis/axis1/java/trunk/axis-ant/src/test/ant/filegen/
axis/axis1/java/trunk/axis-ant/src/test/ant/filegen/build.xml
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/build.xml
axis/axis1/java/trunk/axis-ant/src/test/java/test/AxisFileGenTestBase.java
- copied unchanged from r1293809, axis/axis1/java/trunk/test/AxisFileGenTestBase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/AxisTestBase.java
- copied unchanged from r1293809, axis/axis1/java/trunk/test/AxisTestBase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/AllOptionTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/FileGenTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/README
- copied unchanged from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/README
axis/axis1/java/trunk/axis-ant/src/test/wsdl/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/filegen/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/filegen/FileGen.wsdl
- copied unchanged from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/FileGen.wsdl
Removed:
axis/axis1/java/trunk/test/AxisFileGenTestBase.java
axis/axis1/java/trunk/test/wsdl/filegen/
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=1293843&r1=1293842&r2=1293843&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Sun Feb 26 14:32:21 2012
@@ -43,6 +43,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -61,6 +66,7 @@
<taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask" classpathref="maven.compile.classpath" />
<taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask" classpathref="maven.compile.classpath" />
<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/qname/build.xml" target="test" inheritrefs="true" />
</target>
</configuration>
Copied: axis/axis1/java/trunk/axis-ant/src/test/ant/filegen/build.xml (from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/build.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/filegen/build.xml?p2=axis/axis1/java/trunk/axis-ant/src/test/ant/filegen/build.xml&p1=axis/axis1/java/trunk/test/wsdl/filegen/build.xml&r1=1293809&r2=1293843&rev=1293843&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/filegen/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/filegen/build.xml Sun Feb 26 14:32:21 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/filegen" />
- &properties;
- &paths;
- &taskdefs;
- &taskdefs_post_compile;
- &targets;
-
-<target name="clean" depends="setenv">
- <echo message="Removing ${build.dir}/**/test/wsdl/filegen" />
- <echo message="componentName is ${componentName}"/>
- <delete dir="${build.dir}/classes/test/wsdl/filegen"/>
- <delete dir="${build.dir}/work/test/wsdl/filegen"/>
- <delete dir="${build.dir}/classes/test/wsdl/filegenAll"/>
- <delete dir="${build.dir}/work/test/wsdl/filegenAll"/>
-</target>
-
-
-<target name="compile" depends="clean">
- <echo message="Compiling test.wsdl.filegen"/>
+<project>
+ <target name="test">
<!-- Verify files generated based on what is referenced in WSDL -->
- <wsdl2java url="${axis.home}/test/wsdl/filegen/FileGen.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="src/test/wsdl/filegen/FileGen.wsdl"
+ output="${project.build.directory}/work"
deployscope="none"
serverSide="no"
noimports="no"
@@ -66,37 +13,11 @@ Copyright:
</wsdl2java>
<!-- Same test as above but this time the -a flag is turned on -->
- <wsdl2java url="${axis.home}/test/wsdl/filegen/FileGen.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="src/test/wsdl/filegen/FileGen.wsdl"
+ output="${project.build.directory}/work"
serverSide="no"
all="yes">
<mapping namespace="http://test.com/reference" package="test.wsdl.filegenAll"/>
</wsdl2java>
-
- <copy todir="${build.dir}/work/test/wsdl/filegen" overwrite="yes">
- <fileset dir="${axis.home}/test/wsdl/filegen">
- <include name="*TestCase.java"/>
- <include name="*Impl.java"/>
- </fileset>
- </copy>
- <copy todir="${build.dir}/work/test/" overwrite="yes">
- <fileset dir="${axis.home}/test/">
- <include name="*.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/*.java" />
- <include name="test/wsdl/filegen/*.java" />
- <include name="test/wsdl/filegenAll/*.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/filegen/AllOptionTestCase.java (from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/AllOptionTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java?p2=axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/filegen/AllOptionTestCase.java&r1=1293809&r2=1293843&rev=1293843&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/filegen/AllOptionTestCase.java (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java Sun Feb 26 14:32:21 2012
@@ -48,7 +48,8 @@ public class AllOptionTestCase extends F
* 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 +
"filegenAll";
} // rootDir
Copied: axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java (from r1293809, axis/axis1/java/trunk/test/wsdl/filegen/FileGenTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java?p2=axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/filegen/FileGenTestCase.java&r1=1293809&r2=1293843&rev=1293843&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/filegen/FileGenTestCase.java (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java Sun Feb 26 14:32:21 2012
@@ -42,8 +42,6 @@ public class FileGenTestCase extends Axi
*/
protected Set shouldExist() {
HashSet set = new HashSet();
- set.add("AllOptionTestCase.java");
- set.add("FileGenTestCase.java");
set.add("OpFault.java");
set.add("PortTypeSoap.java");
set.add("ReferenceService.java");
@@ -64,7 +62,8 @@ public class FileGenTestCase extends Axi
* 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 +
"filegen";
}