2:57 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-08-28 15:57:23 -0400 (Thu, 28 Aug 2008)
New Revision: 2043
Modified:
jbpm3/trunk/hudson/ant.properties.example
jbpm3/trunk/hudson/build.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml
Log:
Use jboss.zip
Modified: jbpm3/trunk/hudson/ant.properties.example
===================================================================
--- jbpm3/trunk/hudson/ant.properties.example 2008-08-28 17:40:56 UTC (rev 2042)
+++ jbpm3/trunk/hudson/ant.properties.example 2008-08-28 19:57:23 UTC (rev 2043)
@@ -25,18 +25,10 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA
-hudson.jboss422.build=jboss-4.2.2.GA
-hudson.jboss422.rev=HEAD
+hudson.jboss422.zip=/home/tdiesler/Download/Java/jboss/jboss-4.2.2.GA.zip
+hudson.jboss423.zip=/home/tdiesler/Download/Java/jboss/jboss-4.2.3.GA.zip
+hudson.jboss500.zip=/home/tdiesler/Download/Java/jboss/jboss-5.0.0.CR1.zip
-hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_3_GA
-hudson.jboss423.build=jboss-4.2.3.GA
-hudson.jboss423.rev=HEAD
-
-hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_CR1
-hudson.jboss500.build=jboss-5.0.0.CR1
-hudson.jboss500.rev=HEAD
-
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-08-28 17:40:56 UTC (rev 2042)
+++ jbpm3/trunk/hudson/build.xml 2008-08-28 19:57:23 UTC (rev 2043)
@@ -38,8 +38,11 @@
<target name="init-hudson" depends="init">
- <property name="hudson.tomcat"
value="${hudson.root}/jbpm-hudson-${version.id}/apache-tomcat"/>
- <property name="hudson.home"
value="${hudson.root}/jbpm-hudson-${version.id}/hudson-home"/>
+ <property name="hudson.base"
value="${hudson.root}/jbpm-hudson-${version.id}"/>
+ <property name="hudson.tomcat"
value="${hudson.base}/apache-tomcat"/>
+ <property name="hudson.home"
value="${hudson.base}/hudson-home"/>
+ <property name="hudson.jboss"
value="${hudson.base}/jboss"/>
+
<echo/>
<echo message="hudson.root = ${hudson.root}"/>
<echo message="hudson.home = ${hudson.home}"/>
@@ -67,6 +70,7 @@
<get
src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip"
dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true"
verbose="true"/>
<get
src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudso...
dest="${thirdparty.dir}/hudson.war" usetimestamp="true"
verbose="true"/>
+ <!-- Install Tomcat -->
<mkdir dir="${hudson.root}"/>
<unzip src="${thirdparty.dir}/apache-tomcat.zip"
dest="${hudson.root}"/>
<move file="${hudson.root}/apache-tomcat-${apache-tomcat}"
tofile="${hudson.tomcat}"/>
@@ -87,6 +91,17 @@
<filter token="hudson.home" value="${hudson.home}"/>
</filterset>
</copy>
+
+ <!-- Get/Copy Target Container -->
+ <get src="http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip"
dest="${thirdparty.dir}/jboss-4.2.2.GA.zip" usetimestamp="true"
verbose="true"/>
+ <get src="http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip"
dest="${thirdparty.dir}/jboss-4.2.3.GA.zip" usetimestamp="true"
verbose="true"/>
+ <get src="http://downloads.sourceforge.net/jboss/jboss-5.0.0.CR1.zip"
dest="${thirdparty.dir}/jboss-5.0.0.CR1.zip" usetimestamp="true"
verbose="true"/>
+ <copy todir="${hudson.base}/jboss" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-*.zip"/>
+ </fileset>
+ </copy>
+
</target>
<!--
@@ -124,6 +139,7 @@
<filterset>
<filter token="hudson.jbpm.url"
value="${hudson.jbpm.url}"/>
<filter token="hudson.home" value="${hudson.home}"/>
+ <filter token="hudson.jboss" value="${hudson.jboss}"/>
<filter token="version.id" value="${version.id}"/>
<filtersfile file="${hudson.dir}/ant.properties"/>
</filterset>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-08-28 17:40:56 UTC
(rev 2042)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-08-28 19:57:23 UTC
(rev 2043)
@@ -2,60 +2,31 @@
WORKSPACE=`pwd`
JBPMDIR=$WORKSPACE/jbpm
-JBOSSDIR=$WORKSPACE/$CONTAINER
DISTRODIR=$JBPMDIR/modules/distribution/target
JBOSS_BINDADDR=(a)jboss.bind.address@
case "$CONTAINER" in
- jboss422*)
- JBOSS_BUILD=(a)hudson.jboss422.build@
- JBOSS_SVN=(a)hudson.jboss422.url@
- JBOSS_REV=(a)hudson.jboss422.rev@
- ;;
+ jboss422*)
+ JBOSS_BUILD=jboss-4.2.2.GA
+ ;;
- jboss423*)
- JBOSS_BUILD=(a)hudson.jboss423.build@
- JBOSS_SVN=(a)hudson.jboss423.url@
- JBOSS_REV=(a)hudson.jboss423.rev@
- ;;
+ jboss423*)
+ JBOSS_BUILD=jboss-4.2.3.GA
+ ;;
- jboss500*)
- JBOSS_BUILD=(a)hudson.jboss500.build@
- JBOSS_SVN=(a)hudson.jboss500.url@
- JBOSS_REV=(a)hudson.jboss500.rev@
- ;;
+ jboss500*)
+ JBOSS_BUILD=jboss-5.0.0.CR1
+ ;;
esac
-JBOSS_INSTANCE=$JBOSSDIR/build/output/$JBOSS_BUILD
-ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR
-Djboss.home=$JBOSS_INSTANCE"
-
#
-# checkout with an explicit version
-#
-if [ ! -d "$JBOSSDIR" ]; then
- cd $WORKSPACE
- svn co -r$JBOSS_REV $JBOSS_SVN $CONTAINER
-else
- cd $WORKSPACE
- svn up -r$JBOSS_REV $CONTAINER
-fi
-
-
+# Unzip the JBoss build
#
-# Build target container
-#
-if [ ! -d $JBOSS_INSTANCE ]; then
- cd $JBOSSDIR
- ./build/build.sh clean main
-fi
+rm -rf $JBOSS_BUILD
+unzip -q @hudson.jboss(a)/$JBOSS_BUILD.zip
-#
-# Verify build
-#
-if [ ! -d $JBOSS_INSTANCE ]; then
- echo "Cannot find expected build: $JBOSS_INSTANCE"
- exit 1
-fi
+JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
+ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
#
# Build distro
@@ -67,18 +38,19 @@
#
# Deploy distro
#
-java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-install.jar
$DISTRODIR/resources/auto-install-$CONTAINER.xml
+sed s/JBOSS_HOME/$JBOSS_HOME/ < $DISTRODIR/resources/auto-install-$CONTAINER.xml >
auto-install.xml
+java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
#
# start jbossas
#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
# Was it successfully started?
$JBPMDIR/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
- $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
+ $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
exit 1
fi
@@ -97,6 +69,6 @@
#
# stop jbossas
#
-$JBPMDIR/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
+$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
Modified:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml
===================================================================
---
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml 2008-08-28
17:40:56 UTC (rev 2042)
+++
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss422.xml 2008-08-28
19:57:23 UTC (rev 2043)
@@ -1,7 +1,7 @@
<AutomatedInstallation langpack="eng">
<com.izforge.izpack.panels.HelloPanel />
<com.izforge.izpack.panels.TargetPanel>
- <installpath>@jboss422.home(a)</installpath>
+ <installpath>JBOSS_HOME</installpath>
</com.izforge.izpack.panels.TargetPanel>
<com.izforge.izpack.panels.TreePacksPanel>
<pack name="jBPM3" index="0" selected="true" />