[jbossws-commits] JBossWS SVN: r6645 - in stack/cxf/trunk: modules/client and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Apr 24 02:24:26 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-24 02:24:26 -0400 (Thu, 24 Apr 2008)
New Revision: 6645
Added:
stack/cxf/trunk/profiles.xml.example
Removed:
stack/cxf/trunk/profiles-example.xml
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch to profiles
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/build.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -22,30 +22,30 @@
<!-- Setup -->
<!-- ================================================================== -->
- <property name="cxf.dir" value="${basedir}"/>
- <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/>
- <property name="cxf.output.dir" value="${cxf.dir}/target"/>
- <property name="cxf.modules.dir" value="${cxf.dir}/modules"/>
- <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/>
- <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/>
- <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/>
+ <property name="stack.dir" value="${basedir}"/>
+ <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/>
+ <property name="stack.output.dir" value="${stack.dir}/target"/>
+ <property name="stack.modules.dir" value="${stack.dir}/modules"/>
+ <property name="stack.management.dir" value="${stack.modules.dir}/management"/>
+ <property name="stack.client.dir" value="${stack.modules.dir}/client"/>
+ <property name="stack.server.dir" value="${stack.modules.dir}/server"/>
- <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/>
- <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/>
- <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/>
+ <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
+ <property name="deploy.structure.jboss42" value="${stack.output.dir}/deploy-jboss422"/>
+ <property name="deploy.structure.jboss50" value="${stack.output.dir}/deploy-jboss500"/>
- <import file="${cxf.distro.dir}/build-setup.xml"/>
- <import file="${cxf.distro.dir}/build-deploy.xml"/>
- <import file="${cxf.distro.dir}/jbossws-deploy-macros.xml"/>
+ <import file="${stack.distro.dir}/build-setup.xml"/>
+ <import file="${stack.distro.dir}/build-deploy.xml"/>
+ <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.deploy.conf" value="${cxf.distro.dir}/jbossws-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/>
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
<target name="init" depends="prepare">
- <xmlproperty file="${cxf.dir}/pom.xml"/>
+ <xmlproperty file="${stack.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
<echo message="version.id=${version.id}"/>
</target>
@@ -56,13 +56,13 @@
<target name="build-bin-dist" depends="prepare" description="Build the binary distribution">
- <echo message="*************************************"/>
- <echo message="* mvn -P bindist assembly:directory *"/>
- <echo message="*************************************"/>
+ <echo message="**********************************************"/>
+ <echo message="* mvn -P bindist,${jbossws.integration.target} assembly:directory *"/>
+ <echo message="**********************************************"/>
- <delete dir="${cxf.output.dir}/jbossws-cxf-dist"/>
+ <delete dir="${stack.output.dir}/jbossws-cxf-dist"/>
<exec dir="${basedir}" executable="mvn" failonerror="true">
- <arg value="-P bindist"/>
+ <arg value="-P bindist,${jbossws.integration.target}"/>
<arg value="assembly:directory"/>
</exec>
</target>
@@ -73,13 +73,9 @@
<target name="prepare-deploy" depends="prepare">
- <echo message="*************************************************"/>
- <echo message="* mvn -Denv=${jbossws.integration.target} package assembly:directory *"/>
- <echo message="*************************************************"/>
-
<delete dir="${deploy.artifacts.dir}"/>
<exec dir="${basedir}" executable="mvn" failonerror="true">
- <arg value="-Denv=${jbossws.integration.target}"/>
+ <arg value="-P${jbossws.integration.target}"/>
<arg value="package"/>
<arg value="assembly:directory"/>
</exec>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/modules/client/pom.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -79,23 +79,4 @@
</dependency>
</dependencies>
- <!-- Profiles -->
- <profiles>
- <profile>
- <id>jboss422-client-profile</id>
- <activation>
- <property>
- <name>env</name>
- <value>jboss422</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -164,23 +164,4 @@
</plugins>
</build>
- <!-- Profiles -->
- <profiles>
- <profile>
- <id>jboss422-profile</id>
- <activation>
- <property>
- <name>env</name>
- <value>jboss422</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -36,17 +36,11 @@
</plugins>
</build>
+ <!-- Profiles -->
<profiles>
- <!--
- mvn -Denv=jboss422 test
- -->
<profile>
- <id>jboss422-cxf-tests-profile</id>
+ <id>jboss422</id>
<activation>
- <property>
- <name>env</name>
- <value>jboss422</value>
- </property>
</activation>
<build>
<plugins>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -73,18 +73,10 @@
</plugins>
</build>
+ <!-- Profiles -->
<profiles>
- <!--
- mvn -Denv=jboss422 test
- -->
<profile>
- <id>jboss422-cxf-tests-profile</id>
- <activation>
- <property>
- <name>env</name>
- <value>jboss422</value>
- </property>
- </activation>
+ <id>jboss422</id>
<build>
<plugins>
<plugin>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -143,18 +143,10 @@
</plugins>
</build>
+ <!-- Profiles -->
<profiles>
- <!--
- mvn -Denv=jboss422 test
- -->
<profile>
- <id>jboss422-cxf-testsuite-profile</id>
- <activation>
- <property>
- <name>env</name>
- <value>jboss422</value>
- </property>
- </activation>
+ <id>jboss422</id>
<properties>
<jboss.version>4.2.2.GA</jboss.version>
<jbossws.integration.target>jboss422</jbossws.integration.target>
@@ -181,42 +173,6 @@
</plugins>
</build>
</profile>
-
- <!--
- No test environment specified
- -->
- <profile>
- <id>no-env-profile</id>
- <activation>
- <property>
- <name>!env</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo message="************************************"/>
- <echo message="* No test environment specified *"/>
- <echo message="* Run: mvn -Denv=jboss??? test *"/>
- <echo message="************************************"/>
- <fail/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/pom.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -1,3 +1,91 @@
+<?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$ -->
+
+<!--
+ The JBossWS project is organised like this
+
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+
+ Target Container: | AS-5.0 | | AS-4.2 | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
+ WS Framework: | jbossws-spi, jbossws-framework, jbossws-common | | |
+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack Integration: | jbossws-native | | jbossws-metro | | jbossws-cxf | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack: | jbossws-core | | Sun Metro | | Apache CXF | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+
+ JAXWS Testsuite
+
+
+ Typically you would build, deploy, test one of the WS stacks against one of the supported target containers.
+ Here we explain first the manual procedure. Further down you find instruction on how to do this using our
+ automated Hudson QA environment.
+
+ Working with JBossWS-Native
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ To run the general JAXWS samples against our native WS stack on JBoss-5.0 you would run the sequence below.
+ This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly.
+
+ cd stack/native/trunk
+ ant deploy-jboss500
+ ant tests-smoke
+
+ To run the collection of provider sample tests, you would run
+
+ ant -Dtest=jaxws/samples/provider test
+
+ To run a single specific test, you would run
+
+ ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
+
+ This can be done in debug mode as well
+
+ ant -Ddebug=true -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
+
+ Working with the Hudson QA environment
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ The Hudson QA environment helps you to test any supported stack against any supported target container.
+ To setup Hudson on your local box, you would run
+
+ cd framework/trunk
+ ant hudson-setup
+ ant hudson-start
+
+ When you hit http://localhost:8180/hudson you should be able to
+
+ 1. login
+ 2. build a target container
+ 3. run a testsuite against the target container
+
+ Publicly, Hudson is available at http://jbws.dyndns.org:8180/hudson/
+
+ Have fun + good luck
+ The JBossWS Team
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -204,6 +292,10 @@
<classifier>scripts</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ </dependency>
</dependencies>
<!-- Plugins -->
@@ -221,10 +313,9 @@
<configuration>
<tasks>
<echo/>
+ <echo message="profile=${jbossws.integration.target}"/>
<echo message="jboss.home=${jboss.home}"/>
<echo/>
- <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/>
- <fail message="Invalid integration target: ${jboss.home}" unless="jboss.available"/>
</tasks>
</configuration>
</execution>
@@ -259,17 +350,6 @@
<!-- Profiles -->
<profiles>
<!--
- Name: testsuite
- Descr: Executes the testsuite
- -->
- <profile>
- <id>testsuite</id>
- <modules>
- <module>modules/testsuite</module>
- </modules>
- </profile>
-
- <!--
Name: bindist
Descr: Build the binary distribution
-->
@@ -293,22 +373,28 @@
</profile>
<!--
- Name: jboss422-user-profile
+ Name: jboss422
Descr: JBoss-4.2.2 specific options
-->
<profile>
- <id>jboss422-user-profile</id>
- <activation>
- <property>
- <name>env</name>
- <value>jboss422</value>
- </property>
- </activation>
+ <id>jboss422</id>
<properties>
<jbossws.integration.target>jboss422</jbossws.integration.target>
<jboss.home>${jboss422.home}</jboss.home>
</properties>
</profile>
+
+ <!--
+ Name: testsuite
+ Descr: Executes the testsuite
+ -->
+ <profile>
+ <id>testsuite</id>
+ <modules>
+ <module>modules/testsuite</module>
+ </modules>
+ </profile>
+
</profiles>
<!-- Repositories -->
Deleted: stack/cxf/trunk/profiles-example.xml
===================================================================
--- stack/cxf/trunk/profiles-example.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/profiles-example.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -1,23 +0,0 @@
-<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
- <profiles>
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profile>
- <id>jboss-home-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
- <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
- <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home>
- </properties>
- </profile>
-
- </profiles>
-</profilesXml>
\ No newline at end of file
Copied: stack/cxf/trunk/profiles.xml.example (from rev 6644, stack/cxf/trunk/profiles-example.xml)
===================================================================
--- stack/cxf/trunk/profiles.xml.example (rev 0)
+++ stack/cxf/trunk/profiles.xml.example 2008-04-24 06:24:26 UTC (rev 6645)
@@ -0,0 +1,23 @@
+<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
+ <profiles>
+
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
+ <profile>
+ <id>jboss-home-profile</id>
+ <activation>
+ <property>
+ <name>user.name</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
+ <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+ <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home>
+ <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home>
+ </properties>
+ </profile>
+
+ </profiles>
+</profilesXml>
\ No newline at end of file
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 21:34:17 UTC (rev 6644)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-24 06:24:26 UTC (rev 6645)
@@ -7,8 +7,9 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <!-- bin -->
<dependencySets>
+
+ <!-- bin -->
<dependencySet>
<outputDirectory>bin</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
@@ -17,6 +18,16 @@
<include>*:jbossws-framework:zip:scripts</include>
</includes>
</dependencySet>
+
+ <!-- lib -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss42:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
<!-- lib -->
@@ -46,7 +57,6 @@
<include>*:jbossws-common:jar</include>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-spi:jar</include>
- <include>*:jbossws-jboss42:jar</include>
<include>*:neethi:jar</include>
<include>*:saaj-api:jar</include>
<include>*:saaj-impl:jar</include>
More information about the jbossws-commits
mailing list