JBossWS SVN: r11247 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 22:16:35 -0500 (Wed, 09 Dec 2009)
New Revision: 11247
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
remove scope provided for FastInfoset due to it being needed by the tests
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-10 01:50:49 UTC (rev 11246)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-10 03:16:35 UTC (rev 11247)
@@ -146,7 +146,6 @@
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${fastinfoset.api.version}</version>
- <scope>provided</scope>
</dependency>
<!-- we just want javax.annotation 1.0 but it is in the ejb3 API JAR -->
<dependency>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11246 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 20:50:49 -0500 (Wed, 09 Dec 2009)
New Revision: 11246
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
FastInfoset is needed by cxf-rt-bindings-coloc so add our own version where applicable
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2009-12-09 23:23:24 UTC (rev 11245)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2009-12-10 01:50:49 UTC (rev 11246)
@@ -157,6 +157,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-12-09 23:23:24 UTC (rev 11245)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-12-10 01:50:49 UTC (rev 11246)
@@ -148,6 +148,10 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </dependency>
<!-- transitve dependencies -->
<dependency>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 23:23:24 UTC (rev 11245)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-10 01:50:49 UTC (rev 11246)
@@ -142,6 +142,12 @@
<artifactId>jsr181-api</artifactId>
<version>1.0-MR1</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <version>${fastinfoset.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- we just want javax.annotation 1.0 but it is in the ejb3 API JAR -->
<dependency>
<groupId>org.jboss.javaee</groupId>
@@ -403,14 +409,7 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Not needed if we use the original in the EAP
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
- <version>${fastinfoset.api.version}</version>
- </dependency>
- -->
- <dependency>
<groupId>apache-velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11245 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 18:23:24 -0500 (Wed, 09 Dec 2009)
New Revision: 11245
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Do not refer to fastInfoset POM, exclude geronimo-stax-api in another place
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 23:17:03 UTC (rev 11244)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 23:23:24 UTC (rev 11245)
@@ -356,6 +356,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -399,11 +403,13 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Not needed if we use the original in the EAP
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${fastinfoset.api.version}</version>
</dependency>
+ -->
<dependency>
<groupId>apache-velocity</groupId>
<artifactId>velocity</artifactId>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11244 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 18:17:03 -0500 (Wed, 09 Dec 2009)
New Revision: 11244
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
remove duplicate ejb reference, add exclusions, add maven2-brew as pluginrepositiry as well
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 22:34:56 UTC (rev 11243)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 23:17:03 UTC (rev 11244)
@@ -132,12 +132,6 @@
<!-- provided apis -->
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <version>3.0.0.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
<version>5.0.1.GA</version>
<scope>provided</scope>
@@ -148,6 +142,23 @@
<artifactId>jsr181-api</artifactId>
<version>1.0-MR1</version>
</dependency>
+ <!-- we just want javax.annotation 1.0 but it is in the ejb3 API JAR -->
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>3.0.0.GA</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
@@ -208,6 +219,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -219,6 +234,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
<!-- Specify the Spring bits we need at the version we need later -->
<exclusion>
<groupId>org.springframework</groupId>
@@ -513,22 +532,6 @@
<artifactId>jboss-jms-api</artifactId>
<version>1.1.0.GA</version>
</dependency>
- <!-- we just want javax.annotation 1.0 but it is in the ejb3 API JAR -->
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>3.0.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -632,6 +635,16 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
+ <id>prod-repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2-brew</url>
+ </pluginRepository>
+ <pluginRepository>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
<id>repository.jboss.org</id>
<url>http://repository.jboss.org/maven2</url>
</pluginRepository>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11243 - in stack/cxf/trunk: modules/management and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 17:34:56 -0500 (Wed, 09 Dec 2009)
New Revision: 11243
Added:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Removed:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/Install.txt
stack/cxf/trunk/src/main/distro/ant.properties.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build-setup.xml
stack/cxf/trunk/src/main/distro/build.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2848] fixing CXF
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/build.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -63,27 +63,27 @@
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
- <condition property="jboss520.home" value="${profiles.profile.properties.jboss520.home}">
- <isset property="profiles.profile.properties.jboss520.home"/>
- </condition>
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
+ <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
+ <isset property="profiles.profile.properties.jboss601.home"/>
+ </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
- <property name="jboss520.home" value="${profiles.profile.properties.jboss520.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
+ <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
<echo/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
- <echo message="jboss520.home=${jboss520.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
+ <echo message="jboss601.home=${jboss601.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -49,7 +49,7 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
+ <artifactId>jbossws-jboss600</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -242,19 +242,19 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
</artifactItem>
-->
<!-- END -->
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -33,12 +33,12 @@
<copy
file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -489,14 +489,14 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jboss.version>5.2.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
+ <jboss.version>6.0.0.M1</jboss.version>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -521,13 +521,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -540,14 +540,14 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -572,13 +572,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 22:34:56 UTC (rev 11243)
@@ -1,49 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
-# [CXF-1510] Cannot handle anonymous bare requests
-org/jboss/test/ws/jaxws/anonymous/**
-
-# [CXF-1516] Type inheritance with document/literal/bare
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [CXF-2185] Handler protocol match fails when multiple protocols are specified
-org/jboss/test/ws/jaxws/handlerscope/**
-
-# [CXF-2190] Invalid message sent using Dispatch
-org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2596] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-org/jboss/test/ws/jaxws/jbws2634/**
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2571] Mode.INOUT parameter not generated
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt (rev 0)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2009-12-09 22:34:56 UTC (rev 11243)
@@ -0,0 +1,43 @@
+# UsernameTestCase requires trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
+
+# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
+org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
+org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
+
+# [CXF-1510] Cannot handle anonymous bare requests
+org/jboss/test/ws/jaxws/anonymous/**
+
+# [CXF-1516] Type inheritance with document/literal/bare
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [CXF-1517] HTTP bindings for Provider
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [CXF-1519] Explicitly set the namespace of a WebFault
+org/jboss/test/ws/jaxws/jbws1904/**
+
+# [CXF-1521] Exception handling with @WebFault annotation
+org/jboss/test/ws/jaxws/webfault/**
+
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2596] Resource injection in jaxws endpoints and handlers
+org/jboss/test/ws/jaxws/jbws2074/**
+org/jboss/test/ws/jaxws/jbws2634/**
+
+# [JBWS-2561] XOP request not properly inlined
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
+# [JBWS-2571] Mode.INOUT parameter not generated
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2480] Soap attachments are dropped on server response
+org/jboss/test/ws/jaxws/jbws1283/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
Property changes on: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/pom.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -52,8 +52,8 @@
<!-- JBWS-2505 -->
<!-- START -->
<!--
- <jbossws.jboss520.version>3.2.1.GA</jbossws.jboss520.version>
<jbossws.jboss600.version>3.2.1.GA</jbossws.jboss600.version>
+ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
<cxf.version>2.2.5</cxf.version>
@@ -149,25 +149,25 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -610,26 +610,26 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
- <jboss.home>${jboss520.home}</jboss.home>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.home>${jboss601.home}</jboss.home>
</properties>
</profile>
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/profiles.xml.example 2009-12-09 22:34:56 UTC (rev 11243)
@@ -2,7 +2,7 @@
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 -->
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
<profile>
<id>jboss-home-profile</id>
<activation>
@@ -14,8 +14,8 @@
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
- <jboss520.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta</jboss520.home>
- <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/JBoss_6_0_0_M1/build/output/jboss-6.0.0.M1</jboss600.home>
+ <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
Modified: stack/cxf/trunk/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/src/main/distro/Install.txt 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/src/main/distro/Install.txt 2009-12-09 22:34:56 UTC (rev 11243)
@@ -16,8 +16,8 @@
ant deploy-jboss500
ant deploy-jboss501
ant deploy-jboss510
- ant deploy-jboss520
ant deploy-jboss600
+ ant deploy-jboss601
4.) Execute the samples to verify your installation
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-12-09 22:34:56 UTC (rev 11243)
@@ -6,10 +6,10 @@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
-jboss520.home=(a)jboss520.home@
jboss600.home=(a)jboss600.home@
+jboss601.home=(a)jboss601.home@
-# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss520|jboss600]
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600|jboss601]
jbossws.integration.target=jboss510
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -110,10 +110,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.2.x -->
+ <!-- Prepare Deployment Structure JBoss-6.0.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss52" depends="prepare-deploy">
+ <target name="deploy-structure-jboss600" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -126,32 +126,32 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss520 -->
+ <!-- Deployment JBoss600 -->
<!-- ================================================================== -->
- <target name="target-jboss520">
- <property name="jbossws.integration.target" value="jboss520"/>
+ <target name="target-jboss600">
+ <property name="jbossws.integration.target" value="jboss600"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss520" depends="undeploy-jboss520,deploy-structure-jboss52" description="Deploy jbossws to jboss520">
- <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <copy todir="${jboss520.home}" overwrite="true">
+ <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600">
+ <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
+ <copy todir="${jboss600.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss520.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520">
- <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <macro-undeploy-jbossws targetdir="${jboss520.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
+ <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.x -->
+ <!-- Prepare Deployment Structure JBoss-6.0.1 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss60" depends="prepare-deploy">
+ <target name="deploy-structure-jboss601" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -164,25 +164,25 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
+ <!-- Deployment JBoss601 -->
<!-- ================================================================== -->
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
+ <target name="target-jboss601">
+ <property name="jbossws.integration.target" value="jboss601"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true">
+ <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601">
+ <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
+ <copy todir="${jboss601.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
+ <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss601.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -42,13 +42,6 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
- <property name="jboss520.lib" value="${jboss520.home}/lib"/>
- <property name="jboss520.client" value="${jboss520.home}/client"/>
- <property name="jboss520.server" value="${jboss520.home}/server/${jboss.server.instance}"/>
- <property name="jboss520.server.lib" value="${jboss520.home}/common/lib"/>
- <property name="jboss520.server.deploy" value="${jboss520.server}/deploy"/>
- <property name="jboss520.server.deployers" value="${jboss520.server}/deployers"/>
-
<property name="jboss600.lib" value="${jboss600.home}/lib"/>
<property name="jboss600.client" value="${jboss600.home}/client"/>
<property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
@@ -56,17 +49,24 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
+ <property name="jboss601.lib" value="${jboss601.home}/lib"/>
+ <property name="jboss601.client" value="${jboss601.home}/client"/>
+ <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
+ <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
+ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
+ <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
- <property name="jboss520.available.file" value="${jboss520.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
+ <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
- <available property="jboss520.available" file="${jboss520.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
+ <available property="jboss601.available" file="${jboss601.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/src/main/distro/build.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -56,14 +56,10 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
- <condition property="jbossws.integration.jboss52" value="true">
+ <condition property="jbossws.integration.jboss60" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss520"/>
- </or>
- </condition>
- <condition property="jbossws.integration.jboss60" value="true">
- <or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</or>
</condition>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 22:14:31 UTC (rev 11242)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 22:34:56 UTC (rev 11243)
@@ -128,17 +128,17 @@
<!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss520x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11242 - in stack/native/trunk: modules/core and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 17:14:31 -0500 (Wed, 09 Dec 2009)
New Revision: 11242
Added:
stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
Removed:
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
stack/native/trunk/src/main/distro/Install.txt
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/distro/build-setup.xml
stack/native/trunk/src/main/distro/build.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2848] fixing Native
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/build.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -59,27 +59,27 @@
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
- <condition property="jboss520.home" value="${profiles.profile.properties.jboss520.home}">
- <isset property="profiles.profile.properties.jboss520.home"/>
- </condition>
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
+ <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
+ <isset property="profiles.profile.properties.jboss601.home"/>
+ </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
- <property name="jboss520.home" value="${profiles.profile.properties.jboss520.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
+ <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
<echo/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
- <echo message="jboss520.home=${jboss520.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
+ <echo message="jboss601.home=${jboss601.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/modules/core/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -232,19 +232,19 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
</artifactItem>
-->
<!-- END -->
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -33,12 +33,12 @@
<copy
file="${src.dir}/jbossws-native-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
file="${src.dir}/jbossws-native-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/modules/management/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -49,7 +49,7 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
+ <artifactId>jbossws-jboss600</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -492,14 +492,14 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jboss.version>5.2.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
+ <jboss.version>6.0.0.M1</jboss.version>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -524,13 +524,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -543,14 +543,14 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -575,13 +575,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 22:14:31 UTC (rev 11242)
@@ -1,12 +0,0 @@
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2217] Fix BPEL jaxrpc samples
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
-org/jboss/test/ws/jaxws/jbws2718/**
-
Added: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt (rev 0)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2009-12-09 22:14:31 UTC (rev 11242)
@@ -0,0 +1,12 @@
+# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2217] Fix BPEL jaxrpc samples
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+
+# [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+org/jboss/test/ws/jaxws/jbws2718/**
+
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/pom.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -56,8 +56,8 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!--
- <jbossws.jboss520.version>3.2.1.GA</jbossws.jboss520.version>
<jbossws.jboss600.version>3.2.1.GA</jbossws.jboss600.version>
+ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -150,25 +150,25 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -538,26 +538,26 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
- <jboss.home>${jboss520.home}</jboss.home>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.home>${jboss601.home}</jboss.home>
</properties>
</profile>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/profiles.xml.example 2009-12-09 22:14:31 UTC (rev 11242)
@@ -2,7 +2,7 @@
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 -->
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
<profile>
<id>jboss-home-profile</id>
<activation>
@@ -11,12 +11,11 @@
</property>
</activation>
<properties>
- <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
- <jboss520.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta</jboss520.home>
- <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/JBoss_6_0_0_M1/build/output/jboss-6.0.0.M1</jboss600.home>
+ <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/src/main/distro/Install.txt 2009-12-09 22:14:31 UTC (rev 11242)
@@ -16,8 +16,8 @@
ant deploy-jboss500
ant deploy-jboss501
ant deploy-jboss510
- ant deploy-jboss520
ant deploy-jboss600
+ ant deploy-jboss601
4.) Execute the samples to verify your installation
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2009-12-09 22:14:31 UTC (rev 11242)
@@ -6,10 +6,10 @@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
-jboss520.home=(a)jboss520.home@
jboss600.home=(a)jboss600.home@
+jboss601.home=(a)jboss601.home@
-# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss520|jboss600]
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600jboss601|]
jbossws.integration.target=jboss510
# The JBoss settings
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -110,10 +110,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.2.x -->
+ <!-- Prepare Deployment Structure JBoss-6.0.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss52" depends="prepare-deploy">
+ <target name="deploy-structure-jboss600" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -126,32 +126,32 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss520 -->
+ <!-- Deployment JBoss600 -->
<!-- ================================================================== -->
- <target name="target-jboss520">
- <property name="jbossws.integration.target" value="jboss520"/>
+ <target name="target-jboss600">
+ <property name="jbossws.integration.target" value="jboss600"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss520" depends="undeploy-jboss520,deploy-structure-jboss52" description="Deploy jbossws to jboss520">
- <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <copy todir="${jboss520.home}" overwrite="true">
+ <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600">
+ <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
+ <copy todir="${jboss600.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss520.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520">
- <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <macro-undeploy-jbossws targetdir="${jboss520.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
+ <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-6.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss60" depends="prepare-deploy">
+ <target name="deploy-structure-jboss601" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -164,25 +164,25 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
+ <!-- Deployment JBoss601 -->
<!-- ================================================================== -->
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
+ <target name="target-jboss601">
+ <property name="jbossws.integration.target" value="jboss601"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true">
+ <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601">
+ <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
+ <copy todir="${jboss601.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
+ <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss601.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -42,13 +42,6 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
- <property name="jboss520.lib" value="${jboss520.home}/lib"/>
- <property name="jboss520.client" value="${jboss520.home}/client"/>
- <property name="jboss520.server" value="${jboss520.home}/server/${jboss.server.instance}"/>
- <property name="jboss520.server.lib" value="${jboss520.home}/common/lib"/>
- <property name="jboss520.server.deploy" value="${jboss520.server}/deploy"/>
- <property name="jboss520.server.deployers" value="${jboss520.server}/deployers"/>
-
<property name="jboss600.lib" value="${jboss600.home}/lib"/>
<property name="jboss600.client" value="${jboss600.home}/client"/>
<property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
@@ -56,17 +49,24 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
+ <property name="jboss601.lib" value="${jboss601.home}/lib"/>
+ <property name="jboss601.client" value="${jboss601.home}/client"/>
+ <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
+ <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
+ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
+ <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
- <property name="jboss520.available.file" value="${jboss520.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
+ <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
- <available property="jboss520.available" file="${jboss520.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
+ <available property="jboss601.available" file="${jboss601.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/src/main/distro/build.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -56,14 +56,10 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
- <condition property="jbossws.integration.jboss52" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss520"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</or>
</condition>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 21:22:04 UTC (rev 11241)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 22:14:31 UTC (rev 11242)
@@ -116,17 +116,17 @@
<!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss520x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11241 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 16:22:04 -0500 (Wed, 09 Dec 2009)
New Revision: 11241
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Align the versions of the Spring bits we ship with the ones shipped with the WFK product
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 21:20:28 UTC (rev 11240)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 21:22:04 UTC (rev 11241)
@@ -55,6 +55,7 @@
<cxf.version>2.2.2</cxf.version>
<cxf.stax.version>1.0</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
+ <cxf.spring.version>2.5.6.SEC01</cxf.spring.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jaxb.api.version>2.1.9.patch01</jaxb.api.version>
@@ -218,6 +219,15 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</exclusion>
+ <!-- Specify the Spring bits we need at the version we need later -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -244,6 +254,11 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
+ <!-- Specify the Spring bits we need at the version we need later -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -400,6 +415,21 @@
<artifactId>asm</artifactId>
<version>${cxf.asm.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${cxf.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${cxf.spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${cxf.spring.version}</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11240 - in framework/trunk/hudson: hudson-home and 22 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 16:20:28 -0500 (Wed, 09 Dec 2009)
New Revision: 11240
Added:
framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/
framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml
framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml
Removed:
framework/trunk/hudson/hudson-home/jobs/AS-5.2.0/
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-5.2.0/
framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-5.2.0-SUN-JDK-6/
framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-5.2.0-SUN-JDK-6/
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml
framework/trunk/hudson/hudson-home/jobs/METRO-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/METRO-LIGHT/config.xml
framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml
Log:
[JBWS-2848] fixing hudson
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/ant.properties.example 2009-12-09 21:20:28 UTC (rev 11240)
@@ -37,14 +37,14 @@
hudson.jboss510.build=jboss-5.1.0.GA
hudson.jboss510.rev=HEAD
-hudson.jboss520.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_6_0_0_M1
-hudson.jboss520.build=jboss-6.0.0.M1
-hudson.jboss520.rev=HEAD
-
-hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/trunk
-hudson.jboss600.build=jboss-6.0.0-SNAPSHOT
+hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_6_0_0_M1
+hudson.jboss600.build=jboss-6.0.0.M1
hudson.jboss600.rev=HEAD
+hudson.jboss601.url=http://anonsvn.jboss.org/repos/jbossas/trunk
+hudson.jboss601.build=jboss-6.0.0-SNAPSHOT
+hudson.jboss601.rev=HEAD
+
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -16,8 +16,8 @@
<tr><th align=left>@hudson.jboss500.build@</th><td>-r(a)hudson.jboss500.rev@ @hudson.jboss500.url@</td></tr>
<tr><th align=left>@hudson.jboss501.build@</th><td>-r(a)hudson.jboss501.rev@ @hudson.jboss501.url@</td></tr>
<tr><th align=left>@hudson.jboss510.build@</th><td>-r(a)hudson.jboss510.rev@ @hudson.jboss510.url@</td></tr>
- <tr><th align=left>@hudson.jboss520.build@</th><td>-r(a)hudson.jboss520.rev@ @hudson.jboss520.url@</td></tr>
<tr><th align=left>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
+ <tr><th align=left>@hudson.jboss601.build@</th><td>-r(a)hudson.jboss601.rev@ @hudson.jboss601.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -36,8 +36,8 @@
<string>AS-5.0.0</string>
<string>AS-5.0.1</string>
<string>AS-5.1.0</string>
- <string>AS-5.2.0</string>
<string>AS-6.0.0</string>
+ <string>AS-6.0.1</string>
</jobNames>
<name>AS Builds</name>
<description>
@@ -56,8 +56,8 @@
<string>AS-TESTS-AS-5.0.0</string>
<string>AS-TESTS-AS-5.0.1</string>
<string>AS-TESTS-AS-5.1.0</string>
- <string>AS-TESTS-AS-5.2.0</string>
<string>AS-TESTS-AS-6.0.0</string>
+ <string>AS-TESTS-AS-6.0.1</string>
</jobNames>
<name>AS Tests</name>
<description>
@@ -79,18 +79,18 @@
<string>NATIVE-CORE-AS-5.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-5.1.0-SUN-JDK-6</string>
- <string>NATIVE-CORE-AS-5.2.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-6.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-5.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>NATIVE-BINDIST-AS-5.2.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-5.0.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-5.0.1-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>NATIVE-SRCDIST-AS-5.2.0-SUN-JDK-6</string>
<string>NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6</string>
</jobNames>
<name>Native Tests</name>
<description>
@@ -112,18 +112,18 @@
<string>METRO-CORE-AS-5.0.0-SUN-JDK-6</string>
<string>METRO-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>METRO-CORE-AS-5.1.0-SUN-JDK-6</string>
- <string>METRO-CORE-AS-5.2.0-SUN-JDK-6</string>
<string>METRO-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>METRO-CORE-AS-6.0.1-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-5.0.0-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>METRO-BINDIST-AS-5.2.0-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>METRO-BINDIST-AS-6.0.1-SUN-JDK-6</string>
<string>METRO-SRCDIST-AS-5.0.0-SUN-JDK-6</string>
<string>METRO-SRCDIST-AS-5.0.1-SUN-JDK-6</string>
<string>METRO-SRCDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>METRO-SRCDIST-AS-5.2.0-SUN-JDK-6</string>
<string>METRO-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>METRO-SRCDIST-AS-6.0.1-SUN-JDK-6</string>
</jobNames>
<name>Metro Tests</name>
<description>
@@ -145,18 +145,18 @@
<string>CXF-CORE-AS-5.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-5.1.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-5.2.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-5.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.0.1-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-5.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-5.2.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-6.0.1-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -177,35 +177,35 @@
<string>METRO-CORE-AS-5.0.0-SUN-JDK-6</string>
<string>METRO-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>METRO-CORE-AS-5.1.0-SUN-JDK-6</string>
- <string>METRO-CORE-AS-5.2.0-SUN-JDK-6</string>
<string>METRO-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>METRO-CORE-AS-6.0.1-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-5.0.0-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>METRO-BINDIST-AS-5.2.0-SUN-JDK-6</string>
<string>METRO-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>METRO-BINDIST-AS-6.0.1-SUN-JDK-6</string>
<string>CXF-LIGHT</string>
<string>CXF-CORE-AS-5.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-CORE-AS-5.1.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-5.2.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-5.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.0.1-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-5.0.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-5.1.0-SUN-JDK-6</string>
- <string>NATIVE-CORE-AS-5.2.0-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-CORE-AS-6.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-5.0.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6</string>
- <string>NATIVE-BINDIST-AS-5.2.0-SUN-JDK-6</string>
<string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
+ <string>NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -21,8 +21,7 @@
# build jboss
#
cd $SVNBASE
-./build.sh clean
-./build.sh -Dskip-download-sources
+./build/build.sh -Dthirdparty.maven.opts=-Dskip-download-sources clean main
#
# Verify build
Added: framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-6.0.1
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss601.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss601.rev@ @hudson.jboss601.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+./build.sh clean
+./build.sh -Dskip-download-sources
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/(a)hudson.jboss601.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss601.build@"
+ exit 1
+fi
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jboss601.url@</remote>
+ <local>JBossAS-6.0.1</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossAS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build AS-6.0.1</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-5.2.0, AS-6.0.0</childProjects>
+ <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-6.0.1</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-TESTS-AS-5.0.0, AS-TESTS-AS-5.0.1, AS-TESTS-AS-5.1.0, AS-TESTS-AS-5.2.0, AS-TESTS-AS-6.0.0</childProjects>
+ <childProjects>AS-TESTS-AS-5.0.0, AS-TESTS-AS-5.0.1, AS-TESTS-AS-5.1.0, AS-TESTS-AS-6.0.0, AS-TESTS-AS-6.0.1</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -55,7 +55,7 @@
#
# execute tests
#
-./build.sh -Dnode0=$JBOSS_BIND_ADDRESS init tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.log
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
Added: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-TESTS-AS-6.0.1
+
+WORKSPACE=`pwd`
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss601.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACK_DIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss601
+
+# remove obsolete logs
+rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log
+rm -f $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+
+#
+# start jbossas
+#
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BIND_ADDRESS
+
+# Was it successfully started?
+$FRAMEWORK_DIR/hudson/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BIND_ADDRESS
+ exit 1
+fi
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main
+
+#
+# execute tests
+#
+./build.sh -Dnode0=$JBOSS_BIND_ADDRESS init tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# copy the test reports
+#
+rm -rf $WORKSPACE/test-reports
+mkdir $WORKSPACE/test-reports
+cp -r ./output/reports/*.xml $WORKSPACE/test-reports
+
+#
+# stop jbossas
+#
+$FRAMEWORK_DIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run the AS-6.0.1 webservice testsuite agains jbossws-(a)version.id@</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -7,20 +7,20 @@
CXF-CORE-AS-5.0.0-SUN-JDK-6
, CXF-CORE-AS-5.0.1-SUN-JDK-6
, CXF-CORE-AS-5.1.0-SUN-JDK-6
-, CXF-CORE-AS-5.2.0-SUN-JDK-6
, CXF-CORE-AS-6.0.0-SUN-JDK-6
+, CXF-CORE-AS-6.0.1-SUN-JDK-6
, CXF-BINDIST-AS-5.0.0-SUN-JDK-6
, CXF-BINDIST-AS-5.0.1-SUN-JDK-6
, CXF-BINDIST-AS-5.1.0-SUN-JDK-6
-, CXF-BINDIST-AS-5.2.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
+, CXF-BINDIST-AS-6.0.1-SUN-JDK-6
, CXF-SRCDIST-AS-5.0.0-SUN-JDK-6
, CXF-SRCDIST-AS-5.0.1-SUN-JDK-6
, CXF-SRCDIST-AS-5.1.0-SUN-JDK-6
-, CXF-SRCDIST-AS-5.2.0-SUN-JDK-6
, CXF-SRCDIST-AS-6.0.0-SUN-JDK-6
+, CXF-SRCDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -7,14 +7,14 @@
CXF-CORE-AS-5.0.0-SUN-JDK-6
, CXF-CORE-AS-5.0.1-SUN-JDK-6
, CXF-CORE-AS-5.1.0-SUN-JDK-6
-, CXF-CORE-AS-5.2.0-SUN-JDK-6
, CXF-CORE-AS-6.0.0-SUN-JDK-6
+, CXF-CORE-AS-6.0.1-SUN-JDK-6
, CXF-BINDIST-AS-5.0.0-SUN-JDK-6
, CXF-BINDIST-AS-5.0.1-SUN-JDK-6
, CXF-BINDIST-AS-5.1.0-SUN-JDK-6
-, CXF-BINDIST-AS-5.2.0-SUN-JDK-6
, CXF-BINDIST-AS-6.0.0-SUN-JDK-6
+, CXF-BINDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/METRO-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/METRO-ALL/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/METRO-ALL/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -7,20 +7,20 @@
METRO-CORE-AS-5.0.0-SUN-JDK-6
, METRO-CORE-AS-5.0.1-SUN-JDK-6
, METRO-CORE-AS-5.1.0-SUN-JDK-6
-, METRO-CORE-AS-5.2.0-SUN-JDK-6
, METRO-CORE-AS-6.0.0-SUN-JDK-6
+, METRO-CORE-AS-6.0.1-SUN-JDK-6
, METRO-BINDIST-AS-5.0.0-SUN-JDK-6
, METRO-BINDIST-AS-5.0.1-SUN-JDK-6
, METRO-BINDIST-AS-5.1.0-SUN-JDK-6
-, METRO-BINDIST-AS-5.2.0-SUN-JDK-6
, METRO-BINDIST-AS-6.0.0-SUN-JDK-6
+, METRO-BINDIST-AS-6.0.1-SUN-JDK-6
, METRO-SRCDIST-AS-5.0.0-SUN-JDK-6
, METRO-SRCDIST-AS-5.0.1-SUN-JDK-6
, METRO-SRCDIST-AS-5.1.0-SUN-JDK-6
-, METRO-SRCDIST-AS-5.2.0-SUN-JDK-6
, METRO-SRCDIST-AS-6.0.0-SUN-JDK-6
+, METRO-SRCDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/METRO-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=METRO-BINDIST-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/target/jbossws-metro-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ binary distribution against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/METRO-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=METRO-CORE-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/METRO-LIGHT/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/METRO-LIGHT/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/METRO-LIGHT/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -7,14 +7,14 @@
METRO-CORE-AS-5.0.0-SUN-JDK-6
, METRO-CORE-AS-5.0.1-SUN-JDK-6
, METRO-CORE-AS-5.1.0-SUN-JDK-6
-, METRO-CORE-AS-5.2.0-SUN-JDK-6
, METRO-CORE-AS-6.0.0-SUN-JDK-6
+, METRO-CORE-AS-6.0.1-SUN-JDK-6
, METRO-BINDIST-AS-5.0.0-SUN-JDK-6
, METRO-BINDIST-AS-5.0.1-SUN-JDK-6
, METRO-BINDIST-AS-5.1.0-SUN-JDK-6
-, METRO-BINDIST-AS-5.2.0-SUN-JDK-6
, METRO-BINDIST-AS-6.0.0-SUN-JDK-6
+, METRO-BINDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/METRO-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=METRO-SRCDIST-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=metro
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-metro
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-metro/target/jbossws-metro-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.metro.url@</remote>
+ <local>stack-metro</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ source distribution against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -7,20 +7,20 @@
NATIVE-CORE-AS-5.0.0-SUN-JDK-6
, NATIVE-CORE-AS-5.0.1-SUN-JDK-6
, NATIVE-CORE-AS-5.1.0-SUN-JDK-6
-, NATIVE-CORE-AS-5.2.0-SUN-JDK-6
, NATIVE-CORE-AS-6.0.0-SUN-JDK-6
+, NATIVE-CORE-AS-6.0.1-SUN-JDK-6
, NATIVE-BINDIST-AS-5.0.0-SUN-JDK-6
, NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6
, NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6
-, NATIVE-BINDIST-AS-5.2.0-SUN-JDK-6
, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
+, NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6
, NATIVE-SRCDIST-AS-5.0.0-SUN-JDK-6
, NATIVE-SRCDIST-AS-5.0.1-SUN-JDK-6
, NATIVE-SRCDIST-AS-5.1.0-SUN-JDK-6
-, NATIVE-SRCDIST-AS-5.2.0-SUN-JDK-6
, NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6
+, NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-CORE-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS="-Dinterop=true"
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml 2009-12-09 20:56:08 UTC (rev 11239)
+++ framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -7,14 +7,14 @@
NATIVE-CORE-AS-5.0.0-SUN-JDK-6
, NATIVE-CORE-AS-5.0.1-SUN-JDK-6
, NATIVE-CORE-AS-5.1.0-SUN-JDK-6
-, NATIVE-CORE-AS-5.2.0-SUN-JDK-6
, NATIVE-CORE-AS-6.0.0-SUN-JDK-6
+, NATIVE-CORE-AS-6.0.1-SUN-JDK-6
, NATIVE-BINDIST-AS-5.0.0-SUN-JDK-6
, NATIVE-BINDIST-AS-5.0.1-SUN-JDK-6
, NATIVE-BINDIST-AS-5.1.0-SUN-JDK-6
-, NATIVE-BINDIST-AS-5.2.0-SUN-JDK-6
, NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
+, NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2009-12-09 21:20:28 UTC (rev 11240)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+FRAMEWORK_DIR=$WORKSPACE/framework
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss601
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/output/(a)hudson.jboss601.build@
+
+#
+# load test functions
+#
+. $FRAMEWORK_DIR/hudson/jboss/bin/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-6.0.1 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11239 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 15:56:08 -0500 (Wed, 09 Dec 2009)
New Revision: 11239
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Align log4j groupId, use another stax-api source and exclude some unwanted indirect dependencies
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml 2009-12-09 20:56:08 UTC (rev 11239)
@@ -119,8 +119,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
@@ -154,7 +154,7 @@
<artifactId>jboss-ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml 2009-12-09 20:56:08 UTC (rev 11239)
@@ -123,8 +123,8 @@
<artifactId>jaxrpc-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 20:56:08 UTC (rev 11239)
@@ -53,7 +53,7 @@
-->
<!-- END -->
<cxf.version>2.2.2</cxf.version>
- <cxf.stax.version>1.0.1</cxf.stax.version>
+ <cxf.stax.version>1.0</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
@@ -87,6 +87,10 @@
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -382,8 +386,8 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
<version>${cxf.stax.version}</version>
</dependency>
<dependency>
@@ -407,7 +411,7 @@
<!-- transitve dependencies -->
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
@@ -484,6 +488,16 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb3-api</artifactId>
<version>3.0.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 20:56:08 UTC (rev 11239)
@@ -62,7 +62,7 @@
<outputFileNameMapping>stax-api.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ <include>stax:stax-api</include>
</includes>
</dependencySet>
<dependencySet>
14 years, 5 months
- 1
- 0
JBossWS SVN: r11238 - in framework/trunk/testsuite/test: resources/jaxws/smoke/tools/wsrunclient and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 15:46:03 -0500 (Wed, 09 Dec 2009)
New Revision: 11238
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
Log:
[JBWS-2848] fixing framework
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-12-09 20:41:08 UTC (rev 11237)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-12-09 20:46:03 UTC (rev 11238)
@@ -24,12 +24,12 @@
<condition property="jboss.home" value="${jboss510.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</condition>
- <condition property="jboss.home" value="${jboss520.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss520"/>
- </condition>
<condition property="jboss.home" value="${jboss600.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
</condition>
+ <condition property="jboss.home" value="${jboss601.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+ </condition>
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -111,7 +111,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss52,tests-classpath-jboss51,tests-classpath-jboss50">
+ <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -278,84 +278,6 @@
</path>
</target>
- <target name="tests-classpath-jboss52" depends="tests-prepare" if="jbossws.integration.jboss52">
-
- <path id="integration.target.javac.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossxb.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossxb.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/trove.jar"/>
- <pathelement location="${jboss.client}/jboss-javaee.jar"/>
- <!-- FIXME jars should be available in the client dir -->
- <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-container.jar"/>
- <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
- <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
-
<target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60">
<path id="integration.target.javac.classpath">
Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-12-09 20:41:08 UTC (rev 11237)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-12-09 20:46:03 UTC (rev 11238)
@@ -2,6 +2,7 @@
jbossws-jboss500.jar
jbossws-jboss501.jar
jbossws-jboss510.jar
-jbossws-jboss520.jar
jbossws-jboss60.jar
jbossws-jboss600.jar
+jbossws-jboss601.jar
+jbossws-jboss610.jar
\ No newline at end of file
14 years, 5 months
- 1
- 0