You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/05/05 20:22:45 UTC
svn commit: r535554 - in /webservices/axis2/trunk/java/modules: integration/
integration/test-resources/SOAP12Testing/SOAP12TestModuleB/
integration/test-resources/SOAP12Testing/SOAP12TestModuleC/
integration/test-resources/SOAP12Testing/SOAP12TestServ...
Author: dims
Date: Sat May 5 11:22:44 2007
New Revision: 535554
URL: http://svn.apache.org/viewvc?view=rev&rev=535554
Log:
compile/deploy all the services in m2 build. added the exclude list from project.xml as well
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/pom.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/build.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/build.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/build.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/build.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Sat May 5 11:22:44 2007
@@ -207,6 +207,16 @@
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcUW"
target="jar.server"/>
</j:if>
+ <j:jelly xmlns="jelly:ant">
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
+ </j:jelly>
</j:if>
</preGoal>
@@ -378,17 +388,6 @@
<mkdir dir="target/perf/build/repo/modules"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/perf/build/repo/modules/addressing-${addressing_version}.mar"/>
-
- <j:jelly xmlns="jelly:ant">
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
- </j:jelly>
</j:if>
</postGoal>
</project>
Modified: webservices/axis2/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Sat May 5 11:22:44 2007
@@ -442,6 +442,15 @@
</java>
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvcUW"
target="jar.server"/>
+
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
</tasks>
</configuration>
<goals>
@@ -453,7 +462,170 @@
<phase>test-compile</phase>
<configuration>
<tasks>
- <!-- TODO -->
+ <mkdir dir="target/test-resources/samples/modules"/>
+ <mkdir dir="target/test-resources/samples/conf"/>
+ <mkdir dir="target/test-resources/repository-client/modules"/>
+ <mkdir dir="target/test-resources/repository-client/conf"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/samples/modules/addressing-${version}.mar"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/test-resources/samples/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/repository-client/modules/addressing-${version}.mar"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/test-resources/repository-client/conf/axis2.xml"/>
+ <mkdir dir="target/toWar/services/"/>
+
+ <!-- Create Chunked enabled Repository -->
+ <mkdir dir="target/test-resources/chunking-enabledRepository"/>
+ <mkdir dir="target/test-resources/chunking-enabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/engine/chunking-enabled-axis2.xml"
+ tofile="target/test-resources/chunking-enabledRepository/conf/axis2.xml"/>
+
+ <!-- Create Chunked disabled Repository -->
+ <mkdir dir="target/test-resources/chunking-disabledRepository"/>
+ <mkdir dir="target/test-resources/chunking-disabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/engine/chunking-disabled-axis2.xml"
+ tofile="target/test-resources/chunking-disabledRepository/conf/axis2.xml"/>
+
+ <!-- Create JMS enabled Server Repository -->
+ <mkdir dir="target/test-resources/jms-enabled-server-repository"/>
+ <mkdir dir="target/test-resources/jms-enabled-server-repository/conf"/>
+ <mkdir dir="target/test-resources/jms-enabled-server-repository/modules"/>
+ <copy file="test/org/apache/axis2/jms/jms-enabled-server-axis2.xml"
+ tofile="target/test-resources/jms-enabled-server-repository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/jms-enabled-server-repository/modules/addressing-${version}.mar"/>
+
+ <!-- Create JMS enabled Client Repository -->
+ <mkdir dir="target/test-resources/jms-enabled-client-repository"/>
+ <mkdir dir="target/test-resources/jms-enabled-client-repository/conf"/>
+ <mkdir dir="target/test-resources/jms-enabled-client-repository/modules"/>
+ <copy file="test/org/apache/axis2/jms/jms-enabled-client-axis2.xml"
+ tofile="target/test-resources/jms-enabled-client-repository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/jms-enabled-client-repository/modules/addressing-${version}.mar"/>
+
+ <!-- Create Mail Client transport enabled Repository -->
+ <mkdir dir="target/test-resources/mail-transport-client-enabledRepository"/>
+ <mkdir dir="target/test-resources/mail-transport-client-enabledRepository/conf"/>
+ <mkdir dir="target/test-resources/mail-transport-client-enabledRepository/modules"/>
+ <copy file="test/org/apache/axis2/mail/mail-enabled-client-axis2.xml"
+ tofile="target/test-resources/mail-transport-client-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing-${version}.mar"/>
+
+ <!-- Create Mail Server transport enabled Repository -->
+ <mkdir dir="target/test-resources/mail-transport-server-enabledRepository"/>
+ <mkdir dir="target/test-resources/mail-transport-server-enabledRepository/conf"/>
+ <mkdir dir="target/test-resources/mail-transport-server-enabledRepository/modules"/>
+ <copy file="test/org/apache/axis2/mail/mail-enabled-server-axis2.xml"
+ tofile="target/test-resources/mail-transport-server-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/mail-transport-server-enabledRepository/modules/addressing-${version}.mar"/>
+
+ <mkdir dir="target/test-resources/MessageContextInjectionRepo"/>
+ <mkdir dir="target/test-resources/integrationRepo/modules"/>
+ <mkdir dir="target/test-resources/integrationRepo/conf"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/integrationRepo/modules/addressing-${version}.mar"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/test-resources/integrationRepo/conf/axis2.xml"/>
+
+
+ <!-- Commons transport enabled enabled Repository -->
+ <mkdir dir="target/test-resources/commons-http-enabledRepository"/>
+ <mkdir dir="target/test-resources/commons-http-enabledRepository/conf"/>
+ <copy file="test/org/apache/axis2/engine/commons-http-enabled-axis2.xml"
+ tofile="target/test-resources/commons-http-enabledRepository/conf/axis2.xml"/>
+
+ <!-- MTOM enabled Repository -->
+ <mkdir dir="target/test-resources/MTOM-enabledRepository"/>
+ <mkdir dir="target/test-resources/MTOM-enabledRepository/conf"/>
+ <mkdir dir="target/test-resources/MTOM-enabledRepository/modules"/>
+ <copy file="test-resources/mtom/MTOM-enabled-axis2.xml"
+ tofile="target/test-resources/MTOM-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/MTOM-enabledRepository/modules/addressing-${version}.mar"/>
+
+ <!-- MTOM file cache enabled Repository -->
+ <mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository"/>
+ <mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository/conf"/>
+ <copy file="test-resources/mtom/MTOM-fileCache-enabled-axis2.xml"
+ tofile="target/test-resources/MTOM-fileCache-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/MTOM-fileCache-enabledRepository/modules/addressing-${version}.mar"/>
+
+ <!-- SwA enabled Repository -->
+ <mkdir dir="target/test-resources/SwA-enabledRepository"/>
+ <mkdir dir="target/test-resources/SwA-enabledRepository/conf"/>
+ <copy file="test-resources/swa/SwA-enabled-axis2.xml"
+ tofile="target/test-resources/SwA-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/SwA-enabledRepository/modules/addressing-${version}.mar"/>
+
+ <!-- SwA file cache enabled Repository -->
+ <mkdir dir="target/test-resources/SwA-fileCache-enabledRepository"/>
+ <mkdir dir="target/test-resources/SwA-fileCache-enabledRepository/conf"/>
+ <copy file="test-resources/swa/SwA-fileCache-enabled-axis2.xml"
+ tofile="target/test-resources/SwA-fileCache-enabledRepository/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/SwA-fileCache-enabledRepository/modules/addressing-${version}.mar"/>
+
+ <!-- Groovy repository -->
+ <mkdir dir="target/groovyRepo"/>
+ <mkdir dir="target/groovyRepo/conf"/>
+ <mkdir dir="target/groovyRepo/services"/>
+ <mkdir dir="target/groovyRepo/modules"/>
+ <copy file="../samples/target/groovy/groovyService.aar"
+ tofile="target/groovyRepo/services/groovyService.aar"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/groovyRepo/modules/addressing-${version}.mar"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/groovyRepo/conf/axis2.xml"/>
+
+ <!-- Spring resources -->
+ <mkdir dir="target/test-resources/spring"/>
+ <copy file="../spring/test-resources/applicationContext.xml"
+ tofile="target/test-classes/spring/applicationContext.xml"/>
+
+ <!-- Test with target resolver -->
+ <mkdir dir="target/test-resources/deployment_repo"/>
+ <mkdir dir="target/test-resources/deployment_repo/conf"/>
+ <mkdir dir="target/test-resources/deployment_repo/services"/>
+ <mkdir dir="target/test-resources/deployment_repo/modules"/>
+
+ <copy file="test-resources/deployment/deployment.both.axis2.xml"
+ tofile="target/test-resources/deployment_repo/conf/axis2.xml"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/test-resources/deployment_repo/modules/addressing-${version}.mar"/>
+
+
+ <!-- Standard repository -->
+ <mkdir dir="target/Repository"/>
+ <mkdir dir="target/Repository/conf"/>
+ <mkdir dir="target/Repository/services"/>
+ <mkdir dir="target/Repository/modules"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/Repository/modules/addressing-${version}.mar"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/Repository/conf/axis2.xml"/>
+
+ <mkdir dir="target/perf2/build/repo/conf"/>
+ <mkdir dir="target/perf/build/repo/conf"/>
+
+ <copy file="conf/axis2.xml"
+ tofile="target/perf2/build/repo/conf/axis2.xml"/>
+ <copy file="conf/axis2.xml"
+ tofile="target/perf/build/repo/conf/axis2.xml"/>
+
+ <mkdir dir="target/perf2/build/repo/modules"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/perf2/build/repo/modules/addressing-${version}.mar"/>
+
+ <mkdir dir="target/perf/build/repo/modules"/>
+ <copy file="../addressing/target/addressing-${version}.mar"
+ tofile="target/perf/build/repo/modules/addressing-${version}.mar"/>
</tasks>
</configuration>
<goals>
@@ -490,9 +662,21 @@
<argLine>-Xms256m -Xmx512m</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
- <includes>
- <include>**/*Test.java</include>
- </includes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*Abstract*.java</exclude>
+ <exclude>**/*Util*.java</exclude>
+ <exclude>**/*InteropStubTest.java</exclude>
+ <exclude>**/*ServiceGroupContextTest.java</exclude>
+ <exclude>**/*EchoRawSwAFileInputTest.java</exclude>
+ <exclude>**org/apache/axis2/mail/*.java</exclude>
+ <exclude>**org/apache/axis2/transport/DualChannelRequestResponseRawXMLTest.java</exclude>
+ <exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.java</exclude>
+ <exclude>**/ScenarioST1Test.java</exclude>
+ <exclude>**/samples/wsdl/perf2/*.java</exclude>
+ </excludes>
<systemProperties>
<property>
<name>build.repository</name>
@@ -511,4 +695,4 @@
</plugin>
</plugins>
</reporting>
-</project>
+</project>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/build.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/build.xml Sat May 5 11:22:44 2007
@@ -9,14 +9,15 @@
<property name="jar.dir" location="${root}/target/Repository/modules/"/>
<path id="axis.test.classpath">
- <path refid="maven.dependency.classpath"></path>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${maven.class.path}"/>
<pathelement location="../../../target/classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
+ <javac fork="true" destdir="${build.classes}" debug="on">
<classpath refid="axis.test.classpath"/>
<src path="${src}"/>
</javac>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/build.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/build.xml Sat May 5 11:22:44 2007
@@ -9,14 +9,15 @@
<property name="jar.dir" location="${root}/target/Repository/modules/"/>
<path id="axis.test.classpath">
- <path refid="maven.dependency.classpath"></path>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${maven.class.path}"/>
<pathelement location="../../../target/classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
+ <javac fork="true" destdir="${build.classes}" debug="on">
<classpath refid="axis.test.classpath"/>
<src path="${src}"/>
</javac>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/build.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/build.xml Sat May 5 11:22:44 2007
@@ -9,7 +9,8 @@
<property name="jar.dir" location="${root}/target/Repository/services/"/>
<path id="axis.test.classpath">
- <path refid="maven.dependency.classpath"></path>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${maven.class.path}"/>
<pathelement location="../../../target/classes"/>
<pathelement location="../../../target/test-classes"/>
</path>
@@ -17,7 +18,7 @@
<target name="compile" depends="init" unless="jars.uptodate">
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
+ <javac fork="true" destdir="${build.classes}" debug="on">
<classpath refid="axis.test.classpath"/>
<src path="${src}"/>
</javac>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/build.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/build.xml Sat May 5 11:22:44 2007
@@ -9,7 +9,8 @@
<property name="jar.dir" location="${root}/target/Repository/services/"/>
<path id="axis.test.classpath">
- <path refid="maven.dependency.classpath"></path>
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${maven.class.path}"/>
<pathelement location="../../../target/classes"/>
<pathelement location="../../../target/test-classes"/>
</path>
@@ -17,7 +18,7 @@
<target name="compile" depends="init" unless="jars.uptodate">
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
+ <javac fork="true" destdir="${build.classes}" debug="on">
<classpath refid="axis.test.classpath"/>
<src path="${src}"/>
</javac>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=535554&r1=535553&r2=535554
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sat May 5 11:22:44 2007
@@ -77,7 +77,8 @@
<annogen.version>0.1.0</annogen.version>
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.4</antlr.version>
- <axiom.version>1.2.3</axiom.version>
+ <activemq.version>4.1.0-incubator</activemq.version>
+ <axiom.version>1.2.3</axiom.version>
<backport.util.concurrent.version>2.2</backport.util.concurrent.version>
<bcel.version>5.2</bcel.version>
<bcprov.version>jdk13-133</bcprov.version>
@@ -389,6 +390,10 @@
<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository/</url>
</repository>
<repository>
+ <id>apache-incubating</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+ </repository>
+ <repository>
<id>eclipse-repo</id>
<name>eclipse maven repository</name>
<url>http://repo1.maven.org/eclipse</url>
@@ -775,6 +780,11 @@
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>${bsf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
+ <version>${activemq.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org