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:47:45 UTC
svn commit: r1293846 - in /axis/axis1/java/trunk: axis-ant/
axis-ant/src/test/ant/clash/ axis-ant/src/test/java/test/wsdl/clash/
axis-ant/src/test/wsdl/clash/ test/wsdl/clash/
Author: veithen
Date: Sun Feb 26 14:47:44 2012
New Revision: 1293846
URL: http://svn.apache.org/viewvc?rev=1293846&view=rev
Log:
Mavenized test.wsdl.clash.
Added:
axis/axis1/java/trunk/axis-ant/src/test/ant/clash/
axis/axis1/java/trunk/axis-ant/src/test/ant/clash/build.xml
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/clash/build.xml
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
- copied, changed from r1293809, axis/axis1/java/trunk/test/wsdl/clash/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/wsdl/clash/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/clash/clash.wsdl
- copied unchanged from r1293809, axis/axis1/java/trunk/test/wsdl/clash/clash.wsdl
axis/axis1/java/trunk/axis-ant/src/test/wsdl/clash/duplicate-element.wsdl
- copied unchanged from r1293809, axis/axis1/java/trunk/test/wsdl/clash/duplicate-element.wsdl
Removed:
axis/axis1/java/trunk/test/wsdl/clash/
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=1293846&r1=1293845&r2=1293846&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Sun Feb 26 14:47:44 2012
@@ -65,6 +65,7 @@
<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/clash/build.xml" target="test" inheritrefs="true" />
<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" />
Copied: axis/axis1/java/trunk/axis-ant/src/test/ant/clash/build.xml (from r1293809, axis/axis1/java/trunk/test/wsdl/clash/build.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/clash/build.xml?p2=axis/axis1/java/trunk/axis-ant/src/test/ant/clash/build.xml&p1=axis/axis1/java/trunk/test/wsdl/clash/build.xml&r1=1293809&r2=1293846&rev=1293846&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/clash/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/clash/build.xml Sun Feb 26 14:47:44 2012
@@ -1,87 +1,18 @@
<?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/clash" />
- &properties;
- &paths;
- &taskdefs;
- &taskdefs_post_compile;
- &targets;
-
-<target name="clean">
- <echo message="Removing ${build.dir}/classes/${componentName} and ${build.dir}/work/${componentName}" />
- <delete dir="${build.dir}/classes/${componentName}"/>
- <delete dir="${build.dir}/work/${componentName}"/>
-</target>
-
-<target name="copy" depends="setenv">
- <ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}" dir="${axis.home}/test/wsdl/filegen" antfile="build.xml" target="compile"/>
-</target>
-
-<target name="compile" depends="copy">
- <echo message="Compiling test.wsdl.clash"/>
+<project>
+ <target name="test">
+ <mkdir dir="${project.build.directory}/work/test/wsdl/clash"/>
+
<!-- Name clash test -->
- <wsdl2java url="${axis.home}/test/wsdl/clash/clash.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="src/test/wsdl/clash/clash.wsdl"
+ output="${project.build.directory}/work"
testcase="yes"
serverSide="yes">
</wsdl2java>
- <wsdl2java url="${axis.home}/test/wsdl/clash/duplicate-element.wsdl"
- output="${axis.home}/build/work"
+ <wsdl2java url="src/test/wsdl/clash/duplicate-element.wsdl"
+ output="${project.build.directory}/work"
wrapArrays="yes">
</wsdl2java>
-
- <copy todir="${build.dir}/work/test/wsdl/clash" overwrite="yes">
- <fileset dir="${axis.home}/test/wsdl/clash">
- <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/clash/*.java" />
- </javac>
-</target>
-
-<target name="run" >
- <antcall target="execute-Component" />
-</target>
-
+ </target>
</project>
Copied: axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java (from r1293809, axis/axis1/java/trunk/test/wsdl/clash/VerifyFilesTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java?p2=axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/clash/VerifyFilesTestCase.java&r1=1293809&r2=1293846&rev=1293846&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/clash/VerifyFilesTestCase.java (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java Sun Feb 26 14:47:44 2012
@@ -48,7 +48,6 @@ public class VerifyFilesTestCase extends
set.add("SharedName_ServiceLocator.java");
set.add("SharedName_ServiceTestCase.java");
set.add("SharedName_Type.java");
- set.add("VerifyFilesTestCase.java");
set.add("deploy.wsdd");
set.add("undeploy.wsdd");
return set;
@@ -67,7 +66,8 @@ public class VerifyFilesTestCase extends
* 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 +
"clash";
} // rootDir