Author: thomas.diesler(a)jboss.com
Date: 2009-11-22 09:28:03 -0500 (Sun, 22 Nov 2009)
New Revision: 96683
Added:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/
Removed:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
Log:
Replace AS520 by AS600M1
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-11-22 13:47:00 UTC (rev
96682)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-11-22 14:28:03 UTC (rev
96683)
@@ -31,7 +31,7 @@
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
- 'jboss520')
+ 'jboss600')
SERVER_NAME=default
JBOSS_BUILD=jboss-6.0.0.M1
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
@@ -41,7 +41,7 @@
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
- 'jboss600')
+ 'jboss601')
SERVER_NAME=default
JBOSS_BUILD=jboss-6.0.0-SNAPSHOT
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-11-22
13:47:00 UTC (rev 96682)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-11-22
14:28:03 UTC (rev 96683)
@@ -7,7 +7,7 @@
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <
remote>https://svn.jboss.org/repos/jbossas/trunk</remote>
+
<
remote>https://svn.jboss.org/repos/jbossas/tags/JBoss_6_0_0_M1</rem...
<local>jbossas</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
<hudson.scm.SubversionSCM_-ModuleLocation>
@@ -27,7 +27,7 @@
<jdk>jdk1.6</jdk>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 22 * * *</spec>
+ <spec>0 21 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<builders>
@@ -37,7 +37,7 @@
HUDSONDIR=$OSGIDIR/hudson
HUDSONBIN=$HUDSONDIR/hudson-home/bin
-JBOSS_VERSION=jboss-6.0.0-SNAPSHOT
+JBOSS_VERSION=jboss-6.0.1.M1
SERVER_NAME=default
JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION
Copied: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1 (from rev 96642,
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0)
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-5.2.0/config.xml 2009-11-20
15:31:05 UTC (rev 96642)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml 2009-11-22
14:28:03 UTC (rev 96683)
@@ -7,7 +7,7 @@
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
-
<
remote>https://svn.jboss.org/repos/jbossas/branches/Branch_5_x</rem...
+ <
remote>https://svn.jboss.org/repos/jbossas/trunk</remote>
<local>jbossas</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
<hudson.scm.SubversionSCM_-ModuleLocation>
@@ -27,7 +27,7 @@
<jdk>jdk1.6</jdk>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 21 * * *</spec>
+ <spec>0 22 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<builders>
@@ -37,7 +37,7 @@
HUDSONDIR=$OSGIDIR/hudson
HUDSONBIN=$HUDSONDIR/hudson-home/bin
-JBOSS_VERSION=jboss-6.0.0.M1
+JBOSS_VERSION=jboss-6.0.0-SNAPSHOT
SERVER_NAME=default
JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION
@@ -48,7 +48,7 @@
# Build JBoss
#
cd jbossas
-build/build.sh clean main
+mvn clean install
#
# Start JBossAS
@@ -83,4 +83,4 @@
</builders>
<publishers/>
<buildWrappers/>
-</project>
+</project>
\ No newline at end of file
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
===================================================================
---
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-11-22
13:47:00 UTC (rev 96682)
+++
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-11-22
14:28:03 UTC (rev 96683)
@@ -43,8 +43,8 @@
<string>runtime</string>
<string>jboss501</string>
<string>jboss510</string>
- <string>jboss520</string>
<string>jboss600</string>
+ <string>jboss601</string>
</values>
</axis>
<axis>
@@ -55,7 +55,7 @@
</values>
</axis>
</axes>
- <combinationFilter>!((container=='jboss600' ||
container=='jboss520') &&
jdk=='jdk1.5')</combinationFilter>
+ <combinationFilter>!((container=='jboss600' ||
container=='jboss601') &&
jdk=='jdk1.5')</combinationFilter>
<builders>
<hudson.tasks.Shell>
<command>
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
===================================================================
---
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-11-22
13:47:00 UTC (rev 96682)
+++
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-11-22
14:28:03 UTC (rev 96683)
@@ -43,8 +43,8 @@
<string>runtime</string>
<string>jboss501</string>
<string>jboss510</string>
- <string>jboss520</string>
<string>jboss600</string>
+ <string>jboss601</string>
</values>
</axis>
<axis>
@@ -55,7 +55,7 @@
</values>
</axis>
</axes>
- <combinationFilter>!((container=='jboss600' ||
container=='jboss520') &&
jdk=='jdk1.5')</combinationFilter>
+ <combinationFilter>!((container=='jboss600' ||
container=='jboss601') &&
jdk=='jdk1.5')</combinationFilter>
<builders>
<hudson.tasks.Shell>
<command>
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
===================================================================
---
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-11-22
13:47:00 UTC (rev 96682)
+++
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-11-22
14:28:03 UTC (rev 96683)
@@ -41,8 +41,8 @@
<name>container</name>
<values>
<string>runtime</string>
- <string>jboss520</string>
<string>jboss600</string>
+ <string>jboss601</string>
</values>
</axis>
<axis>