You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/08/24 07:09:39 UTC
svn commit: r239532 - in /webservices/axis/trunk/java: ./
modules/addressing/ modules/common/ modules/core/ modules/integration/
modules/saaj/ modules/samples/ modules/security/ modules/tool/
modules/wsdl/ modules/xml/
Author: dims
Date: Tue Aug 23 22:09:30 2005
New Revision: 239532
URL: http://svn.apache.org/viewcvs?rev=239532&view=rev
Log:
initial checkin of "maven all-tests" - still needs work
Added:
webservices/axis/trunk/java/modules/common/maven.xml (with props)
webservices/axis/trunk/java/modules/saaj/maven.xml (with props)
webservices/axis/trunk/java/modules/wsdl/maven.xml (with props)
webservices/axis/trunk/java/modules/xml/maven.xml (with props)
Modified:
webservices/axis/trunk/java/maven.xml
webservices/axis/trunk/java/modules/addressing/maven.xml
webservices/axis/trunk/java/modules/common/project.xml
webservices/axis/trunk/java/modules/core/maven.xml
webservices/axis/trunk/java/modules/integration/maven.xml
webservices/axis/trunk/java/modules/samples/maven.xml
webservices/axis/trunk/java/modules/security/maven.xml
webservices/axis/trunk/java/modules/tool/maven.xml
Modified: webservices/axis/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/maven.xml (original)
+++ webservices/axis/trunk/java/maven.xml Tue Aug 23 22:09:30 2005
@@ -47,6 +47,7 @@
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:deploy="deploy"
+ xmlns:modules="local:modules"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:define="jelly:define">
@@ -287,6 +288,10 @@
</ant:delete>
</goal>
+ <goal name="all-tests">
+ <modules:reactor goals="test,itest"/>
+ </goal>
+
<goal name="create-jar" prereqs="init">
<jar destfile="target/lib/axis2-${pom.currentVersion}.jar">
<fileset dir="modules/core/target/classes"/>
@@ -498,6 +503,5 @@
</j:if>
</postGoal>
-
</project>
Modified: webservices/axis/trunk/java/modules/addressing/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/maven.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/maven.xml Tue Aug 23 22:09:30 2005
@@ -4,6 +4,7 @@
<project default="jar"
xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
@@ -20,4 +21,10 @@
<copy file="target/addressing.mar"
tofile="target/modules/addressing.mar"/>
</postGoal>
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
</project>
Added: webservices/axis/trunk/java/modules/common/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/common/maven.xml?rev=239532&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/common/maven.xml (added)
+++ webservices/axis/trunk/java/modules/common/maven.xml Tue Aug 23 22:09:30 2005
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven"
+ xmlns:u="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+</project>
Propchange: webservices/axis/trunk/java/modules/common/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis/trunk/java/modules/common/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/common/project.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/common/project.xml (original)
+++ webservices/axis/trunk/java/modules/common/project.xml Tue Aug 23 22:09:30 2005
@@ -48,6 +48,20 @@
</properties>
<url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
+ <dependency>
+ <groupId>maven-itest-plugin</groupId>
+ <artifactId>maven-itest-plugin</artifactId>
+ <version>1.0</version>
+ <type>plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <properties>
+ <classloader>root</classloader>
+ </properties>
+ </dependency>
</dependencies>
<reports/>
</project>
Modified: webservices/axis/trunk/java/modules/core/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/maven.xml (original)
+++ webservices/axis/trunk/java/modules/core/maven.xml Tue Aug 23 22:09:30 2005
@@ -4,6 +4,7 @@
<project default="jar"
xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
@@ -18,4 +19,10 @@
</j:jelly>
<ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
</postGoal>
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
</project>
Modified: webservices/axis/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis/trunk/java/modules/integration/maven.xml Tue Aug 23 22:09:30 2005
@@ -4,6 +4,7 @@
<project default="jar"
xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
@@ -232,6 +233,4 @@
</javac>
</goal>
-
-
</project>
Added: webservices/axis/trunk/java/modules/saaj/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/maven.xml?rev=239532&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/maven.xml (added)
+++ webservices/axis/trunk/java/modules/saaj/maven.xml Tue Aug 23 22:09:30 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+ <postGoal name="test:compile">
+ <j:jelly xmlns="jelly:ant">
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/service2"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/echo"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/invalidservice"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
+ </j:jelly>
+ <ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
+ </postGoal>
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+</project>
Propchange: webservices/axis/trunk/java/modules/saaj/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis/trunk/java/modules/samples/maven.xml Tue Aug 23 22:09:30 2005
@@ -4,6 +4,7 @@
<project default="jar"
xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
@@ -237,4 +238,11 @@
</fileset>
</jar>
</goal>
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
</project>
Modified: webservices/axis/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis/trunk/java/modules/security/maven.xml Tue Aug 23 22:09:30 2005
@@ -4,6 +4,7 @@
<project default="jar"
xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
@@ -24,4 +25,10 @@
<copy file="target/security.mar"
tofile="target/modules/security.mar"/>
</postGoal>
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
</project>
Modified: webservices/axis/trunk/java/modules/tool/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/maven.xml?rev=239532&r1=239531&r2=239532&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/maven.xml (original)
+++ webservices/axis/trunk/java/modules/tool/maven.xml Tue Aug 23 22:09:30 2005
@@ -4,6 +4,7 @@
<project default="jar"
xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
@@ -22,4 +23,10 @@
<copy file="${maven.repo.local}/ant/jars/ant-1.6.2.jar" todir="target/jar-tool"/>
<copy file="src/script/jar-tool-UI.bat" todir="target/jar-tool"></copy>
</goal>
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
</project>
Added: webservices/axis/trunk/java/modules/wsdl/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/maven.xml?rev=239532&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/maven.xml (added)
+++ webservices/axis/trunk/java/modules/wsdl/maven.xml Tue Aug 23 22:09:30 2005
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+</project>
Propchange: webservices/axis/trunk/java/modules/wsdl/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axis/trunk/java/modules/xml/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/maven.xml?rev=239532&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/xml/maven.xml (added)
+++ webservices/axis/trunk/java/modules/xml/maven.xml Tue Aug 23 22:09:30 2005
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+</project>
Propchange: webservices/axis/trunk/java/modules/xml/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native