JBossWS SVN: r8873 - in spi: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-12 08:52:46 -0500 (Fri, 12 Dec 2008)
New Revision: 8873
Added:
spi/tags/jbossws-spi-1.0.7.GA/
Removed:
spi/branches/jbossws-spi-1.0.7/
Log:
tagging spi
Copied: spi/tags/jbossws-spi-1.0.7.GA (from rev 8872, spi/branches/jbossws-spi-1.0.7)
16 years
- 1
- 0
JBossWS SVN: r8872 - in framework/trunk/hudson/hudson-home/jobs: CXF-ALL-Except-Distros and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-12-12 08:51:08 -0500 (Fri, 12 Dec 2008)
New Revision: 8872
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
Log:
[JBWS-2420] Do not run integration jobs every day as their tests are included in core jobs.
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2008-12-12 13:51:07 UTC (rev 8871)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2008-12-12 13:51:08 UTC (rev 8872)
@@ -7,7 +7,6 @@
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-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-4.2.4, CXF-Integration-AS-5.0.0, CXF-Integration-AS-5.0.1, CXF-Integration-AS-5.1.0
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml 2008-12-12 13:51:07 UTC (rev 8871)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml 2008-12-12 13:51:08 UTC (rev 8872)
@@ -5,7 +5,6 @@
<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-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-4.2.4, CXF-Integration-AS-5.0.0, CXF-Integration-AS-5.0.1, CXF-Integration-AS-5.1.0
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2008-12-12 13:51:07 UTC (rev 8871)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2008-12-12 13:51:08 UTC (rev 8872)
@@ -10,8 +10,6 @@
, 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-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-Integration-AS-4.2.2, Metro-Integration-AS-4.2.2-JDK6, Metro-Integration-AS-4.2.3, Metro-Integration-AS-4.2.3-JDK6, Metro-Integration-AS-4.2.4, Metro-Integration-AS-4.2.4-JDK6
- , Metro-Integration-AS-5.0.0, Metro-Integration-AS-5.0.0-JDK6, Metro-Integration-AS-5.0.1, Metro-Integration-AS-5.0.1-JDK6, Metro-Integration-AS-5.1.0, Metro-Integration-AS-5.1.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml 2008-12-12 13:51:07 UTC (rev 8871)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml 2008-12-12 13:51:08 UTC (rev 8872)
@@ -6,8 +6,6 @@
<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-Integration-AS-4.2.2, Metro-Integration-AS-4.2.2-JDK6, Metro-Integration-AS-4.2.3, Metro-Integration-AS-4.2.3-JDK6, Metro-Integration-AS-4.2.4, Metro-Integration-AS-4.2.4-JDK6
- , Metro-Integration-AS-5.0.0, Metro-Integration-AS-5.0.0-JDK6, Metro-Integration-AS-5.0.1, Metro-Integration-AS-5.0.1-JDK6, Metro-Integration-AS-5.1.0, Metro-Integration-AS-5.1.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2008-12-12 13:51:07 UTC (rev 8871)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2008-12-12 13:51:08 UTC (rev 8872)
@@ -10,8 +10,6 @@
, 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-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-Integration-AS-4.2.2, Native-Integration-AS-4.2.2-JDK6, Native-Integration-AS-4.2.3, Native-Integration-AS-4.2.3-JDK6, Native-Integration-AS-4.2.4, Native-Integration-AS-4.2.4-JDK6
- , Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.0-JDK6, Native-Integration-AS-5.0.1, Native-Integration-AS-5.0.1-JDK6, Native-Integration-AS-5.1.0, Native-Integration-AS-5.1.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml 2008-12-12 13:51:07 UTC (rev 8871)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml 2008-12-12 13:51:08 UTC (rev 8872)
@@ -6,8 +6,6 @@
<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-Integration-AS-4.2.2, Native-Integration-AS-4.2.2-JDK6, Native-Integration-AS-4.2.3, Native-Integration-AS-4.2.3-JDK6, Native-Integration-AS-4.2.4, Native-Integration-AS-4.2.4-JDK6
- , Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.0-JDK6, Native-Integration-AS-5.0.1, Native-Integration-AS-5.0.1-JDK6, Native-Integration-AS-5.1.0, Native-Integration-AS-5.1.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
16 years
- 1
- 0
JBossWS SVN: r8871 - spi/branches/jbossws-spi-1.0.7.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-12 08:51:07 -0500 (Fri, 12 Dec 2008)
New Revision: 8871
Modified:
spi/branches/jbossws-spi-1.0.7/pom.xml
Log:
SNAPSHOT -> GA
Modified: spi/branches/jbossws-spi-1.0.7/pom.xml
===================================================================
--- spi/branches/jbossws-spi-1.0.7/pom.xml 2008-12-12 13:05:28 UTC (rev 8870)
+++ spi/branches/jbossws-spi-1.0.7/pom.xml 2008-12-12 13:51:07 UTC (rev 8871)
@@ -7,7 +7,7 @@
<artifactId>jbossws-spi</artifactId>
<packaging>jar</packaging>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.7.GA</version>
<!-- Parent -->
<parent>
@@ -18,9 +18,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/branches/jbossws-spi-1...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/branches/jbossws-spi-1.0.7</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/branches/jbossws-spi-1.0.7</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-1.0.7</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-1.0.7</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-1.0.7</url>
</scm>
<!-- Properties -->
16 years
- 1
- 0
JBossWS SVN: r8870 - in framework/trunk/hudson/hudson-home/jobs: Release-Matrix-Step2 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-12 08:05:28 -0500 (Fri, 12 Dec 2008)
New Revision: 8870
Modified:
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
Log:
[JBWS-2420] disable release matrices by default
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-12-12 13:05:28 UTC (rev 8870)
@@ -12,9 +12,9 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector">
- <hudson.triggers.TimerTrigger>
+ <!--hudson.triggers.TimerTrigger>
<spec>0 19 * * *</spec>
- </hudson.triggers.TimerTrigger>
+ </hudson.triggers.TimerTrigger-->
</triggers>
<logRotator>
<daysToKeep>28</daysToKeep>
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2008-12-12 13:05:28 UTC (rev 8870)
@@ -12,9 +12,9 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector">
- <hudson.triggers.TimerTrigger>
+ <!--hudson.triggers.TimerTrigger>
<spec>0 20 * * *</spec>
- </hudson.triggers.TimerTrigger>
+ </hudson.triggers.TimerTrigger-->
</triggers>
<logRotator>
<daysToKeep>28</daysToKeep>
16 years
- 1
- 0
JBossWS SVN: r8869 - in framework/trunk/hudson/hudson-home: jobs and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-12 07:29:12 -0500 (Fri, 12 Dec 2008)
New Revision: 8869
Added:
framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/
framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/
framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/
framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml
framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/
framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/
framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
Modified:
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
Log:
[JBWS-2420] created Working-Days-Matrix and Weekend-Matrix
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2008-12-11 19:02:28 UTC (rev 8868)
+++ framework/trunk/hudson/hudson-home/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -57,6 +57,7 @@
<jobNames class="tree-set">
<no-comparator/>
<string>Native-ALL</string>
+ <string>Native-ALL-Except-Distros</string>
<string>Native-Core-AS-4.2.2</string>
<string>Native-Core-AS-4.2.2-JDK6</string>
<string>Native-Core-AS-4.2.3</string>
@@ -122,6 +123,7 @@
<jobNames class="tree-set">
<no-comparator/>
<string>Metro-ALL</string>
+ <string>Metro-ALL-Except-Distros</string>
<string>Metro-Core-AS-4.2.2</string>
<string>Metro-Core-AS-4.2.2-JDK6</string>
<string>Metro-Core-AS-4.2.3</string>
@@ -187,6 +189,7 @@
<jobNames class="tree-set">
<no-comparator/>
<string>CXF-ALL</string>
+ <string>CXF-ALL-Except-Distros</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>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL-Except-Distros/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <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-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-4.2.4, CXF-Integration-AS-5.0.0, CXF-Integration-AS-5.0.1, CXF-Integration-AS-5.1.0
+ </childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <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 all CXF tests except distributions jobs.</description>
+ <actions class="vector"/>
+</project>
Modified: framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml 2008-12-11 19:02:28 UTC (rev 8868)
+++ framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -30,11 +30,7 @@
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.TimerTrigger>
- <spec>0 19 * * 6</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
+ <triggers class="vector"/>
<logRotator>
<daysToKeep>-1</daysToKeep>
<numToKeep>20</numToKeep>
@@ -44,4 +40,3 @@
<description>Deletes user local maven repository</description>
<actions class="vector"/>
</project>
-
Added: framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL-Except-Distros/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <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-Integration-AS-4.2.2, Metro-Integration-AS-4.2.2-JDK6, Metro-Integration-AS-4.2.3, Metro-Integration-AS-4.2.3-JDK6, Metro-Integration-AS-4.2.4, Metro-Integration-AS-4.2.4-JDK6
+ , Metro-Integration-AS-5.0.0, Metro-Integration-AS-5.0.0-JDK6, Metro-Integration-AS-5.0.1, Metro-Integration-AS-5.0.1-JDK6, Metro-Integration-AS-5.1.0, Metro-Integration-AS-5.1.0-JDK6
+ </childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <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 all Metro tests except distribution jobs.</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 2008-12-11 19:02:28 UTC (rev 8868)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -27,6 +27,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Run all CXF tests</description>
+ <description>Run all Native tests</description>
<actions class="vector"/>
</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL-Except-Distros/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <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-Integration-AS-4.2.2, Native-Integration-AS-4.2.2-JDK6, Native-Integration-AS-4.2.3, Native-Integration-AS-4.2.3-JDK6, Native-Integration-AS-4.2.4, Native-Integration-AS-4.2.4-JDK6
+ , Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.0-JDK6, Native-Integration-AS-5.0.1, Native-Integration-AS-5.0.1-JDK6, Native-Integration-AS-5.1.0, Native-Integration-AS-5.1.0-JDK6
+ </childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <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 all Native tests except distribution jobs.</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector"/>
+ <publishers class="vector">
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Maven-Repository-Clean, 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>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector">
+ <hudson.triggers.TimerTrigger>
+ <spec>0 19 * * 6</spec>
+ </hudson.triggers.TimerTrigger>
+ </triggers>
+ <logRotator>
+ <daysToKeep>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Weekend matrix executes all the existing jobs.</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2008-12-12 12:29:12 UTC (rev 8869)
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <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-Except-Distros, CXF-ALL-Except-Distros, Metro-ALL-Except-Distros</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.NullSCM"/>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector">
+ <hudson.triggers.TimerTrigger>
+ <spec>0 19 * * 1-5</spec>
+ </hudson.triggers.TimerTrigger>
+ </triggers>
+ <logRotator>
+ <daysToKeep>28</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Working days matrix executes only selected hudson jobs.</description>
+ <actions class="vector"/>
+</project>
16 years
- 1
- 0
JBossWS SVN: r8868 - framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-12-11 14:02:28 -0500 (Thu, 11 Dec 2008)
New Revision: 8868
Modified:
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
Log:
Running Metro jobs last
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2008-12-11 19:02:28 UTC (rev 8868)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Metro-ALL, Native-ALL, CXF-ALL</childProjects>
+ <childProjects>Native-ALL, CXF-ALL, Metro-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
16 years, 1 month
- 1
- 0
JBossWS SVN: r8867 - in framework/trunk/hudson: hudson-home and 28 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 11:04:03 -0500 (Thu, 11 Dec 2008)
New Revision: 8867
Added:
framework/trunk/hudson/hudson-home/jobs/AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/hudson-home/config.xml
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/Metro-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
Log:
adding hudson JBossAS 510 jobs
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/ant.properties.example 2008-12-11 16:04:03 UTC (rev 8867)
@@ -46,6 +46,10 @@
hudson.jboss501.build=jboss-5.0.1.CR1
hudson.jboss501.rev=HEAD
+hudson.jboss510.url=http://anonsvn.jboss.org/repos/jbossas/trunk
+hudson.jboss510.build=jboss-5.1.0.Beta1
+hudson.jboss510.rev=HEAD
+
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/hudson-home/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -18,6 +18,7 @@
<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><td colspan=2></td></tr>
</table>
]]>
@@ -26,7 +27,7 @@
<slaves/>
<quietPeriod>5</quietPeriod>
<views>
-
+
<!-- AS Tests -->
<view>
<owner reference="../../.."/>
@@ -38,6 +39,7 @@
<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>
</jobNames>
<name>AS Tests</name>
<description>
@@ -48,7 +50,7 @@
]]>
</description>
</view>
-
+
<!-- Native Tests -->
<view>
<owner reference="../../.."/>
@@ -65,6 +67,8 @@
<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-Distro-AS-4.2.2</string>
<string>Native-Distro-AS-4.2.2-JDK6</string>
<string>Native-Distro-AS-4.2.3</string>
@@ -75,6 +79,8 @@
<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-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>
@@ -85,6 +91,8 @@
<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-Integration-AS-4.2.2</string>
<string>Native-Integration-AS-4.2.2-JDK6</string>
<string>Native-Integration-AS-4.2.3</string>
@@ -95,6 +103,8 @@
<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>
</jobNames>
<name>Native Tests</name>
<description>
@@ -105,7 +115,7 @@
]]>
</description>
</view>
-
+
<!-- Metro Tests-->
<view>
<owner reference="../../.."/>
@@ -122,6 +132,8 @@
<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-Distro-AS-4.2.2</string>
<string>Metro-Distro-AS-4.2.2-JDK6</string>
<string>Metro-Distro-AS-4.2.3</string>
@@ -132,6 +144,8 @@
<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-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>
@@ -142,6 +156,8 @@
<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-Integration-AS-4.2.2</string>
<string>Metro-Integration-AS-4.2.2-JDK6</string>
<string>Metro-Integration-AS-4.2.3</string>
@@ -152,6 +168,8 @@
<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>
</jobNames>
<name>Metro Tests</name>
<description>
@@ -162,7 +180,7 @@
]]>
</description>
</view>
-
+
<!-- CXF Tests-->
<view>
<owner reference="../../.."/>
@@ -174,21 +192,25 @@
<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-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-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-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>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -199,7 +221,7 @@
]]>
</description>
</view>
-
+
<!-- Release QA -->
<view>
<owner reference="../../.."/>
@@ -221,11 +243,12 @@
<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></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></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></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></tr>
</table>
]]>
</description>
</view>
-
+
<!-- Target Container -->
<view>
<owner reference="../../.."/>
@@ -236,6 +259,7 @@
<string>AS-4.2.4</string>
<string>AS-5.0.0</string>
<string>AS-5.0.1</string>
+ <string>AS-5.1.0</string>
</jobNames>
<name>Target Container</name>
<description> <![CDATA[
@@ -243,6 +267,6 @@
]]>
</description>
</view>
-
+
</views>
-</hudson>
\ No newline at end of file
+</hudson>
Added: framework/trunk/hudson/hudson-home/jobs/AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+SVNBASE=JBossAS-5.1.0
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r(a)hudson.jboss510.rev@ $SVNBASE
+#else
+# svn co -r(a)hudson.jboss510.rev@ @hudson.jboss510.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+./build/build.sh clean main
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/(a)hudson.jboss510.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss510.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.jboss510.url@</remote>
+ <local>JBossAS-5.1.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-5.1.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 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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</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.0.1, AS-Tests-AS-5.1.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Added: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.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 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -4,10 +4,10 @@
<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-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-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-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-4.2.4, CXF-Integration-AS-5.0.0, CXF-Integration-AS-5.0.1
+ 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-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-4.2.4, CXF-Integration-AS-5.0.0, CXF-Integration-AS-5.0.1, CXF-Integration-AS-5.1.0
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-cxf
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.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 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -4,14 +4,14 @@
<publishers class="vector">
<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-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-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-Integration-AS-4.2.2, Metro-Integration-AS-4.2.2-JDK6, Metro-Integration-AS-4.2.3, Metro-Integration-AS-4.2.3-JDK6, Metro-Integration-AS-4.2.4
- , Metro-Integration-AS-4.2.4-JDK6, Metro-Integration-AS-5.0.0, Metro-Integration-AS-5.0.0-JDK6, Metro-Integration-AS-5.0.1, Metro-Integration-AS-5.0.1-JDK6
+ 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-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-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-Integration-AS-4.2.2, Metro-Integration-AS-4.2.2-JDK6, Metro-Integration-AS-4.2.3, Metro-Integration-AS-4.2.3-JDK6, Metro-Integration-AS-4.2.4, Metro-Integration-AS-4.2.4-JDK6
+ , Metro-Integration-AS-5.0.0, Metro-Integration-AS-5.0.0-JDK6, Metro-Integration-AS-5.0.1, Metro-Integration-AS-5.0.1-JDK6, Metro-Integration-AS-5.1.0, Metro-Integration-AS-5.1.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0 with JDK6</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-metro
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.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 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -4,10 +4,14 @@
<publishers class="vector">
<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-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-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-Integration-AS-4.2.2, Native-Integration-AS-4.2.2-JDK6, Native-Integration-AS-4.2.3, Native-Integration-AS-4.2.3-JDK6, Native-Integration-AS-4.2.4, Native-Integration-AS-4.2.4-JDK6, Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.0-JDK6, Native-Integration-AS-5.0.1, Native-Integration-AS-5.0.1-JDK6
+ 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-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-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-Integration-AS-4.2.2, Native-Integration-AS-4.2.2-JDK6, Native-Integration-AS-4.2.3, Native-Integration-AS-4.2.3-JDK6, Native-Integration-AS-4.2.4, Native-Integration-AS-4.2.4-JDK6
+ , Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.0-JDK6, Native-Integration-AS-5.0.1, Native-Integration-AS-5.0.1-JDK6, Native-Integration-AS-5.1.0, Native-Integration-AS-5.1.0-JDK6
</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.0</description>
+ <actions class="vector"/>
+</project>
Added: framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-5.1.0-JDK6/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-5.1.0-JDK6
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKDIR=$WORKSPACE/stack-native
+JBOSS_TARGET=jboss510
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.1.0/workspace/JBossAS-5.1.0/build/output/(a)hudson.jboss510.build@
+ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss510.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-jboss510
+
+# 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.1.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 2008-12-11 14:57:12 UTC (rev 8866)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2008-12-11 16:04:03 UTC (rev 8867)
@@ -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-Tests-ALL</childProjects>
+ <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>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
16 years, 1 month
- 1
- 0
JBossWS SVN: r8866 - in stack/native/trunk: modules/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 09:57:12 -0500 (Thu, 11 Dec 2008)
New Revision: 8866
Added:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
Removed:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
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/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-bin-dist.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding support for JBossAS 510
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/build.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -10,7 +10,7 @@
<!-- ====================================================================== -->
<project basedir="." name="JBossWS-Native">
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
@@ -20,15 +20,15 @@
<property name="stack.output.dir" value="${stack.dir}/target"/>
<property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/>
<property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
-
+
<import file="${stack.distro.dir}/build-setup.xml"/>
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
-
- <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/>
+
+ <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
<property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
@@ -66,7 +66,10 @@
<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>
+
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/>
@@ -74,52 +77,54 @@
<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}"/>
+
<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}"/>
</target>
-
+
<target name="init" depends="mvn-settings,prepare,os-init">
-
+
<xmlproperty file="${stack.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
-
+
<echo message="java.version=${java.version}"/>
<echo message="version.id=${version.id}"/>
<echo message="integration.target=${jbossws.integration.target}"/>
-
+
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Distribution -->
<!-- ================================================================== -->
-
+
<target name="prepare-deploy" depends="prepare,os-init">
-
+
<!-- Use a system property to overwrite the empty default value -->
<property name="maven.opts" value=""/>
-
+
<echo/>
<echo message="${mvn} ${maven.opts} package assembly:directory"/>
<echo/>
-
+
<delete dir="${deploy.artifacts.dir}"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
<arg line="${maven.opts} package assembly:directory"/>
</exec>
</target>
-
+
<target name="build-bin-dist" depends="prepare-deploy,os-init" description="Build the binary distribution">
<echo/>
<echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/>
<echo/>
-
+
<delete dir="${stack.output.dir}/jbossws-native-bin-dist"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
<arg line="${maven.opts} -Pbindist package assembly:directory"/>
@@ -132,12 +137,12 @@
prefix="jbossws-native-bin-dist"/>
</zip>
</target>
-
+
<target name="build-src-dist" depends="prepare-deploy,os-init" description="Build the source distribution">
<echo/>
<echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/>
<echo/>
-
+
<delete dir="${stack.output.dir}/jbossws-native-src-dist"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
<arg line="${maven.opts} -Psrcdist package assembly:directory"/>
@@ -150,5 +155,5 @@
prefix="jbossws-native-src-dist"/>
</zip>
</target>
-
+
</project>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/modules/core/pom.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -209,8 +209,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
</artifactItem>
- <!-- [JBWS-2263] -->
- <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
@@ -219,6 +217,8 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
</artifactItem>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501CR1</artifactId>
@@ -227,6 +227,14 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ </artifactItem>
<!-- END -->
</artifactItems>
</configuration>
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 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -10,20 +10,20 @@
<!-- ====================================================================== -->
<project default="main">
-
+
<property name="project.resources.directory" value="${basedir}/src/main/resources"/>
<property name="project.build.directory" value="${basedir}/target"/>
<property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
-
+
<property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="init">
</target>
-
+
<!-- Compile resource files -->
<target name="main" depends="init">
@@ -38,7 +38,7 @@
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
+
<!-- Concat jbossws-jboss423/jbossws.beans -->
<echo message="Concat jbossws-jboss423/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
@@ -50,7 +50,7 @@
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
+
<!-- Concat jbossws-jboss424/jbossws.beans -->
<echo message="Concat jbossws-jboss424/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml">
@@ -62,7 +62,7 @@
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
+
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
@@ -72,7 +72,7 @@
<footer trimleading="yes">
</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">
@@ -82,7 +82,17 @@
<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">
+ <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>
+
</target>
-
+
</project>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/modules/management/pom.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -1,20 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack Native Management</name>
<artifactId>jbossws-native-management</artifactId>
<packaging>war</packaging>
-
+
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
<version>3.0.5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<dependencies>
- <!--
+ <!--
These runtime dependencies are picked up by the assembly-deploy-artifacts
descriptor. They have no real relevants to this module.
-->
@@ -22,7 +22,7 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
@@ -45,18 +45,23 @@
<artifactId>jbossws-jboss424x</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- [JBWS-2263] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501CR1</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
@@ -65,7 +70,7 @@
<type>sar</type>
</dependency>
</dependencies>
-
+
<!-- Build -->
<build>
<plugins>
@@ -99,7 +104,7 @@
<filtering>true</filtering>
</resource>
</webResources>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
Added: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2008-12-11 14:57:12 UTC (rev 8866)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 14:57:12 UTC (rev 8866)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
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 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -10,8 +10,8 @@
<!-- ====================================================================== -->
<project>
-
- <!--
+
+ <!--
These patterns should be common for all supported containers.
All jars must also be declared in component-info.xml to ensure
that the AS build uses the same version.
@@ -26,7 +26,7 @@
<include name="**/wstools.bat"/>
<include name="**/wstools.sh"/>
</patternset>
-
+
<patternset id="jbossws.client.patternset">
<include name="**/FastInfoset.jar"/>
<include name="**/jaxb-api.jar"/>
@@ -51,11 +51,11 @@
<include name="**/wsdl4j.jar"/>
<include name="**/wstx.jar"/>
</patternset>
-
+
<patternset id="jbossws.lib.patternset">
<include name="**/nothing-to-deploy"/>
</patternset>
-
+
<patternset id="jbossws.lib.endorsed.patternset">
<include name="**/jbossws-native-jaxrpc.jar"/>
<include name="**/jbossws-native-jaxws.jar"/>
@@ -63,7 +63,7 @@
<include name="**/jbossws-native-saaj.jar"/>
<include name="**/jaxb-api.jar"/>
</patternset>
-
+
<patternset id="jbossws.server.lib.patternset">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
@@ -73,7 +73,7 @@
<include name="**/jbossws-native-saaj.jar"/>
<include name="**/jbossws-spi.jar"/>
</patternset>
-
+
<patternset id="jbossws.service.lib.patternset">
<include name="**/FastInfoset.jar"/>
<include name="**/jboss-jaxb-intros.jar"/>
@@ -83,11 +83,11 @@
<include name="**/wsdl4j.jar"/>
<include name="**/xmlsec.jar"/>
</patternset>
-
+
<!-- ================================================================== -->
<!-- Deploy Bin -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-bin">
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
@@ -100,11 +100,11 @@
</copy>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy Lib -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-lib42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -117,7 +117,7 @@
</copy>
</sequential>
</macrodef>
-
+
<macrodef name="macro-deploy-jbossws-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -134,11 +134,28 @@
</copy>
</sequential>
</macrodef>
-
+
+ <macrodef name="macro-deploy-jbossws-lib51">
+ <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-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-endorsed">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -151,11 +168,11 @@
</copy>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy Client -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-client42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -188,11 +205,29 @@
</copy>
</sequential>
</macrodef>
-
+
+ <macrodef name="macro-deploy-jbossws-client51">
+ <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 -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-server-lib42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -207,7 +242,7 @@
</copy>
</sequential>
</macrodef>
-
+
<macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -221,11 +256,25 @@
</copy>
</sequential>
</macrodef>
-
+
+ <macrodef name="macro-deploy-jbossws-server-lib51">
+ <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 -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-juddi-sar">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -244,11 +293,11 @@
</copy>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-sar42">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -283,7 +332,7 @@
</copy>
</sequential>
</macrodef>
-
+
<macrodef name="macro-deploy-jbossws-sar50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -298,11 +347,26 @@
</unzip>
</sequential>
</macrodef>
-
+
+ <macrodef name="macro-deploy-jbossws-sar51">
+ <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 -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-deploy-jbossws-deployers50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -346,6 +410,49 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-deployers51">
+ <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 -->
<!-- ================================================================== -->
@@ -361,7 +468,7 @@
<macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
-
+
<target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -371,33 +478,43 @@
<macro-deploy-jbossws-deployers50 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-native51" depends="check-parameters,deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar51 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <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-endorsed" if="HAVE_JDK_1.6">
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
-
+
<target name="check-parameters">
<fail message="artifactsdir must be specified" unless="artifactsdir"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
<fail message="installserver must be specified" unless="installserver"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-undeploy-jbossws42">
<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"/>
-
+
<!-- delete stale container integration jars -->
<delete>
<fileset dir="${jboss.server.home}">
@@ -407,18 +524,18 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
-
+
<!-- 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>
@@ -461,4 +578,43 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws51">
+ <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/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack Native Testsuite</name>
<artifactId>jbossws-native-testsuite</artifactId>
<packaging>pom</packaging>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws.native</groupId>
@@ -13,7 +13,7 @@
<version>3.0.5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<!-- Properties -->
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
@@ -27,13 +27,13 @@
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
-
+
<!-- Modules -->
<modules>
<module>native-tests</module>
<module>framework-tests</module>
</modules>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -93,7 +93,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<!-- Build -->
<build>
<testResources>
@@ -172,7 +172,7 @@
<property>
<name>jboss.home</name>
<value>${jboss.home}</value>
- </property>
+ </property>
<property>
<name>jbossws.integration.target</name>
<value>${jbossws.integration.target}</value>
@@ -226,13 +226,13 @@
</plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
-
- <!--
+
+ <!--
Name: debug
- Descr: Enable remote debuging for tests
+ Descr: Enable remote debuging for tests
-->
<profile>
<id>debug</id>
@@ -256,8 +256,8 @@
<surefire.jvm.args>${surefire.security.args} ${surefire.gc.args}</surefire.jvm.args>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: hudson
Descr: Ignore test failures on hudson
-->
@@ -275,9 +275,9 @@
</build>
</profile>
- <!--
+ <!--
Name: jboss422
- Descr: JBoss-4.2.2 specific options
+ Descr: JBoss-4.2.2 specific options
-->
<profile>
<id>jboss422</id>
@@ -314,10 +314,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss423
- Descr: JBoss-4.2.3 specific options
+ Descr: JBoss-4.2.3 specific options
-->
<profile>
<id>jboss423</id>
@@ -354,10 +354,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss424
- Descr: JBoss-4.2.4 specific options
+ Descr: JBoss-4.2.4 specific options
-->
<profile>
<id>jboss424</id>
@@ -394,10 +394,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss500
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.0 specific options
-->
<profile>
<id>jboss500</id>
@@ -468,10 +468,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: jboss501
- Descr: JBoss-5.0.1 specific options
+ Descr: JBoss-5.0.1 specific options
-->
<profile>
<id>jboss501</id>
@@ -542,13 +542,87 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
+ -->
+ <profile>
+ <id>jboss510</id>
+ <properties>
+ <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-jboss510x</artifactId>
+ </dependency>
+ <!--dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
+ </dependency-->
+ <!-- END -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.javaee.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <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>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
-
+
command line cannot overwrite pom properties
- http://jira.codehaus.org/browse/MNG-3546
+ http://jira.codehaus.org/browse/MNG-3546
-->
<profile>
<id>no-jboss-bind-address</id>
@@ -561,13 +635,13 @@
<jboss.bind.address>localhost</jboss.bind.address>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: no-jboss-server-instance
Descr: Set the default jboss.server.instance
-
+
command line cannot overwrite pom properties
- http://jira.codehaus.org/browse/MNG-3546
+ http://jira.codehaus.org/browse/MNG-3546
-->
<profile>
<id>no-jboss-server-instance</id>
@@ -581,5 +655,5 @@
</properties>
</profile>
</profiles>
-
+
</project>
Added: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt (rev 0)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2008-12-11 14:57:12 UTC (rev 8866)
@@ -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.*
+
+# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
+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 samples before AS50 goes final
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/pom.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -12,28 +12,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack Native</name>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
-
+
<version>3.0.5-SNAPSHOT</version>
-
+
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
<version>1.0.2.GA</version>
</parent>
-
+
<!-- Source Control Management -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection>
<url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
</scm>
-
+
<!-- Modules -->
<modules>
<module>modules/saaj</module>
@@ -45,7 +45,7 @@
<module>modules/management</module>
<module>modules/resources</module>
</modules>
-
+
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version>
@@ -54,10 +54,11 @@
<jbossws.jboss422.version>3.0.5-SNAPSHOT</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.5-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.0.5-SNAPSHOT</jbossws.jboss424.version>
+ <jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version>
<!-- [JBWS-2263] -->
<!-- START -->
- <jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.0.5-SNAPSHOT</jbossws.jboss510.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -80,11 +81,10 @@
<xalan.version>2.7.0</xalan.version>
<xerces.version>2.8.1</xerces.version>
</properties>
-
+
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
-
<!-- jbossws dependencies -->
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -108,7 +108,6 @@
<classifier>testsuite</classifier>
<type>zip</type>
</dependency>
-
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss422</artifactId>
@@ -171,8 +170,19 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- END -->
-
<!-- provided apis -->
<dependency>
<groupId>javax.activation</groupId>
@@ -204,7 +214,6 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
-
<!-- jboss provided -->
<dependency>
<groupId>javassist</groupId>
@@ -221,7 +230,6 @@
<artifactId>jboss-remoting</artifactId>
<version>${jboss.remoting.version}</version>
</dependency>
-
<!-- transitive dependencies -->
<dependency>
<groupId>commons-logging</groupId>
@@ -341,7 +349,7 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<!-- Plugins -->
<build>
<plugins>
@@ -390,7 +398,7 @@
</plugin>
</plugins>
</build>
-
+
<!-- Repositories -->
<repositories>
<repository>
@@ -408,13 +416,13 @@
</snapshots>
</repository>
</repositories>
-
+
<!-- Profiles -->
<profiles>
-
- <!--
+
+ <!--
Name: bindist
- Descr: Build the binary distribution
+ Descr: Build the binary distribution
-->
<profile>
<id>bindist</id>
@@ -434,10 +442,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: srcdist
- Descr: Build the source distribution
+ Descr: Build the source distribution
-->
<profile>
<id>srcdist</id>
@@ -458,9 +466,9 @@
</build>
</profile>
- <!--
+ <!--
Name: jboss422
- Descr: JBoss-4.2.2 specific options
+ Descr: JBoss-4.2.2 specific options
-->
<profile>
<id>jboss422</id>
@@ -469,10 +477,10 @@
<jboss.home>${jboss422.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: jboss423
- Descr: JBoss-4.2.3 specific options
+ Descr: JBoss-4.2.3 specific options
-->
<profile>
<id>jboss423</id>
@@ -481,7 +489,7 @@
<jboss.home>${jboss423.home}</jboss.home>
</properties>
</profile>
-
+
<!--
Name: jboss424
Descr: JBoss-4.2.4 specific options
@@ -494,9 +502,9 @@
</properties>
</profile>
- <!--
+ <!--
Name: jboss500
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.0 specific options
-->
<profile>
<id>jboss500</id>
@@ -505,10 +513,10 @@
<jboss.home>${jboss500.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
Name: jboss501
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.1 specific options
-->
<profile>
<id>jboss501</id>
@@ -517,10 +525,22 @@
<jboss.home>${jboss501.home}</jboss.home>
</properties>
</profile>
-
- <!--
+
+ <!--
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
+ -->
+ <profile>
+ <id>jboss510</id>
+ <properties>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.home>${jboss510.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jdk16
- Descr: Compile with jdk1.6
+ Descr: Compile with jdk1.6
-->
<profile>
<id>jdk16</id>
@@ -540,10 +560,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: smoketest
- Descr: Executes the smoke tests
+ Descr: Executes the smoke tests
-->
<profile>
<id>smoketest</id>
@@ -563,10 +583,10 @@
</plugins>
</build>
</profile>
-
- <!--
+
+ <!--
Name: testsuite
- Descr: Executes the testsuite
+ Descr: Executes the testsuite
-->
<profile>
<id>testsuite</id>
@@ -575,5 +595,5 @@
</modules>
</profile>
</profiles>
-
+
</project>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/profiles.xml.example 2008-12-11 14:57:12 UTC (rev 8866)
@@ -15,8 +15,9 @@
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/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_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.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>
</properties>
</profile>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/distro/Install.txt 2008-12-11 14:57:12 UTC (rev 8866)
@@ -15,6 +15,7 @@
ant deploy-jboss42x
ant deploy-jboss50x
+ ant deploy-jboss51x
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 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2008-12-11 14:57:12 UTC (rev 8866)
@@ -8,8 +8,9 @@
jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
+jboss510.home=(a)jboss510.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510]
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 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -10,11 +10,11 @@
<!-- ====================================================================== -->
<project>
-
+
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-4.2.x -->
<!-- ================================================================== -->
-
+
<target name="deploy-structure-jboss42" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-native42" inheritall="false">
@@ -42,12 +42,12 @@
</copy>
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
@@ -64,12 +64,12 @@
</copy>
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss424 -->
<!-- ================================================================== -->
@@ -86,16 +86,16 @@
</copy>
<chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424">
<fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
-
+
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-native50" inheritall="false">
@@ -106,7 +106,7 @@
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
@@ -123,12 +123,12 @@
</copy>
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
@@ -145,16 +145,53 @@
</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 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss51" 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 JBoss510 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss510">
+ <property name="jbossws.integration.target" value="jboss510"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </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">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss510.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>
+
+ <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
@@ -165,5 +202,5 @@
<replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
</sequential>
</macrodef>
-
+
</project>
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -10,13 +10,13 @@
<!-- ====================================================================== -->
<project>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
@@ -26,13 +26,13 @@
<property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
+
<property name="jboss423.lib" value="${jboss423.home}/lib"/>
<property name="jboss423.client" value="${jboss423.home}/client"/>
<property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
+
<property name="jboss424.lib" value="${jboss424.home}/lib"/>
<property name="jboss424.client" value="${jboss424.home}/client"/>
<property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/>
@@ -45,7 +45,7 @@
<property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
<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}"/>
@@ -53,21 +53,30 @@
<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="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"/>
<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}"/>
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
</target>
-
+
</project>
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/distro/build.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -10,11 +10,11 @@
<!-- ====================================================================== -->
<project basedir="." name="JBossWS-Native">
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<property name="build.dir" value="${basedir}/build"/>
<property name="docs.dir" value="${basedir}/docs"/>
<property name="output.dir" value="${basedir}/output"/>
@@ -23,26 +23,26 @@
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
<property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
-
+
<!-- Check if ant.properties is available -->
<available property="ant.properties.available" file="${basedir}/ant.properties"/>
<fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
<property file="${basedir}/ant.properties"/>
-
+
<import file="${build.dir}/build-setup.xml"/>
<import file="${build.dir}/build-deploy.xml"/>
<import file="${build.dir}/jbossws-deploy-macros.xml"/>
<import file="${tests.dir}/ant-import/build-testsuite.xml"/>
<import file="${build.dir}/build-project-gen.xml"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="init" depends="prepare">
-
+
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
@@ -59,13 +59,18 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
-
+ <condition property="jbossws.integration.jboss51" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
+ </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"/>
</target>
-
+
<target name="tests-init" depends="init,tests-classpath">
-
+
<path id="ws.stack.classpath">
<!-- Move the native API to the front of the classpath -->
<pathelement location="${thirdparty.dir}/jbossws-native-jaxws-ext.jar"/>
@@ -74,45 +79,45 @@
<pathelement location="${thirdparty.dir}/jbossws-native-saaj.jar"/>
<fileset dir="${thirdparty.dir}"/>
</path>
-
+
<path id="tests.extra.classpath">
</path>
-
+
<property name="jbossws.test.log" value="${tests.output.dir}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
-
+
<target name="tests-compile" depends="tests-init" description="Compile sources">
<macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Building -->
<!-- ================================================================== -->
-
+
<!-- Copy resources -->
<target name="tests-copy-resources" depends="tests-init">
<macro-copy-resources srcdir="${tests.dir}"/>
</target>
-
+
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
<ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
</target>
-
+
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
+
<!-- dummy targets -->
<target name="prepare-deploy" depends="init"/>
-
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
-
+
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${tests.output.dir}"/>
</target>
-
+
</project>
Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -40,7 +40,7 @@
<outputDirectory>build</outputDirectory>
<includes>
<include>jbossws-as5-default-deploy.conf</include>
- <include>jbossws-default-deploy.conf</include>
+ <include>jbossws-as4-default-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 14:02:10 UTC (rev 8865)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 14:57:12 UTC (rev 8866)
@@ -112,6 +112,16 @@
<include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>runtime</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ </includes>
+ </dependencySet>
<!-- END -->
</dependencySets>
</binaries>
16 years, 1 month
- 1
- 0
JBossWS SVN: r8865 - in stack/cxf/trunk: modules/management and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 09:02:10 -0500 (Thu, 11 Dec 2008)
New Revision: 8865
Added:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/Install.txt
stack/cxf/trunk/src/main/distro/ant.properties.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build-setup.xml
stack/cxf/trunk/src/main/distro/build.xml
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding support for JBossAS 510
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/build.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -29,7 +29,7 @@
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/>
+ <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
<property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
@@ -70,6 +70,9 @@
<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>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
@@ -78,6 +81,7 @@
<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}"/>
<echo/>
<echo message="jboss422.home=${jboss422.home}"/>
@@ -85,6 +89,7 @@
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
+ <echo message="jboss510.home=${jboss510.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/modules/management/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -45,18 +45,23 @@
<artifactId>jbossws-jboss424x</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- [JBWS-2263] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501CR1</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- END -->
<dependency>
<groupId>jboss.jaxr</groupId>
Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2008-12-11 14:02:10 UTC (rev 8865)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 14:02:10 UTC (rev 8865)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -141,6 +141,23 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-lib51">
+ <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-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -195,6 +212,24 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-client51">
+ <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 -->
<!-- ================================================================== -->
@@ -228,6 +263,20 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-server-lib51">
+ <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 JBossWS Service -->
<!-- ================================================================== -->
@@ -282,6 +331,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-cxf51-sar">
+ <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-cxf-management.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Deployers -->
<!-- ================================================================== -->
@@ -324,6 +388,44 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-deployers51">
+ <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 -->
<!-- ================================================================== -->
@@ -348,6 +450,15 @@
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
</target>
+ <target name="deploy-jbossws-cxf51" depends="check-parameters,deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ </target>
+
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
@@ -431,4 +542,40 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws51">
+ <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}"/>
+
+ </sequential>
+ </macrodef>
+
</project>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -185,8 +185,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
</artifactItem>
- <!-- JBWS-2263 -->
- <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
@@ -195,6 +193,8 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
</artifactItem>
+ <!-- JBWS-2263 -->
+ <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501CR1</artifactId>
@@ -203,6 +203,14 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ </artifactItem>
<!-- END -->
</artifactItems>
</configuration>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -10,23 +10,23 @@
<!-- ====================================================================== -->
<project default="main">
-
+
<property name="project.resources.directory" value="${basedir}/src/main/resources"/>
<property name="project.build.directory" value="${basedir}/target"/>
<property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
-
+
<property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="init">
</target>
-
+
<!-- Compile resource files -->
<target name="main" depends="init">
-
+
<!-- Concat jbossws-jboss422/jbossws.beans -->
<echo message="Concat jbossws-jboss422/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml">
@@ -38,7 +38,7 @@
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
+
<!-- Concat jbossws-jboss423/jbossws.beans -->
<echo message="Concat jbossws-jboss423/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
@@ -50,7 +50,7 @@
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
+
<!-- Concat jbossws-jboss424/jbossws.beans -->
<echo message="Concat jbossws-jboss424/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml">
@@ -62,7 +62,7 @@
<footer trimleading="yes">
</deployment> </footer>
</concat>
-
+
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
@@ -72,7 +72,7 @@
<footer trimleading="yes">
</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">
@@ -82,7 +82,17 @@
<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">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
</target>
-
+
</project>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -498,6 +498,71 @@
</build>
</profile>
+ <!--
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
+ -->
+ <profile>
+ <id>jboss510</id>
+ <properties>
+ <jboss.version>5.1.0-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
+ </properties>
+ <dependencies>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ </dependency>
+ <!--dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
+ </dependency-->
+ <!-- END -->
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.javaee.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <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>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt (rev 0)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2008-12-11 14:02:10 UTC (rev 8865)
@@ -0,0 +1,117 @@
+# Won't Fix: [CXF-1261] Handler does not see XOP message properly
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
+# Exclude endpoints with AS42 @SecurityDomain
+org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
+
+# TODO: Fix classpath to ClientLauncher
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# [CXF-1244] Application Exception not initialized properly
+org/jboss/test/ws/jaxws/samples/exception/**
+
+# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
+org/jboss/test/ws/jaxws/samples/httpbinding/**
+org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
+org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
+
+# [CXF-1253] CXF does not respect @HandlerChain on client SEI
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+
+# [CXF-1510] Cannot handle anonymous bare requests
+org/jboss/test/ws/jaxws/anonymous/**
+
+# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/namespace/**
+
+# [CXF-1513] NPE in JaxWsServiceConfiguration
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [CXF-1515] Bad Enumeration value 'extension restriction'
+org/jboss/test/ws/jaxws/jbws1505/**
+
+# [CXF-1516] Type inheritance with document/literal/wrapped
+org/jboss/test/ws/jaxws/jbws1702/**
+org/jboss/test/ws/jaxws/jbws1733/**
+
+# [CXF-1517] HTTP bindings for Provider
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [CXF-1518] Missing fault detail in messages from SLSB Provider
+org/jboss/test/ws/jaxws/jbws1815/**
+
+# [CXF-1519] Explicitly set the namespace of a WebFault
+org/jboss/test/ws/jaxws/jbws1904/**
+
+# [CXF-1520] MTOM chunked encoding transfer
+org/jboss/test/ws/jaxws/jbws2000/**
+
+# [CXF-1521] Exception handling with @WebFault annotation
+org/jboss/test/ws/jaxws/webfault/**
+
+# [CXF-1522] NPE in ServiceUtils
+org/jboss/test/ws/jaxws/jbws1566/**
+
+# [CXF-1623] Wrong AnnotationHandlerChainBuilder.protocolMatches() method implementation or preconditions
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
+
+# [CXF-1624] XmlSchemaException: Schema name conflict in collection
+org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
+
+# [JBWS-1178] Multiple virtual host and soap:address problem
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-1683] Fix JAXR samples for CXF
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# [JBWS-1774] Provide tools implementation for CXF
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/smoke/tools/**
+
+# [JBWS-2112] Cannot use CXF with endpoint API
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [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/**
+
+# [JBWS-2119] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+
+# [JBWS-2223] wsconsume for cxf build
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2330] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
+
+# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
Property changes on: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/pom.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -54,6 +54,7 @@
<!-- START -->
<jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.0.5-SNAPSHOT</jbossws.jboss510.version>
<!-- END -->
<cxf.version>2.1</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
@@ -158,6 +159,18 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- END -->
<!-- provided apis -->
@@ -482,7 +495,7 @@
<!--
Name: jboss501
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.1 specific options
-->
<profile>
<id>jboss501</id>
@@ -493,6 +506,18 @@
</profile>
<!--
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
+ -->
+ <profile>
+ <id>jboss510</id>
+ <properties>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.home>${jboss510.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/profiles.xml.example 2008-12-11 14:02:10 UTC (rev 8865)
@@ -14,8 +14,9 @@
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/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_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.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>
</properties>
</profile>
Modified: stack/cxf/trunk/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/src/main/distro/Install.txt 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/distro/Install.txt 2008-12-11 14:02:10 UTC (rev 8865)
@@ -15,6 +15,7 @@
ant deploy-jboss42x
ant deploy-jboss50x
+ ant deploy-jboss51x
4.) Execute the samples to verify your installation
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2008-12-11 14:02:10 UTC (rev 8865)
@@ -8,8 +8,9 @@
jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
+jboss510.home=(a)jboss510.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -10,11 +10,11 @@
<!-- ====================================================================== -->
<project>
-
+
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-4.2.x -->
<!-- ================================================================== -->
-
+
<target name="deploy-structure-jboss42" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf42" inheritall="false">
@@ -25,7 +25,7 @@
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
<!-- ================================================================== -->
@@ -42,12 +42,12 @@
</copy>
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
@@ -64,12 +64,12 @@
</copy>
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss424 -->
<!-- ================================================================== -->
@@ -86,16 +86,16 @@
</copy>
<chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424">
<fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
-
+
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf50" inheritall="false">
@@ -106,7 +106,7 @@
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
@@ -123,12 +123,12 @@
</copy>
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
@@ -145,16 +145,53 @@
</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 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss51" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-cxf51" 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="jbossws.integration.target" value="jboss510"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </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">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss510.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>
+
+ <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
@@ -165,5 +202,5 @@
<replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
</sequential>
</macrodef>
-
+
</project>
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -10,64 +10,73 @@
<!-- ====================================================================== -->
<project>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
-
+
<property name="jboss422.lib" value="${jboss422.home}/lib"/>
<property name="jboss422.client" value="${jboss422.home}/client"/>
<property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
+
<property name="jboss423.lib" value="${jboss423.home}/lib"/>
<property name="jboss423.client" value="${jboss423.home}/client"/>
<property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
+
<property name="jboss424.lib" value="${jboss424.home}/lib"/>
<property name="jboss424.client" value="${jboss424.home}/client"/>
<property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/>
<property name="jboss424.server.lib" value="${jboss424.server}/lib"/>
<property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/>
-
+
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
<property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
<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="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"/>
+
<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}"/>
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
</target>
-
+
</project>
\ No newline at end of file
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/distro/build.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -23,7 +23,7 @@
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
<property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- Check if ant.properties is available -->
@@ -59,6 +59,11 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss51" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
+ </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/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -40,7 +40,7 @@
<outputDirectory>build</outputDirectory>
<includes>
<include>jbossws-as5-default-deploy.conf</include>
- <include>jbossws-default-deploy.conf</include>
+ <include>jbossws-as4-default-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 12:38:08 UTC (rev 8864)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 14:02:10 UTC (rev 8865)
@@ -104,6 +104,16 @@
<include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>runtime</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ </includes>
+ </dependencySet>
<!-- END -->
</dependencySets>
</binaries>
16 years, 1 month
- 1
- 0
JBossWS SVN: r8864 - in stack/metro/trunk: modules/management and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-12-11 07:38:08 -0500 (Thu, 11 Dec 2008)
New Revision: 8864
Added:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
Removed:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
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/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-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
adding support for JBossAS 510
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/build.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -29,7 +29,7 @@
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/>
+ <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
<property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
@@ -70,6 +70,9 @@
<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>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
@@ -78,6 +81,7 @@
<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}"/>
<echo/>
<echo message="jboss422.home=${jboss422.home}"/>
@@ -85,6 +89,7 @@
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
+ <echo message="jboss510.home=${jboss510.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 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/modules/management/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -45,18 +45,23 @@
<artifactId>jbossws-jboss424x</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- [JBWS-2263] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501CR1</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
Added: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2008-12-11 12:38:08 UTC (rev 8864)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
Deleted: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 12:38:08 UTC (rev 8864)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml
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 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -152,6 +152,23 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-lib51">
+ <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-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -206,6 +223,24 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-client51">
+ <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 -->
<!-- ================================================================== -->
@@ -239,6 +274,20 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-server-lib51">
+ <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 -->
<!-- ================================================================== -->
@@ -313,6 +362,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-sar51">
+ <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 -->
<!-- ================================================================== -->
@@ -355,6 +419,44 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-deployers51">
+ <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 -->
<!-- ================================================================== -->
@@ -381,6 +483,16 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-metro51" depends="check-parameters,deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar51 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <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-endorsed" if="HAVE_JDK_1.6">
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
</target>
@@ -470,4 +582,43 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws51">
+ <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 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/modules/server/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -182,8 +182,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
</artifactItem>
- <!-- JBWS-2263 -->
- <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
@@ -192,6 +190,8 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
</artifactItem>
+ <!-- JBWS-2263 -->
+ <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501CR1</artifactId>
@@ -200,6 +200,14 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
+ </artifactItem>
<!-- END -->
</artifactItems>
</configuration>
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 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -83,6 +83,16 @@
</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">
+ <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>
+
</target>
</project>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -559,6 +559,75 @@
</build>
</profile>
+ <!--
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
+ -->
+ <profile>
+ <id>jboss510</id>
+ <properties>
+ <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-jboss510x</artifactId>
+ </dependency>
+ <!--dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
+ </dependency-->
+ <!-- END -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.javaee.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <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>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2008-12-11 12:38:08 UTC (rev 8864)
@@ -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-jboss510.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/pom.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -55,6 +55,7 @@
<!-- START -->
<jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version>
+ <jbossws.jboss510.version>3.0.5-SNAPSHOT</jbossws.jboss510.version>
<!-- END -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -163,6 +164,18 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss510x</artifactId>
+ <version>${jbossws.jboss510.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- END -->
<!-- provided apis -->
@@ -480,7 +493,7 @@
<!--
Name: jboss501
- Descr: JBoss-5.0.0 specific options
+ Descr: JBoss-5.0.1 specific options
-->
<profile>
<id>jboss501</id>
@@ -491,6 +504,18 @@
</profile>
<!--
+ Name: jboss510
+ Descr: JBoss-5.1.0 specific options
+ -->
+ <profile>
+ <id>jboss510</id>
+ <properties>
+ <jbossws.integration.target>jboss510</jbossws.integration.target>
+ <jboss.home>${jboss510.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/profiles.xml.example 2008-12-11 12:38:08 UTC (rev 8864)
@@ -1,8 +1,8 @@
<profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
<profiles>
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
+
+ <!-- This profile can also be defined in ~/.m2/settings.xml -->
<profile>
<id>jboss-home-profile</id>
<activation>
@@ -14,10 +14,11 @@
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/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_CR2/build/output/jboss-5.0.0.CR2</jboss500.home>
- <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.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>
</properties>
</profile>
-
+
</profiles>
</profilesXml>
Modified: stack/metro/trunk/src/main/distro/Install.txt
===================================================================
--- stack/metro/trunk/src/main/distro/Install.txt 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/distro/Install.txt 2008-12-11 12:38:08 UTC (rev 8864)
@@ -15,6 +15,7 @@
ant deploy-jboss42x
ant deploy-jboss50x
+ ant deploy-jboss51x
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 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2008-12-11 12:38:08 UTC (rev 8864)
@@ -8,8 +8,9 @@
jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
+jboss510.home=(a)jboss510.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510]
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 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -10,11 +10,11 @@
<!-- ====================================================================== -->
<project>
-
+
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-4.2.x -->
<!-- ================================================================== -->
-
+
<target name="deploy-structure-jboss42" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro42" inheritall="false">
@@ -25,7 +25,7 @@
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss422 -->
<!-- ================================================================== -->
@@ -44,12 +44,12 @@
</copy>
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
@@ -68,12 +68,12 @@
</copy>
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss424 -->
<!-- ================================================================== -->
@@ -92,16 +92,16 @@
</copy>
<chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424">
<fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
-
+
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro50" inheritall="false">
@@ -131,12 +131,12 @@
</copy>
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
@@ -155,16 +155,55 @@
</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 -->
+ <!-- ================================================================== -->
+
+ <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="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-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="${jboss510.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>
+
+ <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
@@ -175,5 +214,5 @@
<replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
</sequential>
</macrodef>
-
+
</project>
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -10,63 +10,72 @@
<!-- ====================================================================== -->
<project>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
-
+
<property name="jboss422.lib" value="${jboss422.home}/lib"/>
<property name="jboss422.client" value="${jboss422.home}/client"/>
<property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
<property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
<property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
+
<property name="jboss423.lib" value="${jboss423.home}/lib"/>
<property name="jboss423.client" value="${jboss423.home}/client"/>
<property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
+
<property name="jboss424.lib" value="${jboss424.home}/lib"/>
<property name="jboss424.client" value="${jboss424.home}/client"/>
<property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/>
<property name="jboss424.server.lib" value="${jboss424.server}/lib"/>
<property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/>
-
+
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
<property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/>
<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="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"/>
+
<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}"/>
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
</target>
-
+
</project>
\ No newline at end of file
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/distro/build.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -22,7 +22,7 @@
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
<property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
@@ -59,6 +59,11 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
+ <condition property="jbossws.integration.jboss51" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
+ </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-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -40,7 +40,7 @@
<outputDirectory>build</outputDirectory>
<includes>
<include>jbossws-as5-default-deploy.conf</include>
- <include>jbossws-default-deploy.conf</include>
+ <include>jbossws-as4-default-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 12:26:08 UTC (rev 8863)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 12:38:08 UTC (rev 8864)
@@ -109,6 +109,16 @@
<include>org.jboss.ws:jbossws-jboss501CR1:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>runtime</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss510x:jar</include>
+ </includes>
+ </dependencySet>
<!-- END -->
</dependencySets>
</binaries>
16 years, 1 month
- 1
- 0