4:39 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-04-19 05:39:13 -0400 (Sat, 19 Apr 2008)
New Revision: 6537
Added:
stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-samples-jaxws.xml
stack/cxf/branches/tdiesler/trunk/modules/testsuite/src/test-framework/
Modified:
stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-jars-jaxws.xml
stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
Log:
Exlude wsrm
Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-jars-jaxws.xml
===================================================================
---
stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-jars-jaxws.xml 2008-04-19
08:42:08 UTC (rev 6536)
+++
stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-jars-jaxws.xml 2008-04-19
09:39:13 UTC (rev 6537)
@@ -20,7 +20,7 @@
<!--
-->
<!-- ==============================================================================
-->
- <target name="build-jars" description="Build the
deployments.">
+ <target name="build-jars-jaxws" description="Build the
deployments.">
<mkdir dir="${tests.output.dir}/test-libs"/>
Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-samples-jaxws.xml
(rev 0)
+++
stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-samples-jaxws.xml 2008-04-19
09:39:13 UTC (rev 6537)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-jaxws" description="Build the jaxws
samples deployments">
+
+ <mkdir dir="${tests.output.dir}/test-libs"/>
+
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
+
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ <zipfileset
+
dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on:
stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/build-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-19 08:42:08 UTC
(rev 6536)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-19 09:39:13 UTC
(rev 6537)
@@ -44,14 +44,14 @@
<configuration>
<tasks>
<property name="tests.output.dir"
value="${project.build.directory}"/>
- <ant antfile="ant/build-jars-jaxws.xml"
target="build-jars"/>
+ <ant antfile="ant/build-jars-jaxws.xml"
target="build-jars-jaxws"/>
+ <ant antfile="ant/build-samples-jaxws.xml"
target="build-samples-jaxws"/>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args}</argLine>
@@ -88,15 +88,20 @@
</build>
<profiles>
+ <!--
+ mvn -Denv=jboss422 test
+ -->
<profile>
<id>jboss422-profile</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>env</name>
+ <value>jboss422</value>
+ </property>
</activation>
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
- <!-- versions defined in build/build-thirdparty.xml -->
<jboss.remoting.version>2.2.2.SP1</jboss.remoting.version>
<jboss.serialization.version>1.0.3.GA</jboss.serialization.version>
</properties>
@@ -106,39 +111,7 @@
<artifactId>jbossall-client</artifactId>
<version>${jboss.version}</version>
</dependency>
- <!--
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <version>${jboss.serialization.version}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>${jboss.remoting.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnp-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jboss-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jmx-invoker-adaptor-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- -->
- <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-cxf-client</artifactId>
<version>${version}</version>
@@ -166,6 +139,20 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<!--