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:16:40 UTC
svn commit: r1293841 - in /axis/axis1/java/trunk: axis-ant/
axis-ant/src/test/ant/extra/ axis-ant/src/test/java/test/wsdl/extra/
test/wsdl/extra/
Author: veithen
Date: Sun Feb 26 14:16:39 2012
New Revision: 1293841
URL: http://svn.apache.org/viewvc?rev=1293841&view=rev
Log:
Mavenized test.wsdl.extra.
Added:
axis/axis1/java/trunk/axis-ant/src/test/ant/extra/
axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/extra/build.xml
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/Extra.java
- copied unchanged from r1293809, axis/axis1/java/trunk/test/wsdl/extra/Extra.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/extra/ExtraClassesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/MyService.java
- copied unchanged from r1293809, axis/axis1/java/trunk/test/wsdl/extra/MyService.java
Removed:
axis/axis1/java/trunk/test/wsdl/extra/
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=1293841&r1=1293840&r2=1293841&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Sun Feb 26 14:16:39 2012
@@ -38,6 +38,11 @@
<artifactId>ant</artifactId>
<version>1.5.1</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -45,13 +50,17 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>test</phase>
+ <!-- We run this in process-test-classes so that we can refer to test classes
+ (e.g. in java2wsdl), but also run unit tests that verify the output. -->
+ <phase>process-test-classes</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<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/qname/build.xml" target="test" inheritrefs="true" />
</target>
</configuration>
Copied: axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml (from r1293809, axis/axis1/java/trunk/test/wsdl/extra/build.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml?p2=axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml&p1=axis/axis1/java/trunk/test/wsdl/extra/build.xml&r1=1293809&r2=1293841&rev=1293841&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/extra/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml Sun Feb 26 14:16:39 2012
@@ -1,108 +1,25 @@
<?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/extra" />
- &properties;
- &paths;
- &taskdefs;
- &taskdefs_post_compile;
- &targets;
-
-<target name="clean">
- <echo message="componentName is ${componentName}"/>
- <echo message="Removing ${build.dir}/**/test/wsdl/extra" />
- <delete dir="${build.dir}/classes/test/wsdl/extra"/>
- <delete dir="${build.dir}/work/test/wsdl/extra"/>
-</target>
-
-<!-- main target, always start from scratch -->
-<target name="compile" depends="setenv, clean">
- <echo message="Compiling test.wsdl.extra"/>
-
- <!-- Compile the test classes for Java2WSDL -->
- <javac srcdir="${axis.home}/test/wsdl/extra"
- destdir="${build.dest}"
- fork="${javac.fork}"
- nowarn="${nowarn}"
- source="${source}"
- debug="${debug}">
- <classpath refid="classpath" />
- <include name="MyService.java" />
- <include name="Extra.java" />
- </javac>
-
- <mkdir dir="${build.dir}/work/test/wsdl/extra"/>
+<project>
+ <target name="test">
+ <mkdir dir="${project.build.directory}/work/test/wsdl/extra"/>
<!-- Generate WSDL from java -->
- <java2wsdl output="${build.dir}/work/test/wsdl/extra/MyService.wsdl"
+ <java2wsdl output="${project.build.directory}/work/test/wsdl/extra/MyService.wsdl"
className= "test.wsdl.extra.MyService"
extraClasses="test.wsdl.extra.Extra"
namespace="http://test.com/extraClasses"
location="http://localhost:8080/axis/services/MyService">
+ <classpath refid="maven.test.classpath"/>
<mapping package="test.wsdl.extra" namespace="http://test.com/extraClasses" />
</java2wsdl>
<!-- Verify files generated based on everything in WSDL -->
- <wsdl2java url="${build.dir}/work/test/wsdl/extra/MyService.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="${project.build.directory}/work/test/wsdl/extra/MyService.wsdl"
+ output="${project.build.directory}/work"
all="yes"
verbose="no"
testcase="no">
<mapping namespace="http://test.com/extraClasses" package="test.wsdl.extra"/>
</wsdl2java>
-
- <!-- Copy the test case -->
- <copy file="ExtraClassesTestCase.java" overwrite="true"
- todir="${build.dir}/work/test/wsdl/extra"/>
-
- <!-- Clean up old classes -->
- <delete dir="${build.dir}/classes/test/wsdl/extra" />
-
- <!-- Compile the test case -->
- <javac srcdir="${build.dir}/work" destdir="${build.dest}" nowarn="${nowarn}" source="${source}" fork="${javac.fork}"
- debug="${debug}">
- <classpath refid="classpath" />
- <include name="test/wsdl/extra/*.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/extra/ExtraClassesTestCase.java (from r1293809, axis/axis1/java/trunk/test/wsdl/extra/ExtraClassesTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java?p2=axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/extra/ExtraClassesTestCase.java&r1=1293809&r2=1293841&rev=1293841&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/extra/ExtraClassesTestCase.java (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java Sun Feb 26 14:16:39 2012
@@ -44,7 +44,6 @@ public class ExtraClassesTestCase exten
set.add("MyServiceServiceLocator.java");
set.add("MyServiceSoapBindingStub.java");
set.add("MyService.wsdl");
- set.add("ExtraClassesTestCase.java");
return set;
} // shouldExist
@@ -60,7 +59,8 @@ public class ExtraClassesTestCase exten
* 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 +
"extra";
} // rootDir