Author: veithen
Date: Thu Oct 11 21:05:33 2012
New Revision: 1397309
URL: http://svn.apache.org/viewvc?rev=1397309&view=rev
Log:
Migrated test/wsdl/schemaImport to the Maven build.
Added:
axis/axis1/java/trunk/axis-ant/src/test/ant/schemaImport/
axis/axis1/java/trunk/axis-ant/src/test/ant/schemaImport/build.xml
- copied, changed from r1396786,
axis/axis1/java/trunk/test/wsdl/schemaImport/build.xml
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
- copied, changed from r1396786,
axis/axis1/java/trunk/test/wsdl/schemaImport/SchemaImportTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/foo.java
- copied unchanged from r1396786,
axis/axis1/java/trunk/test/wsdl/schemaImport/foo.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/foobar.java
- copied unchanged from r1396786,
axis/axis1/java/trunk/test/wsdl/schemaImport/foobar.java
axis/axis1/java/trunk/axis-ant/src/test/wsdl/schemaImport/
axis/axis1/java/trunk/axis-ant/src/test/wsdl/schemaImport/foo.xsd
- copied unchanged from r1396786,
axis/axis1/java/trunk/test/wsdl/schemaImport/foo.xsd
Removed:
axis/axis1/java/trunk/test/wsdl/schemaImport/
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=1397309&r1=1397308&r2=1397309&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Thu Oct 11 21:05:33 2012
@@ -81,6 +81,7 @@
<ant antfile="src/test/ant/literal/build.xml"
target="test" inheritrefs="true" />
<ant
antfile="src/test/ant/multibinding/build.xml" target="test" inheritrefs="true"
/>
<ant antfile="src/test/ant/qname/build.xml"
target="test" inheritrefs="true" />
+ <ant
antfile="src/test/ant/schemaImport/build.xml" target="test" inheritrefs="true"
/>
<ant antfile="src/test/ant/split/build.xml"
target="test" inheritrefs="true" />
</target>
</configuration>
Copied: axis/axis1/java/trunk/axis-ant/src/test/ant/schemaImport/build.xml
(from r1396786, axis/axis1/java/trunk/test/wsdl/schemaImport/build.xml)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/schemaImport/build.xml?p2=axis/axis1/java/trunk/axis-ant/src/test/ant/schemaImport/build.xml&p1=axis/axis1/java/trunk/test/wsdl/schemaImport/build.xml&r1=1396786&r2=1397309&rev=1397309&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/schemaImport/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/schemaImport/build.xml Thu Oct
11 21:05:33 2012
@@ -1,64 +1,11 @@
<?xml version="1.0"?>
-<!-- edited with XMLSPY v5 U (http://www.xmlspy.com) by Doug Bitting (Agile
Software) -->
-<!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 [email protected]
-
-Copyright:
- Copyright (c) 2002-2003 Apache Software Foundation.
-</description>
-==================================================================== -->
-<project default="compile">
- <property name="axis.home" location="../../.."/>
- <property name="componentName" value="test/wsdl/schemaImport"/>
- &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"/>
- <target name="compile" depends="copy">
+<project>
+ <target name="test">
<!-- Generate the WSDL file that the test will validate.-->
- <echo message="Compiling test.wsdl.schemaImport"/>
- <javac srcdir="${axis.home}" destdir="${build.dest}" debug="${debug}"
nowarn="${nowarn}" source="${source}" fork="${javac.fork}">
- <classpath refid="classpath"/>
- <include name="test/wsdl/schemaImport/**.java"/>
- </javac>
- <mkdir dir="${axis.home}/build/work/test/wsdl/schemaImport"/>
- <java2wsdl
output="${axis.home}/build/work/test/wsdl/schemaImport/foo.wsdl"
className="test.wsdl.schemaImport.foo" namespace="urn:ImportSchemaTest"
importSchema="${axis.home}/test/wsdl/schemaImport/foo.xsd"
location="http://www.foo.com/foo"; style="DOCUMENT">
+ <mkdir dir="${project.build.directory}/work/test/wsdl/schemaImport"/>
+ <java2wsdl
output="${project.build.directory}/work/test/wsdl/schemaImport/foo.wsdl"
className="test.wsdl.schemaImport.foo" namespace="urn:ImportSchemaTest"
importSchema="src/test/wsdl/schemaImport/foo.xsd"
location="http://www.foo.com/foo"; style="DOCUMENT">
+ <classpath refid="maven.test.classpath"/>
<mapping namespace="urn:ImportSchemaTest"
package="test.wsdl.schemaImport"/>
</java2wsdl>
</target>
- <target name="run">
- <antcall target="execute-Component-noServer"/>
- </target>
</project>
Copied:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
(from r1396786,
axis/axis1/java/trunk/test/wsdl/schemaImport/SchemaImportTestCase.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java?p2=axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/schemaImport/SchemaImportTestCase.java&r1=1396786&r2=1397309&rev=1397309&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/schemaImport/SchemaImportTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
Thu Oct 11 21:05:33 2012
@@ -42,7 +42,8 @@ public class SchemaImportTestCase extend
}
public void testSchemaImport() {
- String path = "build" + File.separator + "work" + File.separator +
+ String path = System.getProperty("basedir", ".") + File.separator +
+ "target" + File.separator + "work" + File.separator +
"test" + File.separator + "wsdl" + File.separator +
"schemaImport" + File.separator + "foo.wsdl";
Document doc = null;
