JBossWS SVN: r9002 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-09 05:35:58 -0500 (Fri, 09 Jan 2009)
New Revision: 9002
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
[JBWS-2444] Adding method to JBossWSTest too
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-01-09 09:56:57 UTC (rev 9001)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-01-09 10:35:58 UTC (rev 9002)
@@ -143,6 +143,11 @@
{
return delegate.isTargetJBoss5();
}
+
+ public boolean isTargetJBoss5OrGreater()
+ {
+ return delegate.isTargetJBoss5OrGreater();
+ }
public boolean isTargetJBoss51()
{
15 years, 5 months
- 1
- 0
JBossWS SVN: r9001 - in stack/native/trunk/modules: testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-09 04:56:57 -0500 (Fri, 09 Jan 2009)
New Revision: 9001
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2444] Updating dependencies + bug fix
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-01-09 08:34:56 UTC (rev 9000)
+++ stack/native/trunk/modules/core/pom.xml 2009-01-09 09:56:57 UTC (rev 9001)
@@ -15,8 +15,8 @@
</parent>
<properties>
- <jboss.jbosssx.version>2.0.2.SP2</jboss.jbosssx.version>
- <jboss.microcontainer.version>2.0.1.GA</jboss.microcontainer.version>
+ <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
+ <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-01-09 08:34:56 UTC (rev 9000)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-01-09 09:56:57 UTC (rev 9001)
@@ -605,7 +605,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
15 years, 5 months
- 1
- 0
JBossWS SVN: r9000 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-09 03:34:56 -0500 (Fri, 09 Jan 2009)
New Revision: 9000
Added:
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2444] Adding excludes file for AS6 (forgot in the previous commits)
Added: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt (rev 0)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-09 08:34:56 UTC (rev 9000)
@@ -0,0 +1,20 @@
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
+org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
+
+# 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-2433] Investigate why MessageDriven EJB3 tests are failing
+org/jboss/test/ws/jaxws/samples/jmstransport/**
+org/jboss/test/ws/jaxws/samples/dar/**
+
+# [JBAS-5257] Cannot deploy through jax-ws endpoint API
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2217] Fix BPEL jaxrpc samples
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Property changes on: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 5 months
- 1
- 0
JBossWS SVN: r8999 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-01-09 02:31:40 -0500 (Fri, 09 Jan 2009)
New Revision: 8999
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
enable tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-08 18:01:29 UTC (rev 8998)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-09 07:31:40 UTC (rev 8999)
@@ -82,14 +82,10 @@
# [JBWS-2114] IllegalArgumentException: Wrong target. class
org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1822/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
-# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
-
# [JBWS-2118] context-root in jboss.xml is ignored
org/jboss/test/ws/jaxws/jbws1813/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-08 18:01:29 UTC (rev 8998)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-09 07:31:40 UTC (rev 8999)
@@ -82,14 +82,10 @@
# [JBWS-2114] IllegalArgumentException: Wrong target. class
org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1822/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
-# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
-
# [JBWS-2118] context-root in jboss.xml is ignored
org/jboss/test/ws/jaxws/jbws1813/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-08 18:01:29 UTC (rev 8998)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-09 07:31:40 UTC (rev 8999)
@@ -82,14 +82,10 @@
# [JBWS-2114] IllegalArgumentException: Wrong target. class
org/jboss/test/ws/jaxws/jbws1283/**
-org/jboss/test/ws/jaxws/jbws1822/**
# [JBWS-2115] EJB client vehicle not sufficiently isolated
org/jboss/test/ws/jaxws/jbws1581/**
-# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
-
# [JBWS-2118] context-root in jboss.xml is ignored
org/jboss/test/ws/jaxws/jbws1813/**
15 years, 5 months
- 1
- 0
JBossWS SVN: r8998 - framework/trunk/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-08 13:01:29 -0500 (Thu, 08 Jan 2009)
New Revision: 8998
Modified:
framework/trunk/hudson/hudson-home/config.xml
Log:
[JBWS-2444] Updating hudson config
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
+++ framework/trunk/hudson/hudson-home/config.xml 2009-01-08 18:01:29 UTC (rev 8998)
@@ -17,8 +17,8 @@
<tr><th align=left>@hudson.jboss423.build@</th><td>-r(a)hudson.jboss423.rev@ @hudson.jboss423.url@</td></tr>
<tr><th align=left>@hudson.jboss424.build@</th><td>-r(a)hudson.jboss424.rev@ @hudson.jboss424.url@</td></tr>
<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.jboss600.build@</th><td>-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -38,8 +38,8 @@
<string>AS-Tests-AS-4.2.3</string>
<string>AS-Tests-AS-4.2.4</string>
<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-6.0.0</string>
</jobNames>
<name>AS Tests</name>
<description>
@@ -66,10 +66,10 @@
<string>Native-Core-AS-4.2.4-JDK6</string>
<string>Native-Core-AS-5.0.0</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
- <string>Native-Core-AS-5.0.1</string>
- <string>Native-Core-AS-5.0.1-JDK6</string>
<string>Native-Core-AS-5.1.0</string>
<string>Native-Core-AS-5.1.0-JDK6</string>
+ <string>Native-Core-AS-6.0.0</string>
+ <string>Native-Core-AS-6.0.0-JDK6</string>
<string>Native-Distro-AS-4.2.2</string>
<string>Native-Distro-AS-4.2.2-JDK6</string>
<string>Native-Distro-AS-4.2.3</string>
@@ -78,10 +78,10 @@
<string>Native-Distro-AS-4.2.4-JDK6</string>
<string>Native-Distro-AS-5.0.0</string>
<string>Native-Distro-AS-5.0.0-JDK6</string>
- <string>Native-Distro-AS-5.0.1</string>
- <string>Native-Distro-AS-5.0.1-JDK6</string>
<string>Native-Distro-AS-5.1.0</string>
<string>Native-Distro-AS-5.1.0-JDK6</string>
+ <string>Native-Distro-AS-6.0.0</string>
+ <string>Native-Distro-AS-6.0.0-JDK6</string>
<string>Native-Source-Distro-AS-4.2.2</string>
<string>Native-Source-Distro-AS-4.2.2-JDK6</string>
<string>Native-Source-Distro-AS-4.2.3</string>
@@ -90,10 +90,10 @@
<string>Native-Source-Distro-AS-4.2.4-JDK6</string>
<string>Native-Source-Distro-AS-5.0.0</string>
<string>Native-Source-Distro-AS-5.0.0-JDK6</string>
- <string>Native-Source-Distro-AS-5.0.1</string>
- <string>Native-Source-Distro-AS-5.0.1-JDK6</string>
<string>Native-Source-Distro-AS-5.1.0</string>
<string>Native-Source-Distro-AS-5.1.0-JDK6</string>
+ <string>Native-Source-Distro-AS-6.0.0</string>
+ <string>Native-Source-Distro-AS-6.0.0-JDK6</string>
<string>Native-Integration-AS-4.2.2</string>
<string>Native-Integration-AS-4.2.2-JDK6</string>
<string>Native-Integration-AS-4.2.3</string>
@@ -102,10 +102,10 @@
<string>Native-Integration-AS-4.2.4-JDK6</string>
<string>Native-Integration-AS-5.0.0</string>
<string>Native-Integration-AS-5.0.0-JDK6</string>
- <string>Native-Integration-AS-5.0.1</string>
- <string>Native-Integration-AS-5.0.1-JDK6</string>
<string>Native-Integration-AS-5.1.0</string>
<string>Native-Integration-AS-5.1.0-JDK6</string>
+ <string>Native-Integration-AS-6.0.0</string>
+ <string>Native-Integration-AS-6.0.0-JDK6</string>
</jobNames>
<name>Native Tests</name>
<description>
@@ -132,10 +132,10 @@
<string>Metro-Core-AS-4.2.4-JDK6</string>
<string>Metro-Core-AS-5.0.0</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
- <string>Metro-Core-AS-5.0.1</string>
- <string>Metro-Core-AS-5.0.1-JDK6</string>
<string>Metro-Core-AS-5.1.0</string>
<string>Metro-Core-AS-5.1.0-JDK6</string>
+ <string>Metro-Core-AS-6.0.0</string>
+ <string>Metro-Core-AS-6.0.0-JDK6</string>
<string>Metro-Distro-AS-4.2.2</string>
<string>Metro-Distro-AS-4.2.2-JDK6</string>
<string>Metro-Distro-AS-4.2.3</string>
@@ -144,10 +144,10 @@
<string>Metro-Distro-AS-4.2.4-JDK6</string>
<string>Metro-Distro-AS-5.0.0</string>
<string>Metro-Distro-AS-5.0.0-JDK6</string>
- <string>Metro-Distro-AS-5.0.1</string>
- <string>Metro-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Distro-AS-5.1.0</string>
<string>Metro-Distro-AS-5.1.0-JDK6</string>
+ <string>Metro-Distro-AS-6.0.0</string>
+ <string>Metro-Distro-AS-6.0.0-JDK6</string>
<string>Metro-Source-Distro-AS-4.2.2</string>
<string>Metro-Source-Distro-AS-4.2.2-JDK6</string>
<string>Metro-Source-Distro-AS-4.2.3</string>
@@ -156,10 +156,10 @@
<string>Metro-Source-Distro-AS-4.2.4-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.0</string>
<string>Metro-Source-Distro-AS-5.0.0-JDK6</string>
- <string>Metro-Source-Distro-AS-5.0.1</string>
- <string>Metro-Source-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Source-Distro-AS-5.1.0</string>
<string>Metro-Source-Distro-AS-5.1.0-JDK6</string>
+ <string>Metro-Source-Distro-AS-6.0.0</string>
+ <string>Metro-Source-Distro-AS-6.0.0-JDK6</string>
<string>Metro-Integration-AS-4.2.2</string>
<string>Metro-Integration-AS-4.2.2-JDK6</string>
<string>Metro-Integration-AS-4.2.3</string>
@@ -168,10 +168,10 @@
<string>Metro-Integration-AS-4.2.4-JDK6</string>
<string>Metro-Integration-AS-5.0.0</string>
<string>Metro-Integration-AS-5.0.0-JDK6</string>
- <string>Metro-Integration-AS-5.0.1</string>
- <string>Metro-Integration-AS-5.0.1-JDK6</string>
<string>Metro-Integration-AS-5.1.0</string>
<string>Metro-Integration-AS-5.1.0-JDK6</string>
+ <string>Metro-Integration-AS-6.0.0</string>
+ <string>Metro-Integration-AS-6.0.0-JDK6</string>
</jobNames>
<name>Metro Tests</name>
<description>
@@ -194,26 +194,26 @@
<string>CXF-Core-AS-4.2.3</string>
<string>CXF-Core-AS-4.2.4</string>
<string>CXF-Core-AS-5.0.0</string>
- <string>CXF-Core-AS-5.0.1</string>
<string>CXF-Core-AS-5.1.0</string>
+ <string>CXF-Core-AS-6.0.0</string>
<string>CXF-Distro-AS-4.2.2</string>
<string>CXF-Distro-AS-4.2.3</string>
<string>CXF-Distro-AS-4.2.4</string>
<string>CXF-Distro-AS-5.0.0</string>
- <string>CXF-Distro-AS-5.0.1</string>
<string>CXF-Distro-AS-5.1.0</string>
+ <string>CXF-Distro-AS-6.0.0</string>
<string>CXF-Source-Distro-AS-4.2.2</string>
<string>CXF-Source-Distro-AS-4.2.3</string>
<string>CXF-Source-Distro-AS-4.2.4</string>
<string>CXF-Source-Distro-AS-5.0.0</string>
- <string>CXF-Source-Distro-AS-5.0.1</string>
<string>CXF-Source-Distro-AS-5.1.0</string>
+ <string>CXF-Source-Distro-AS-6.0.0</string>
<string>CXF-Integration-AS-4.2.2</string>
<string>CXF-Integration-AS-4.2.3</string>
<string>CXF-Integration-AS-4.2.4</string>
<string>CXF-Integration-AS-5.0.0</string>
- <string>CXF-Integration-AS-5.0.1</string>
<string>CXF-Integration-AS-5.1.0</string>
+ <string>CXF-Integration-AS-6.0.0</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -245,8 +245,8 @@
<tr align=center><th align=left>AS-4.2.3</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.2.4</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
-<tr align=center><th align=left>AS-5.0.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.1.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-6.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
</table>
]]>
</description>
@@ -261,7 +261,7 @@
<string>AS-4.2.3</string>
<string>AS-4.2.4</string>
<string>AS-5.0.0</string>
- <string>AS-5.0.1</string>
+ <string>AS-6.0.0</string>
<string>AS-5.1.0</string>
</jobNames>
<name>Target Container</name>
@@ -285,10 +285,10 @@
<string>Metro-Core-AS-4.2.4-JDK6</string>
<string>Metro-Core-AS-5.0.0</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
- <string>Metro-Core-AS-5.0.1</string>
- <string>Metro-Core-AS-5.0.1-JDK6</string>
<string>Metro-Core-AS-5.1.0</string>
<string>Metro-Core-AS-5.1.0-JDK6</string>
+ <string>Metro-Core-AS-6.0.0</string>
+ <string>Metro-Core-AS-6.0.0-JDK6</string>
<string>Metro-Distro-AS-4.2.2</string>
<string>Metro-Distro-AS-4.2.2-JDK6</string>
<string>Metro-Distro-AS-4.2.3</string>
@@ -297,23 +297,23 @@
<string>Metro-Distro-AS-4.2.4-JDK6</string>
<string>Metro-Distro-AS-5.0.0</string>
<string>Metro-Distro-AS-5.0.0-JDK6</string>
- <string>Metro-Distro-AS-5.0.1</string>
- <string>Metro-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Distro-AS-5.1.0</string>
<string>Metro-Distro-AS-5.1.0-JDK6</string>
+ <string>Metro-Distro-AS-6.0.0</string>
+ <string>Metro-Distro-AS-6.0.0-JDK6</string>
<string>CXF-Light</string>
<string>CXF-Core-AS-4.2.2</string>
<string>CXF-Core-AS-4.2.3</string>
<string>CXF-Core-AS-4.2.4</string>
<string>CXF-Core-AS-5.0.0</string>
- <string>CXF-Core-AS-5.0.1</string>
+ <string>CXF-Core-AS-6.0.0</string>
<string>CXF-Core-AS-5.1.0</string>
<string>CXF-Distro-AS-4.2.2</string>
<string>CXF-Distro-AS-4.2.3</string>
<string>CXF-Distro-AS-4.2.4</string>
<string>CXF-Distro-AS-5.0.0</string>
- <string>CXF-Distro-AS-5.0.1</string>
<string>CXF-Distro-AS-5.1.0</string>
+ <string>CXF-Distro-AS-6.0.0</string>
<string>Native-Light</string>
<string>Native-Core-AS-4.2.2</string>
<string>Native-Core-AS-4.2.2-JDK6</string>
@@ -323,10 +323,10 @@
<string>Native-Core-AS-4.2.4-JDK6</string>
<string>Native-Core-AS-5.0.0</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
- <string>Native-Core-AS-5.0.1</string>
- <string>Native-Core-AS-5.0.1-JDK6</string>
<string>Native-Core-AS-5.1.0</string>
<string>Native-Core-AS-5.1.0-JDK6</string>
+ <string>Native-Core-AS-6.0.0</string>
+ <string>Native-Core-AS-6.0.0-JDK6</string>
<string>Native-Distro-AS-4.2.2</string>
<string>Native-Distro-AS-4.2.2-JDK6</string>
<string>Native-Distro-AS-4.2.3</string>
@@ -335,10 +335,10 @@
<string>Native-Distro-AS-4.2.4-JDK6</string>
<string>Native-Distro-AS-5.0.0</string>
<string>Native-Distro-AS-5.0.0-JDK6</string>
- <string>Native-Distro-AS-5.0.1</string>
- <string>Native-Distro-AS-5.0.1-JDK6</string>
<string>Native-Distro-AS-5.1.0</string>
<string>Native-Distro-AS-5.1.0-JDK6</string>
+ <string>Native-Distro-AS-6.0.0</string>
+ <string>Native-Distro-AS-6.0.0-JDK6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
15 years, 5 months
- 1
- 0
JBossWS SVN: r8997 - in framework/trunk/hudson: hudson-home/jobs and 32 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-08 12:49:25 -0500 (Thu, 08 Jan 2009)
New Revision: 8997
Added:
framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml
Removed:
framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/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
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
Log:
[JBWS-2444] Updating hudson jobs
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2009-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/ant.properties.example 2009-01-08 17:49:25 UTC (rev 8997)
@@ -42,14 +42,14 @@
hudson.jboss500.build=jboss-5.0.0.GA
hudson.jboss500.rev=HEAD
-hudson.jboss501.url=http://anonsvn.jboss.org/repos/jbossas/branches/Branch_5_0
-hudson.jboss501.build=jboss-5.0.1.CR1
-hudson.jboss501.rev=HEAD
-
-hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/trunk
+hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/branches/Branch_5_x
hudson.jboss510.build=jboss-5.1.0.Beta1
hudson.jboss510.rev=HEAD
+hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/trunk
+hudson.jboss600.build=jboss-6.0.0.Alpha1
+hudson.jboss600.rev=HEAD
+
hudson.mail.recipients=
hudson.smtp.host=localhost
Copied: framework/trunk/hudson/hudson-home/jobs/AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,69 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-SVNBASE=JBossAS-5.0.1
-
-#
-# checkout with an explicit version
-#
-#if [ -d "$SVNBASE" ]; then
-# svn up -r(a)hudson.jboss501.rev@ $SVNBASE
-#else
-# svn co -r(a)hudson.jboss501.rev@ @hudson.jboss501.url@
-#fi
-
-#
-# build jboss
-#
-cd $SVNBASE
-./build/build.sh clean main
-
-#
-# Verify build
-#
-if [ ! -d ./build/output/(a)hudson.jboss501.build@ ]; then
- echo "Cannot find expected build: @hudson.jboss501.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.jboss501.url@</remote>
- <local>JBossAS-5.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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build AS-5.0.1</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-6.0.0
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss600.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss600.rev@ @hudson.jboss600.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+./build/build.sh clean main
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/(a)hudson.jboss600.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss600.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.jboss600.url@</remote>
+ <local>JBossAS-6.0.0</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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-4.2.2, AS-Tests-AS-4.2.3, AS-Tests-AS-4.2.4, AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0</childProjects>
+ <childProjects>AS-Tests-AS-4.2.2, AS-Tests-AS-4.2.3, AS-Tests-AS-4.2.4, AS-Tests-AS-5.0.0, AS-Tests-AS-5.1.0, AS-Tests-AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Copied: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=AS-Tests-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# build the testsuite
-#
-cd $JBOSS_INSTANCE/../../../testsuite
-./build.sh -Dnode0=$JBOSS_BINDADDR clean main
-
-#
-# execute tests
-#
-./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/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
-#
-$FRAMEWORKDIR/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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Run the AS-5.0.1 webservice testsuite agains jbossws-(a)version.id@</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -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.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# build the testsuite
+#
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh -Dnode0=$JBOSS_BINDADDR clean main
+
+#
+# execute tests
+#
+./build.sh -Dnode0=$JBOSS_BINDADDR tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/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
+#
+$FRAMEWORKDIR/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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Run the AS-6.0.0 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-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -4,9 +4,9 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-Core-AS-4.2.2, CXF-Core-AS-4.2.3, CXF-Core-AS-4.2.4, CXF-Core-AS-5.0.0, CXF-Core-AS-5.0.1, CXF-Core-AS-5.1.0
- , CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-4.2.4, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.0.1, CXF-Distro-AS-5.1.0
- , CXF-Source-Distro-AS-4.2.2, CXF-Source-Distro-AS-4.2.3, CXF-Source-Distro-AS-4.2.4, CXF-Source-Distro-AS-5.0.0, CXF-Source-Distro-AS-5.0.1, CXF-Source-Distro-AS-5.1.0
+ CXF-Core-AS-4.2.2, CXF-Core-AS-4.2.3, CXF-Core-AS-4.2.4, CXF-Core-AS-5.0.0, CXF-Core-AS-5.1.0, CXF-Core-AS-6.0.0
+ , CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-4.2.4, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.1.0, CXF-Distro-AS-6.0.0
+ , CXF-Source-Distro-AS-4.2.2, CXF-Source-Distro-AS-4.2.3, CXF-Source-Distro-AS-4.2.4, CXF-Source-Distro-AS-5.0.0, CXF-Source-Distro-AS-5.1.0, CXF-Source-Distro-AS-6.0.0
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=CXF-Core-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-cxf
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Core-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=CXF-Distro-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-cxf
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-bin-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-cxf-bin-dist
-unzip jbossws-cxf-bin-dist.zip
-cd jbossws-cxf-bin-dist
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Distro-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-bin-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-cxf-bin-dist
+unzip jbossws-cxf-bin-dist.zip
+cd jbossws-cxf-bin-dist
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=CXF-Integration-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-cxf
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Integration-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0</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-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -4,8 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-Core-AS-4.2.2, CXF-Core-AS-4.2.3, CXF-Core-AS-4.2.4, CXF-Core-AS-5.0.0, CXF-Core-AS-5.0.1, CXF-Core-AS-5.1.0
- , CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-4.2.4, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.0.1, CXF-Distro-AS-5.1.0
+ CXF-Core-AS-4.2.2, CXF-Core-AS-4.2.3, CXF-Core-AS-4.2.4, CXF-Core-AS-5.0.0, CXF-Core-AS-5.1.0, CXF-Core-AS-6.0.0
+ , CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-4.2.4, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.1.0, CXF-Distro-AS-6.0.0
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=CXF-Source-Distro-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-cxf
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-cxf-src-dist
-unzip jbossws-cxf-src-dist.zip
-cd jbossws-cxf-src-dist
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,119 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Source-Distro-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-src-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-cxf-src-dist
+unzip jbossws-cxf-src-dist.zip
+cd jbossws-cxf-src-dist
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.0.0</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-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -5,11 +5,11 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Metro-Core-AS-4.2.2, Metro-Core-AS-4.2.2-JDK6, Metro-Core-AS-4.2.3, Metro-Core-AS-4.2.3-JDK6, Metro-Core-AS-4.2.4, Metro-Core-AS-4.2.4-JDK6
- , Metro-Core-AS-5.0.0, Metro-Core-AS-5.0.0-JDK6, Metro-Core-AS-5.0.1, Metro-Core-AS-5.0.1-JDK6, Metro-Core-AS-5.1.0, Metro-Core-AS-5.1.0-JDK6
+ , Metro-Core-AS-5.0.0, Metro-Core-AS-5.0.0-JDK6, Metro-Core-AS-5.1.0, Metro-Core-AS-5.1.0-JDK6, Metro-Core-AS-6.0.0, Metro-Core-AS-6.0.0-JDK6
, Metro-Distro-AS-4.2.2, Metro-Distro-AS-4.2.2-JDK6, Metro-Distro-AS-4.2.3, Metro-Distro-AS-4.2.3-JDK6, Metro-Distro-AS-4.2.4, Metro-Distro-AS-4.2.4-JDK6
- , Metro-Distro-AS-5.0.0, Metro-Distro-AS-5.0.0-JDK6, Metro-Distro-AS-5.0.1, Metro-Distro-AS-5.0.1-JDK6, Metro-Distro-AS-5.1.0, Metro-Distro-AS-5.1.0-JDK6
+ , Metro-Distro-AS-5.0.0, Metro-Distro-AS-5.0.0-JDK6, Metro-Distro-AS-5.1.0, Metro-Distro-AS-5.1.0-JDK6, Metro-Distro-AS-6.0.0, Metro-Distro-AS-6.0.0-JDK6
, Metro-Source-Distro-AS-4.2.2, Metro-Source-Distro-AS-4.2.2-JDK6, Metro-Source-Distro-AS-4.2.3, Metro-Source-Distro-AS-4.2.3-JDK6, Metro-Source-Distro-AS-4.2.4, Metro-Source-Distro-AS-4.2.4-JDK6
- , Metro-Source-Distro-AS-5.0.0, Metro-Source-Distro-AS-5.0.0-JDK6, Metro-Source-Distro-AS-5.0.1, Metro-Source-Distro-AS-5.0.1-JDK6, Metro-Source-Distro-AS-5.1.0, Metro-Source-Distro-AS-5.1.0-JDK6
+ , Metro-Source-Distro-AS-5.0.0, Metro-Source-Distro-AS-5.0.0-JDK6, Metro-Source-Distro-AS-5.1.0, Metro-Source-Distro-AS-5.1.0-JDK6, Metro-Source-Distro-AS-6.0.0, Metro-Source-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Core-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Core-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-5.0.1 with JDK6</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Core-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ against AS-6.0.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Distro-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-bin-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-metro-bin-dist
-unzip jbossws-metro-bin-dist.zip
-cd jbossws-metro-bin-dist
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-metro-(a)version.id@ binary distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Distro-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-bin-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-metro-bin-dist
+unzip jbossws-metro-bin-dist.zip
+cd jbossws-metro-bin-dist
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ binary distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Distro-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-bin-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-metro-bin-dist
+unzip jbossws-metro-bin-dist.zip
+cd jbossws-metro-bin-dist
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ binary distribution against AS-6.0.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Property changes on: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-6.0.0-JDK6/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Integration-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Integration-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Integration-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1 with JDK6</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Integration-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0 with JDK6</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-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -5,9 +5,9 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Metro-Core-AS-4.2.2, Metro-Core-AS-4.2.2-JDK6, Metro-Core-AS-4.2.3, Metro-Core-AS-4.2.3-JDK6, Metro-Core-AS-4.2.4, Metro-Core-AS-4.2.4-JDK6
- , Metro-Core-AS-5.0.0, Metro-Core-AS-5.0.0-JDK6, Metro-Core-AS-5.0.1, Metro-Core-AS-5.0.1-JDK6, Metro-Core-AS-5.1.0, Metro-Core-AS-5.1.0-JDK6
+ , Metro-Core-AS-5.0.0, Metro-Core-AS-5.0.0-JDK6, Metro-Core-AS-5.1.0, Metro-Core-AS-5.1.0-JDK6, Metro-Core-AS-6.0.0, Metro-Core-AS-6.0.0-JDK6
, Metro-Distro-AS-4.2.2, Metro-Distro-AS-4.2.2-JDK6, Metro-Distro-AS-4.2.3, Metro-Distro-AS-4.2.3-JDK6, Metro-Distro-AS-4.2.4, Metro-Distro-AS-4.2.4-JDK6
- , Metro-Distro-AS-5.0.0, Metro-Distro-AS-5.0.0-JDK6, Metro-Distro-AS-5.0.1, Metro-Distro-AS-5.0.1-JDK6, Metro-Distro-AS-5.1.0, Metro-Distro-AS-5.1.0-JDK6
+ , Metro-Distro-AS-5.0.0, Metro-Distro-AS-5.0.0-JDK6, Metro-Distro-AS-5.1.0, Metro-Distro-AS-5.1.0-JDK6, Metro-Distro-AS-6.0.0, Metro-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Source-Distro-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-metro-src-dist
-unzip jbossws-metro-src-dist.zip
-cd jbossws-metro-src-dist
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-metro-(a)version.id@ source distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,119 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Source-Distro-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-src-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-metro-src-dist
+unzip jbossws-metro-src-dist.zip
+cd jbossws-metro-src-dist
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ source distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Metro-Source-Distro-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-metro
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-metro-src-dist
-unzip jbossws-metro-src-dist.zip
-cd jbossws-metro-src-dist
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-metro-(a)version.id@ source distribution against AS-5.0.1 with JDK6</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,129 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Metro-Source-Distro-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-src-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-metro-src-dist
+unzip jbossws-metro-src-dist.zip
+cd jbossws-metro-src-dist
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-metro-(a)version.id@ source distribution against AS-6.0.0 with JDK6</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-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -5,11 +5,11 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6, Native-Core-AS-4.2.4, Native-Core-AS-4.2.4-JDK6
- , Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6, Native-Core-AS-5.0.1, Native-Core-AS-5.0.1-JDK6, Native-Core-AS-5.1.0, Native-Core-AS-5.1.0-JDK6
+ , Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6, Native-Core-AS-5.1.0, Native-Core-AS-5.1.0-JDK6, Native-Core-AS-6.0.0, Native-Core-AS-6.0.0-JDK6
, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6, Native-Distro-AS-4.2.4, Native-Distro-AS-4.2.4-JDK6
- , Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6, Native-Distro-AS-5.0.1, Native-Distro-AS-5.0.1-JDK6, Native-Distro-AS-5.1.0, Native-Distro-AS-5.1.0-JDK6
+ , Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6, Native-Distro-AS-5.1.0, Native-Distro-AS-5.1.0-JDK6, Native-Distro-AS-6.0.0, Native-Distro-AS-6.0.0-JDK6
, Native-Source-Distro-AS-4.2.2, Native-Source-Distro-AS-4.2.2-JDK6, Native-Source-Distro-AS-4.2.3, Native-Source-Distro-AS-4.2.3-JDK6, Native-Source-Distro-AS-4.2.4, Native-Source-Distro-AS-4.2.4-JDK6
- , Native-Source-Distro-AS-5.0.0, Native-Source-Distro-AS-5.0.0-JDK6, Native-Source-Distro-AS-5.0.1, Native-Source-Distro-AS-5.0.1-JDK6, Native-Source-Distro-AS-5.1.0, Native-Source-Distro-AS-5.1.0-JDK6
+ , Native-Source-Distro-AS-5.0.0, Native-Source-Distro-AS-5.0.0-JDK6, Native-Source-Distro-AS-5.1.0, Native-Source-Distro-AS-5.1.0-JDK6, Native-Source-Distro-AS-6.0.0, Native-Source-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Core-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Core-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,125 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Core-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Core-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dinterop=true test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Distro-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-bin-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-native-bin-dist
-unzip jbossws-native-bin-dist.zip
-cd jbossws-native-bin-dist
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Distro-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-bin-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-native-bin-dist
+unzip jbossws-native-bin-dist.zip
+cd jbossws-native-bin-dist
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,125 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Distro-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-bin-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-native-bin-dist
-unzip jbossws-native-bin-dist.zip
-cd jbossws-native-bin-dist
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Distro-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-bin-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-native-bin-dist
+unzip jbossws-native-bin-dist.zip
+cd jbossws-native-bin-dist
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Integration-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Integration-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,125 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Integration-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# build and deploy
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Integration-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Psmoketest,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-6.0.0</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-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -5,9 +5,9 @@
<hudson.tasks.BuildTrigger>
<childProjects>
Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6, Native-Core-AS-4.2.4, Native-Core-AS-4.2.4-JDK6
- , Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6, Native-Core-AS-5.0.1, Native-Core-AS-5.0.1-JDK6, Native-Core-AS-5.1.0, Native-Core-AS-5.1.0-JDK6
+ , Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6, Native-Core-AS-5.1.0, Native-Core-AS-5.1.0-JDK6, Native-Core-AS-6.0.0, Native-Core-AS-6.0.0-JDK6
, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6, Native-Distro-AS-4.2.4, Native-Distro-AS-4.2.4-JDK6
- , Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6, Native-Distro-AS-5.0.1, Native-Distro-AS-5.0.1-JDK6, Native-Distro-AS-5.1.0, Native-Distro-AS-5.1.0-JDK6
+ , Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6, Native-Distro-AS-5.1.0, Native-Distro-AS-5.1.0-JDK6, Native-Distro-AS-6.0.0, Native-Distro-AS-6.0.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Source-Distro-AS-5.0.1
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-native-src-dist
-unzip jbossws-native-src-dist.zip
-cd jbossws-native-src-dist
-cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Source-Distro-AS-6.0.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-src-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-native-src-dist
+unzip jbossws-native-src-dist.zip
+cd jbossws-native-src-dist
+cp profiles.xml.example profiles.xml
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6 (from rev 8979, framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6)
Deleted: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/config.xml 2009-01-07 14:36:31 UTC (rev 8979)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Native-Source-Distro-AS-5.0.1-JDK6
-
-WORKSPACE=`pwd`
-FRAMEWORKDIR=$WORKSPACE/framework
-STACKDIR=$WORKSPACE/stack-native
-JBOSS_TARGET=jboss501
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK1.6 availablility
-#
-if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
- echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
- exit 1
-else
- JAVA_HOME="@java.home.jdk16@"
-fi
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $STACKDIR
-cp profiles.xml.example profiles.xml
-mvn -Ptestsuite clean
-ant $ENVIRONMENT build-src-dist
-
-#
-# Deploy distro
-#
-cd target
-rm -rf jbossws-native-src-dist
-unzip jbossws-native-src-dist.zip
-cd jbossws-native-src-dist
-cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT deploy-jboss501
-
-# 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
-#
-$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
-cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-
-#
-# stop jbossas
-#
-$FRAMEWORKDIR/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>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>28</daysToKeep>
- <numToKeep>-1</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-5.0.1</description>
- <actions class="vector"/>
-</project>
Copied: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml (from rev 8994, framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.0.1-JDK6/config.xml)
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-6.0.0-JDK6/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -0,0 +1,130 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Native-Source-Distro-AS-6.0.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss600
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.0/workspace/JBossAS-6.0.0/build/output/(a)hudson.jboss600.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss600.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK1.6 availablility
+#
+if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then
+ echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@java.home.jdk16@"
+fi
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $STACKDIR
+cp profiles.xml.example profiles.xml
+mvn -Ptestsuite clean
+ant $ENVIRONMENT build-src-dist
+
+#
+# Deploy distro
+#
+cd target
+rm -rf jbossws-native-src-dist
+unzip jbossws-native-src-dist.zip
+cd jbossws-native-src-dist
+cp profiles.xml.example profiles.xml
+ant $ENVIRONMENT deploy-jboss600
+
+# 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
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log
+cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+cat $STACKDIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/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>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>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-6.0.0</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.2, AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-Tests-ALL</childProjects>
+ <childProjects>AS-4.2.2, AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.1.0, AS-6.0.0, AS-Tests-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.2, AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
+ <childProjects>AS-4.2.2, AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-01-08 17:47:12 UTC (rev 8996)
+++ framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-01-08 17:49:25 UTC (rev 8997)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.2, AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
+ <childProjects>AS-4.2.2, AS-4.2.3, AS-4.2.4, AS-5.0.0, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
15 years, 5 months
- 1
- 0
JBossWS SVN: r8996 - in stack/native/trunk: modules/core and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-08 12:47:12 -0500 (Thu, 08 Jan 2009)
New Revision: 8996
Removed:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.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/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
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:
[JJBWS-2444] Updating for AS 6
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/build.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -63,12 +63,12 @@
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
- <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
- <isset property="profiles.profile.properties.jboss501.home"/>
- </condition>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
+ <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
+ <isset property="profiles.profile.properties.jboss600.home"/>
+ </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
@@ -76,16 +76,16 @@
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<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="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
- <echo message="jboss501.home=${jboss501.home}"/>
- <echo message="jboss501.home=${jboss510.home}"/>
+ <echo message="jboss510.home=${jboss510.home}"/>
+ <echo message="jboss600.home=${jboss600.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-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/core/pom.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -221,19 +221,19 @@
<!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
- <version>${jbossws.jboss501.version}</version>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss600x</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
<!-- END -->
</artifactItems>
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-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -73,19 +73,19 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
+ <!-- Concat jbossws-jboss510/jbossws.beans -->
+ <echo message="Concat jbossws-jboss510/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
<fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
- <!-- Concat jbossws-jboss510/jbossws.beans -->
- <echo message="Concat jbossws-jboss510/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
+
+ <!-- Concat jbossws-jboss600/jbossws.beans -->
+ <echo message="Concat jbossws-jboss600/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
<fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/management/pom.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -54,12 +54,12 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
+ <artifactId>jbossws-jboss510x</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
<!-- END -->
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -148,6 +148,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-lib60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -220,6 +235,24 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-client60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <!-- JBWS-2263 -->
+ <!-- START -->
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- END -->
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
@@ -267,6 +300,20 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-server-lib60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy JUDDI Service -->
<!-- ================================================================== -->
@@ -359,6 +406,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-sar60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-native-management.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Deployers -->
<!-- ================================================================== -->
@@ -449,6 +511,49 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-deployers60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{artifactsdir}/resources">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- END -->
+ </fileset>
+ </copy>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ <!-- END -->
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
@@ -485,6 +590,17 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-native60" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar60 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
<target name="check-parameters">
<fail message="artifactsdir must be specified" unless="artifactsdir"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
@@ -609,4 +725,43 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws60">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- [JBWS-2263] -->
+ <!-- START -->
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+ <!-- END -->
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
+
</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-01-08 17:47:12 UTC (rev 8996)
@@ -39,7 +39,7 @@
{
public static Test suite()
{
- String newspaperJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
+ String newspaperJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
return new JBossWSTestSetup
(
SecureNewsTestCase.class,
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -470,21 +470,21 @@
</profile>
<!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
-->
<profile>
- <id>jboss501</id>
+ <id>jboss510</id>
<properties>
- <jboss.version>5.0.1-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
+ <jboss.version>5.1.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
+ <artifactId>jbossws-jboss510x</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -525,13 +525,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -544,21 +544,21 @@
</profile>
<!--
- Name: jboss510
- Descr: JBoss-5.1.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss510</id>
+ <id>jboss600</id>
<properties>
- <jboss.version>5.1.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.version>6.0.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
<!-- [JBWS-2263] -->
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss600x</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -599,7 +599,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-08 17:47:12 UTC (rev 8996)
@@ -1,20 +0,0 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
-
-# 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-2433] Investigate why MessageDriven EJB3 tests are failing
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-org/jboss/test/ws/jaxws/samples/dar/**
-
-# [JBAS-5257] Cannot deploy through jax-ws endpoint API
-org/jboss/test/ws/jaxws/endpoint/**
-
-# [JBWS-2217] Fix BPEL jaxrpc samples
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/pom.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -48,7 +48,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.8.GA</jbossws.common.version>
+ <jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
<jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
@@ -57,8 +57,8 @@
<jbossws.jboss500.version>3.0.5.GA</jbossws.jboss500.version>
<!-- [JBWS-2263] -->
<!-- START -->
- <jbossws.jboss501.version>3.0.5.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.0.5.GA</jbossws.jboss510.version>
+ <jbossws.jboss600.version>3.0.6-SNAPSHOT</jbossws.jboss600.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -160,25 +160,25 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
- <version>${jbossws.jboss501.version}</version>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
- <version>${jbossws.jboss501.version}</version>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss600x</artifactId>
+ <version>${jbossws.jboss600.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss600x</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -515,26 +515,26 @@
</profile>
<!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
-->
<profile>
- <id>jboss501</id>
+ <id>jboss510</id>
<properties>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- <jboss.home>${jboss501.home}</jboss.home>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.home>${jboss510.home}</jboss.home>
</properties>
</profile>
<!--
- Name: jboss510
- Descr: JBoss-5.1.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss510</id>
+ <id>jboss600</id>
<properties>
- <jbossws.integration.target>jboss510</jbossws.integration.target>
- <jboss.home>${jboss510.home}</jboss.home>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/profiles.xml.example 2009-01-08 17:47:12 UTC (rev 8996)
@@ -16,8 +16,8 @@
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.CR1</jboss501.home>
- <jboss510.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss510.home>/home/tdiesler/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss600.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/src/main/distro/Install.txt 2009-01-08 17:47:12 UTC (rev 8996)
@@ -16,6 +16,7 @@
ant deploy-jboss42x
ant deploy-jboss50x
ant deploy-jboss51x
+ ant deploy-jboss60x
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-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2009-01-08 17:47:12 UTC (rev 8996)
@@ -7,10 +7,10 @@
jboss423.home=(a)jboss423.home@
jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
-jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
+jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -130,28 +130,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss501">
- <property name="jbossws.integration.target" value="jboss501"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <copy todir="${jboss501.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
@@ -189,6 +167,43 @@
</target>
<!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-6.0.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss60" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-native51" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss600 -->
+ <!-- ================================================================== -->
+
+ <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-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">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss600.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-jbossws51 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -46,13 +46,6 @@
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
<property name="jboss510.lib" value="${jboss510.home}/lib"/>
<property name="jboss510.client" value="${jboss510.home}/client"/>
<property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/>
@@ -60,19 +53,26 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.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}"/>
+ <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
+ <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
+ <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
+
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/>
<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="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss424.available" file="${jboss424.available.file}"/>
<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="jboss600.available" file="${jboss600.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-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/src/main/distro/build.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -56,7 +56,6 @@
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
<condition property="jbossws.integration.jboss51" value="true">
@@ -64,6 +63,11 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss60" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
+ </or>
+ </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-08 16:37:42 UTC (rev 8995)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-08 17:47:12 UTC (rev 8996)
@@ -104,22 +104,22 @@
<!-- START -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
+ <include>org.jboss.ws:jbossws-jboss510x:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
<!-- END -->
15 years, 5 months
- 1
- 0
JBossWS SVN: r8995 - in stack/metro/trunk: modules/management and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-08 11:37:42 -0500 (Thu, 08 Jan 2009)
New Revision: 8995
Added:
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
Removed:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Modified:
stack/metro/trunk/build.xml
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/Install.txt
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2444] Update for AS 6
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/build.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -67,12 +67,12 @@
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
- <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
- <isset property="profiles.profile.properties.jboss501.home"/>
- </condition>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
+ <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
+ <isset property="profiles.profile.properties.jboss600.home"/>
+ </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
@@ -80,16 +80,16 @@
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<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="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
- <echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
+ <echo message="jboss600.home=${jboss600.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/management/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -54,12 +54,12 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
+ <artifactId>jbossws-jboss510x</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
<!-- END -->
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -160,6 +160,21 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-lib60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
@@ -232,6 +247,24 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <!-- JBWS-2263 -->
+ <!-- START -->
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- END -->
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
@@ -279,6 +312,20 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-server-lib60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy JUDDI Service -->
@@ -368,6 +415,21 @@
</unzip>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-sar60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}/jbossws-management.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-metro-management.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Deployers -->
@@ -449,6 +511,44 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-deployers60">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <!-- JBWS-2263 -->
+ <!-- START -->
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- END -->
+ </fileset>
+ </copy>
+ <!-- JBWS-2263 -->
+ <!-- START -->
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ <!-- END -->
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
@@ -484,6 +584,17 @@
<macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+
+ <target name="deploy-jbossws-metro60" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar60 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ </target>
<target name="check-parameters">
<fail message="installserver must be specified" unless="installserver"/>
@@ -608,5 +719,44 @@
</sequential>
</macrodef>
+
+ <macrodef name="macro-undeploy-jbossws60">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- JBWS-2263 -->
+ <!-- START -->
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+ <!-- START -->
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
</project>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/server/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -194,19 +194,19 @@
<!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
- <version>${jbossws.jboss501.version}</version>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss600x</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
<!-- END -->
</artifactItems>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -73,19 +73,19 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
+ <!-- Concat jbossws-jboss510/jbossws.beans -->
+ <echo message="Concat jbossws-jboss510/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
<fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
- <!-- Concat jbossws-jboss510/jbossws.beans -->
- <echo message="Concat jbossws-jboss510/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
+
+ <!-- Concat jbossws-jboss600/jbossws.beans -->
+ <echo message="Concat jbossws-jboss600/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
<header trimleading="yes">
<deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
<fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2009-01-08 16:37:42 UTC (rev 8995)
@@ -44,7 +44,7 @@
public static Test suite()
{
- String serverJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-wsse-sign-encrypt-50.war" : "jaxws-samples-wsse-sign-encrypt.war";
+ String serverJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-wsse-sign-encrypt-50.war" : "jaxws-samples-wsse-sign-encrypt.war";
return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt-client.jar," + serverJar);
}
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2009-01-08 16:37:42 UTC (rev 8995)
@@ -44,7 +44,7 @@
public static Test suite()
{
- String serverJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war";
+ String serverJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war";
return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign-client.jar," + serverJar);
}
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -489,23 +489,23 @@
</plugins>
</build>
</profile>
-
+
<!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
-->
<profile>
- <id>jboss501</id>
+ <id>jboss510</id>
<properties>
- <jboss.version>5.0.1-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
+ <jboss.version>5.1.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
</properties>
<dependencies>
<!-- JBWS-2263 -->
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
+ <artifactId>jbossws-jboss510x</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -541,13 +541,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -564,17 +564,17 @@
Descr: JBoss-5.1.0 specific options
-->
<profile>
- <id>jboss510</id>
+ <id>jboss600</id>
<properties>
- <jboss.version>5.1.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.version>6.0.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
<!-- JBWS-2263 -->
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
+ <artifactId>jbossws-jboss600x</artifactId>
</dependency>
<!--dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -610,13 +610,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-08 16:37:42 UTC (rev 8995)
@@ -1,45 +0,0 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1949] Metro MTOM ignores content-type on attachment part
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws2183/**
-
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
-
-# [JBWS-2347] Rewrite @WebFault related tests
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2348] Fix jbws1969 testcase
-org/jboss/test/ws/jaxws/jbws1969/**
-
-# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2400] Rewrite large attachment testcase
-org/jboss/test/ws/jaxws/jbws2000/**
Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-08 16:37:42 UTC (rev 8995)
@@ -0,0 +1,45 @@
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-1949] Metro MTOM ignores content-type on attachment part
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
+
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/pom.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -45,7 +45,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.8.GA</jbossws.common.version>
+ <jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
<jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
@@ -54,8 +54,8 @@
<jbossws.jboss500.version>3.0.5.GA</jbossws.jboss500.version>
<!-- JBWS-2263 -->
<!-- START -->
- <jbossws.jboss501.version>3.0.5.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.0.5.GA</jbossws.jboss510.version>
+ <jbossws.jboss600.version>3.0.6-SNAPSHOT</jbossws.jboss600.version>
<!-- END -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -154,25 +154,25 @@
<!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
- <version>${jbossws.jboss501.version}</version>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss501CR1</artifactId>
- <version>${jbossws.jboss501.version}</version>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss600x</artifactId>
+ <version>${jbossws.jboss600.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss510x</artifactId>
- <version>${jbossws.jboss510.version}</version>
+ <artifactId>jbossws-jboss600x</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -492,26 +492,26 @@
</profile>
<!--
- Name: jboss501
- Descr: JBoss-5.0.1 specific options
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
-->
<profile>
- <id>jboss501</id>
+ <id>jboss510</id>
<properties>
- <jbossws.integration.target>jboss501</jbossws.integration.target>
- <jboss.home>${jboss501.home}</jboss.home>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.home>${jboss510.home}</jboss.home>
</properties>
</profile>
<!--
- Name: jboss510
- Descr: JBoss-5.1.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss510</id>
+ <id>jboss600</id>
<properties>
- <jbossws.integration.target>jboss510</jbossws.integration.target>
- <jboss.home>${jboss510.home}</jboss.home>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/profiles.xml.example 2009-01-08 16:37:42 UTC (rev 8995)
@@ -15,8 +15,8 @@
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.CR1</jboss501.home>
- <jboss510.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss510.home>/home/tdiesler/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss600.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/metro/trunk/src/main/distro/Install.txt
===================================================================
--- stack/metro/trunk/src/main/distro/Install.txt 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/src/main/distro/Install.txt 2009-01-08 16:37:42 UTC (rev 8995)
@@ -16,6 +16,7 @@
ant deploy-jboss42x
ant deploy-jboss50x
ant deploy-jboss51x
+ ant deploy-jboss60x
4.) Execute the samples to verify your installation
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-01-08 16:37:42 UTC (rev 8995)
@@ -7,10 +7,10 @@
jboss423.home=(a)jboss423.home@
jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
-jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
+jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -138,36 +138,51 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
+ <!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
- <target name="target-jboss501">
+ <target name="deploy-structure-jboss51" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro51" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss510 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss510">
<property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss501"/>
+ <property name="jbossws.integration.target" value="jboss510"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <copy todir="${jboss501.home}" overwrite="true">
+ <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510">
+ <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
+ <copy todir="${jboss510.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
+ <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
+ <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.1.x -->
+ <!-- Prepare Deployment Structure JBoss-6.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss51" depends="prepare-deploy">
+ <target name="deploy-structure-jboss60" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-metro51" inheritall="false">
+ <antcall target="deploy-jbossws-metro60" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
@@ -177,27 +192,27 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss510 -->
+ <!-- Deployment JBoss600 -->
<!-- ================================================================== -->
- <target name="target-jboss510">
+ <target name="target-jboss600">
<property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss510"/>
+ <property name="jbossws.integration.target" value="jboss600"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510">
- <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
- <copy todir="${jboss510.home}" overwrite="true">
+ <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">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
- <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <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-jbossws51 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -45,33 +45,33 @@
<property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
<property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
<property name="jboss510.lib" value="${jboss510.home}/lib"/>
<property name="jboss510.client" value="${jboss510.home}/client"/>
<property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/>
<property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/>
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.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}"/>
+ <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
+ <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
+ <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/>
<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="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss424.available" file="${jboss424.available.file}"/>
<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="jboss600.available" file="${jboss600.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -56,7 +56,6 @@
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
<condition property="jbossws.integration.jboss51" value="true">
@@ -64,6 +63,11 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss60" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
+ </or>
+ </condition>
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-08 16:27:57 UTC (rev 8994)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-08 16:37:42 UTC (rev 8995)
@@ -101,22 +101,22 @@
<!-- START -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
+ <include>org.jboss.ws:jbossws-jboss510x:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
<!-- END -->
15 years, 5 months
- 1
- 0
JBossWS SVN: r8994 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-08 11:27:57 -0500 (Thu, 08 Jan 2009)
New Revision: 8994
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
Log:
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2009-01-08 16:25:34 UTC (rev 8993)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2009-01-08 16:27:57 UTC (rev 8994)
@@ -49,7 +49,7 @@
public static Test suite()
{
//here in the AS 5 jar we use <service-qname> that does not exist in AS 4.2.x
- return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss5OrGreater()() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
+ return new JBossWSTestSetup(JBWS1841TestCase.class, new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-jbws1841-as5.jar" : "jaxws-jbws1841.jar");
}
protected void setUp() throws Exception
15 years, 5 months
- 1
- 0