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/01/03 09:59:53 UTC
svn commit: r1226709 - in /axis/axis1/java/trunk: ./ axis-ant/
axis-ant/src/test/ axis-ant/src/test/ant/ axis-ant/src/test/ant/qname/
axis-ant/src/test/java/ axis-ant/src/test/java/test/
axis-ant/src/test/java/test/wsdl/ axis-ant/src/test/java/test/wsd...
Author: veithen
Date: Tue Jan 3 08:59:53 2012
New Revision: 1226709
URL: http://svn.apache.org/viewvc?rev=1226709&view=rev
Log:
Mavenized the test for AXIS-837.
Added:
axis/axis1/java/trunk/axis-ant/src/test/
axis/axis1/java/trunk/axis-ant/src/test/ant/
axis/axis1/java/trunk/axis-ant/src/test/ant/qname/
axis/axis1/java/trunk/axis-ant/src/test/ant/qname/build.xml
- copied, changed from r1226708, axis/axis1/java/trunk/test/wsdl/qname/build.xml
axis/axis1/java/trunk/axis-ant/src/test/java/
axis/axis1/java/trunk/axis-ant/src/test/java/test/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/qname/
- copied from r1226549, axis/axis1/java/trunk/test/wsdl/qname/
Removed:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/qname/build.xml
axis/axis1/java/trunk/test/wsdl/qname/
Modified:
axis/axis1/java/trunk/axis-ant/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/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=1226709&r1=1226708&r2=1226709&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Tue Jan 3 08:59:53 2012
@@ -39,4 +39,25 @@
<version>1.6</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask" classpathref="maven.compile.classpath" />
+ <ant antfile="src/test/ant/qname/build.xml" target="test" inheritrefs="true" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Copied: axis/axis1/java/trunk/axis-ant/src/test/ant/qname/build.xml (from r1226708, axis/axis1/java/trunk/test/wsdl/qname/build.xml)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/qname/build.xml?p2=axis/axis1/java/trunk/axis-ant/src/test/ant/qname/build.xml&p1=axis/axis1/java/trunk/test/wsdl/qname/build.xml&r1=1226708&r2=1226709&rev=1226709&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/qname/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/qname/build.xml Tue Jan 3 08:59:53 2012
@@ -1,72 +1,7 @@
<?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/qname" />
- &properties;
- &paths;
- &taskdefs;
- &taskdefs_post_compile;
- &targets;
-
-<target name="clean">
- <echo message="componentName is ${componentName}"/>
- <echo message="Removing ${build.dir}/**/test/wsdl/qname" />
- <delete dir="${build.dir}/classes/test/wsdl/qname"/>
- <delete dir="${build.dir}/work/test/wsdl/qname"/>
-</target>
-
-<!-- main target, always start from scratch -->
-<target name="compile" depends="setenv, clean">
- <echo message="Compiling test.wsdl.qname"/>
-
- <!-- Compile the test classes for Java2WSDL -->
- <javac srcdir="${axis.home}/test/wsdl/qname"
- destdir="${build.dest}"
- fork="${javac.fork}"
- nowarn="${nowarn}"
- source="${source}"
- debug="${debug}">
- <classpath refid="classpath" />
- <include name="foo.java" />
- <include name="MyServiceImpl.java" />
- <include name="MyServiceInterface.java" />
- </javac>
-
- <mkdir dir="${build.dir}/work/test/wsdl/qname"/>
+<project>
+ <target name="test">
+ <mkdir dir="${project.build.directory}/work/test/wsdl/qname"/>
<!-- Test #1 for Bug 19274 - Java2WSDL failure: Attempted to write schema for bad QName -->
<!-- Generate WSDL from java -->
@@ -77,7 +12,8 @@ Copyright:
namespaceimpl="urn:sample-impl"
style="WRAPPED"
serviceelementname="MyService"
- output="${build.dir}/work/test/wsdl/qname/MyService.wsdl">
+ output="${project.build.directory}/work/test/wsdl/qname/MyService.wsdl">
+ <classpath refid="maven.test.classpath"/>
<mapping package="test.wsdl.qname" namespace="http://test.com/qname" />
</java2wsdl>
@@ -90,14 +26,9 @@ Copyright:
style="DOCUMENT"
use="LITERAL"
serviceelementname="Foo"
- output="${build.dir}/work/test/wsdl/qname/MyService2.wsdl">
+ output="${project.build.directory}/work/test/wsdl/qname/MyService2.wsdl">
+ <classpath refid="maven.test.classpath"/>
<mapping package="test.wsdl.qname" namespace="http://test.com/qname" />
</java2wsdl>
-
-</target>
-
-<target name="run" >
- <antcall target="execute-Component" />
-</target>
-
+ </target>
</project>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1226709&r1=1226708&r2=1226709&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Tue Jan 3 08:59:53 2012
@@ -127,7 +127,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: axis/axis1/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1226709&r1=1226708&r2=1226709&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Tue Jan 3 08:59:53 2012
@@ -84,6 +84,10 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.11</version>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>