[jbpm-commits] JBoss JBPM SVN: r6545 - in jbpm3/branches/jbpm-3.2-soa/hudson: apache-tomcat/conf and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 6 04:43:34 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-08-06 04:43:32 -0400 (Fri, 06 Aug 2010)
New Revision: 6545
Removed:
jbpm3/branches/jbpm-3.2-soa/hudson/apache-tomcat/conf/server.xml
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties
jbpm3/branches/jbpm-3.2-soa/hudson/build.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Mailer.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Maven.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml
Log:
JBPM-2916 revive local hudson scripts and configuration
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/ant.example.properties 2010-08-06 08:43:32 UTC (rev 6545)
@@ -1,16 +1,11 @@
#
-# A sample ant properties file
+# Build properties for Hudson CI
#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
-# JBoss remote repository
-jboss.repository=http://repository.jboss.org
-
-# The JBoss settings
-jboss.server.instance=default
+# JBoss AS settings
jboss.bind.address=127.0.0.1
-# JDK settings
+# JDK homes
java.home.jdk14=/etc/alternatives/java_sdk_1.4.2
java.home.jdk15=/etc/alternatives/java_sdk_1.5.0
java.home.jdk16=/etc/alternatives/java_sdk_1.6.0
@@ -19,23 +14,31 @@
hudson.username=changeme
hudson.password=changeme
-hudson.maven.path=/usr/share/maven2
-hudson.maven.profile=$JBPMDIR/hudson/profiles.local.qa.xml
+hudson.base=/home/hudson/workspace
-hudson.root=/home/hudson/workspace
-
hudson.host=localhost
-hudson.admin.port=8150
+hudson.admin.port=8105
+hudson.ajp.port=8109
hudson.http.port=8180
-#hudson.jboss405.zip=file:/home/hudson/download/java/jboss/jboss-4.0.5.GA.zip
-#hudson.jboss423.zip=file:/home/hudson/download/java/jboss/jboss-4.2.3.GA.zip
-#hudson.jboss501.zip=file:/home/hudson/download/java/jboss/jboss-5.0.1.GA.zip
-#hudson.jboss510.zip=file:/home/hudson/download/java/jboss/jboss-5.1.0.GA-jdk6.zip
+hudson.maven.path=/usr/share/maven2
+hudson.maven.profile=$JBPMDIR/hudson/profiles.local.qa.xml
+hudson.admin.address=alex.guizar at jboss.com
hudson.mail.recipients=
hudson.smtp.host=localhost
-# Hudson (1.295)
-apache-tomcat=5.5.20
-sun-hudson=2402/131374
+# Local JBoss AS cache
+#download.path=file:/home/hudson/download
+#jboss405.zip=${download.path}/jboss-4.0.5.GA.zip
+#jboss423.zip=${download.path}/jboss-4.2.3.GA.zip
+#jboss501.zip=${download.path}/jboss-5.0.1.GA.zip
+#jboss510.zip=${download.path}/jboss-5.1.0.GA.zip
+
+# Local Hudson cache
+hudson.version=1.369
+#hudson.war=${download.path}/hudson-${hudson.version}.war
+
+# Local Tomcat cache
+tomcat.version=5.5.30
+#tomcat.zip=${download.path}/apache-tomcat-${tomcat.version}.zip
\ No newline at end of file
Deleted: jbpm3/branches/jbpm-3.2-soa/hudson/apache-tomcat/conf/server.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/apache-tomcat/conf/server.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/apache-tomcat/conf/server.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -1,57 +0,0 @@
-
-<Server port="@hudson.admin.port@" shutdown="SHUTDOWN">
-
- <!-- Comment these entries out to disable JMX MBeans support used for the
- administration web application -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener"/>
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
- <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
-
- <!-- Global JNDI resources -->
- <GlobalNamingResources>
-
- <!-- Test entry for demonstration purposes -->
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users -->
- <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/>
-
- </GlobalNamingResources>
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Catalina">
-
- <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector port="@hudson.http.port@" maxHttpHeaderSize="8192" maxThreads="150"
- minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true"/>
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Catalina" defaultHost="localhost">
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/>
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
- <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false">
-
- <Context path="/hudson">
- <Environment description="" name="HUDSON_HOME" type="java.lang.String" value="@hudson.home@"/>
- </Context>
-
- </Host>
-
- </Engine>
-
- </Service>
-
-</Server>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/build.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/build.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -1,55 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
+<!-- jBPM: Workflow in Java -->
<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
<!-- ====================================================================== -->
-<!-- $Id$ -->
-
<project>
- <property name="hudson.dir" value="${basedir}" />
- <property name="hudson.target.dir" value="${hudson.dir}/target" />
+ <property name="target.dir" value="${basedir}/target" />
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
+ <!--
+ Property initialization
+ -->
<target name="init">
<!-- 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?"
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.example.properties?"
unless="ant.properties.available" />
-
<property file="${basedir}/ant.properties" />
-
- <xmlproperty file="${basedir}/../pom.xml" />
- <property name="version.id" value="${project.version}" />
- <property name="repository.id" value="${project.version}" />
-
- <echo message="version.id=${version.id}" />
- <echo message="repository.id=${repository.id}" />
</target>
<target name="init-hudson" depends="init">
- <property name="hudson.base" value="${hudson.root}/jbpm-hudson-${version.id}" />
+ <echo message="hudson.base: ${hudson.base}" />
+
<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}" />
- <echo />
-
- <available file="${hudson.root}" property="hudson.root.available" />
<available file="${hudson.tomcat}" property="hudson.tomcat.available" />
- <fail message="Hudson root not available" unless="hudson.root.available" />
<property name="hudson.username.${hudson.username}" value="true" />
<fail message="Cannot use default hudson username: ${hudson.username}"
@@ -60,67 +39,71 @@
</target>
<target name="init-thirdparty" depends="init-hudson">
- <property name="thirdparty.dir" value="${hudson.target.dir}/thirdparty" />
+ <property name="thirdparty.dir" value="${target.dir}/thirdparty" />
<mkdir dir="${thirdparty.dir}" />
- <available property="apache.tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip" />
- <available property="sun.hudson.available" file="${thirdparty.dir}/hudson.war" />
- <available property="jboss405.available" file="${thirdparty.dir}/jboss-4.0.5.GA.zip" />
- <available property="jboss423.available" file="${thirdparty.dir}/jboss-4.2.3.GA.zip" />
- <available property="jboss501.available" file="${thirdparty.dir}/jboss-5.0.1.GA.zip" />
- <available property="jboss510.available" file="${thirdparty.dir}/jboss-5.1.0.GA.zip" />
+ <available property="tomcat.available" file="${thirdparty.dir}/apache-tomcat.zip" />
+ <available property="hudson.available" file="${thirdparty.dir}/hudson.war" />
</target>
+ <target name="init-jboss" depends="init">
+ <property name="hudson.jboss" value="${hudson.base}/jboss" />
+ <mkdir dir="${hudson.jboss}" />
+ <available property="jboss405.available" file="${hudson.jboss}/jboss-4.0.5.GA.zip" />
+ <available property="jboss423.available" file="${hudson.jboss}/jboss-4.2.3.GA.zip" />
+ <available property="jboss501.available" file="${hudson.jboss}/jboss-5.0.1.GA.zip" />
+ <available property="jboss510.available" file="${hudson.jboss}/jboss-5.1.0.GA.zip" />
+ </target>
+
<!--
Get thirdparty dependencies
-->
- <target name="thirdparty"
- depends="init-thirdparty,get-tomcat,get-hudson,get-jboss405,get-jboss423,get-jboss501,get-jboss510">
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.0.5.GA.zip" />
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.3.GA.zip" />
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip" />
- <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.1.0.GA.zip" />
- </target>
- <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available">
- <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip"
+ <target name="get-thirdparty"
+ depends="get-tomcat,get-hudson,get-jboss405,get-jboss423,get-jboss501,get-jboss510" />
+ <target name="get-tomcat" depends="init-thirdparty" unless="tomcat.available">
+ <property name="tomcat.zip"
+ value="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip" />
+ <get src="${tomcat.zip}"
dest="${thirdparty.dir}/apache-tomcat.zip"
usetimestamp="true"
verbose="true" />
</target>
- <target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available">
- <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war"
+ <target name="get-hudson" depends="init-thirdparty" unless="hudson.available">
+ <property name="hudson.war"
+ value="http://hudson-ci.org/download/war/${hudson.version}/hudson.war" />
+ <get src="${hudson.war}"
dest="${thirdparty.dir}/hudson.war"
usetimestamp="true"
verbose="true" />
</target>
- <target name="get-jboss405" depends="init-thirdparty" unless="jboss405.available">
- <property name="hudson.jboss405.zip"
+ <target name="get-jboss405" depends="init-jboss" unless="jboss405.available">
+ <property name="jboss405.zip"
value="http://downloads.sourceforge.net/jboss/jboss-4.0.5.GA.zip" />
- <get src="${hudson.jboss405.zip}"
- dest="${thirdparty.dir}/jboss-4.0.5.GA.zip"
+ <get src="${jboss405.zip}"
+ dest="${hudson.jboss}/jboss-4.0.5.GA.zip"
usetimestamp="true"
verbose="true" />
</target>
- <target name="get-jboss423" depends="init-thirdparty" unless="jboss423.available">
- <property name="hudson.jboss423.zip"
+ <target name="get-jboss423" depends="init-jboss" unless="jboss423.available">
+ <property name="jboss423.zip"
value="http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip" />
- <get src="${hudson.jboss423.zip}"
- dest="${thirdparty.dir}/jboss-4.2.3.GA.zip"
+ <get src="${jboss423.zip}"
+ dest="${hudson.jboss}/jboss-4.2.3.GA.zip"
usetimestamp="true"
verbose="true" />
</target>
- <target name="get-jboss501" depends="init-thirdparty" unless="jboss501.available">
- <property name="hudson.jboss501.zip"
+ <target name="get-jboss501" depends="init-jboss" unless="jboss501.available">
+ <property name="jboss501.zip"
value="http://downloads.sourceforge.net/jboss/jboss-5.0.1.GA.zip" />
- <get src="${hudson.jboss501.zip}"
- dest="${thirdparty.dir}/jboss-5.0.1.GA.zip"
+ <get src="${jboss501.zip}"
+ dest="${hudson.jboss}/jboss-5.0.1.GA.zip"
usetimestamp="true"
verbose="true" />
</target>
- <target name="get-jboss510" depends="init-thirdparty" unless="jboss510.available">
- <property name="hudson.jboss510.zip"
+ <target name="get-jboss510" depends="init-jboss" unless="jboss510.available">
+ <property name="jboss510.zip"
value="http://downloads.sourceforge.net/jboss/jboss-5.1.0.GA-jdk6.zip" />
- <get src="${hudson.jboss510.zip}"
- dest="${thirdparty.dir}/jboss-5.1.0.GA.zip"
+ <get src="${jboss510.zip}"
+ dest="${hudson.jboss}/jboss-5.1.0.GA.zip"
usetimestamp="true"
verbose="true" />
</target>
@@ -128,15 +111,13 @@
<!--
Setup the Hudson Tomcat instance
-->
- <target name="hudson-tomcat-setup" depends="thirdparty" unless="hudson.tomcat.available">
+ <target name="hudson-tomcat-setup" depends="get-thirdparty" unless="hudson.tomcat.available">
<!-- 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}" />
+ <mkdir dir="${hudson.base}" />
+ <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.base}" />
+ <move file="${hudson.base}/apache-tomcat-${tomcat.version}" tofile="${hudson.tomcat}" />
<chmod perm="+x">
- <fileset dir="${hudson.tomcat}/bin">
- <include name="*.sh" />
- </fileset>
+ <fileset dir="${hudson.tomcat}/bin" includes="*.sh" />
</chmod>
<!-- Install Hudson -->
@@ -144,72 +125,62 @@
</target>
<!--
- Update the Hudson version
- -->
- <target name="hudson-update" depends="init-thirdparty">
- <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudson.war"
- dest="${thirdparty.dir}/hudson.war"
- usetimestamp="false"
- verbose="true" />
- <delete dir="${hudson.tomcat}/webapps/hudson" />
- <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war" />
- </target>
-
- <!--
Setup the Hudson QA environment
-->
- <target name="hudson-setup"
+ <target name="setup"
depends="init-hudson,hudson-tomcat-setup"
- description="Setup the Hudson QA environment">
+ description="Set up the Hudson QA environment">
<!-- get the svn url -->
- <exec dir="${hudson.dir}/.."
+ <exec dir="${basedir}/.."
executable="svn"
failonerror="true"
- output="${hudson.target.dir}/svn-info.xml">
- <arg line="info" />
- <arg line="--xml" />
+ output="${target.dir}/svn-info.xml">
+ <arg value="info" />
+ <arg value="--xml" />
</exec>
- <xmlproperty file="${hudson.target.dir}/svn-info.xml" />
+ <replace file="${target.dir}/svn-info.xml" token="https://svn" value="http://anonsvn" />
+ <xmlproperty file="${target.dir}/svn-info.xml" />
<property name="hudson.jbpm.url" value="${info.entry.url}" />
<!-- Configure Tomcat -->
<copy todir="${hudson.tomcat}" overwrite="true">
- <fileset dir="${hudson.dir}/apache-tomcat">
- <include name="**/*.xml" />
- </fileset>
+ <fileset dir="${basedir}/apache-tomcat" />
<filterset>
- <filtersfile file="${hudson.dir}/ant.properties" />
- <filter token="hudson.home" value="${hudson.home}" />
+ <filtersfile file="${basedir}/ant.properties" />
</filterset>
</copy>
+ <replace file="${hudson.tomcat}/conf/server.xml">
+ <replacefilter token="port="8005""
+ value="port="${hudson.admin.port}"" />
+ <replacefilter token="port="8009""
+ value="port="${hudson.ajp.port}"" />
+ <replacefilter token="port="8080""
+ value="port="${hudson.http.port}"" />
+ </replace>
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
- <fileset dir="${hudson.dir}/hudson-home">
+ <fileset dir="${basedir}/hudson-home">
<include name="jobs/*/config.xml" />
<include name="command.sh" />
<include name="*.xml" />
</fileset>
<filterset>
+ <!-- derived properties -->
<filter token="hudson.jbpm.url" value="${hudson.jbpm.url}" />
- <filter token="hudson.base" value="${hudson.base}" />
<filter token="hudson.home" value="${hudson.home}" />
- <filter token="version.id" value="${version.id}" />
- <filtersfile file="${hudson.dir}/ant.properties" />
+ <filtersfile file="${basedir}/ant.properties" />
</filterset>
</copy>
<echo />
<echo message="*************************************" />
<echo message="* Hudson setup successfully *" />
- <echo message="* ant hudson-start *" />
+ <echo message="* ant start *" />
<echo message="*************************************" />
- <echo />
</target>
- <target name="hudson-stop"
- depends="init-hudson"
- description="Stops the Hudson QA environment">
+ <target name="stop" depends="init-hudson" description="Stop the Hudson QA environment">
<exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true">
<arg line="stop" />
</exec>
@@ -217,21 +188,19 @@
<echo />
<echo message="*************************************" />
<echo message="* Hudson stopped successfully *" />
- <echo message="* ant hudson-start *" />
+ <echo message="* ant start *" />
<echo message="*************************************" />
- <echo />
</target>
- <target name="hudson-start"
- depends="init-hudson"
- description="Start the Hudson QA environment">
+ <target name="start" depends="init-hudson" description="Start the Hudson QA environment">
<property environment="env" />
<fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY" />
<exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true"
- output="${hudson.target.dir}/hudson.log">
- <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true" />
+ output="${target.dir}/hudson.log">
+ <env key="CATALINA_OPTS" value="-Djava.awt.headless=true" />
+ <env key="HUDSON_HOME" value="${hudson.home}" />
<arg line="start" />
</exec>
@@ -240,7 +209,10 @@
<echo message="* Hudson started successfully *" />
<echo message="* http://${hudson.host}:${hudson.http.port}/hudson *" />
<echo message="*************************************" />
- <echo />
</target>
+ <target name="clean" depends="init" description="Clean up">
+ <delete dir="${target.dir}" failonerror="false" />
+ <delete dir="${hudson.base}" failonerror="false" />
+ </target>
</project>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -1,7 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
+ <version>1.0</version>
<numExecutors>2</numExecutors>
+ <mode>NORMAL</mode>
<useSecurity>true</useSecurity>
+ <authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy"/>
+ <securityRealm class="hudson.security.LegacySecurityRealm"/>
<systemMessage>
<![CDATA[
<h2>jBPM QA Environment</h2>
@@ -26,6 +30,20 @@
<javaHome>@java.home.jdk16@</javaHome>
</jdk>
</jdks>
- <slaves/>
<quietPeriod>5</quietPeriod>
+ <globalNodeProperties>
+ <hudson.slaves.EnvironmentVariablesNodeProperty>
+ <envVars serialization="custom">
+ <unserializable-parents/>
+ <tree-map>
+ <default>
+ <comparator class="hudson.util.CaseInsensitiveComparator"/>
+ </default>
+ <int>1</int>
+ <string>SOURCE_REPO</string>
+ <string>@hudson.base@</string>
+ </tree-map>
+ </envVars>
+ </hudson.slaves.EnvironmentVariablesNodeProperty>
+ </globalNodeProperties>
</hudson>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Mailer.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Mailer.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
-<hudson.tasks.Mailer-DescriptorImpl>
- <defaultSuffix></defaultSuffix>
- <hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson/</hudsonUrl>
- <adminAddress>aguizar at jboss.com</adminAddress>
+<hudson.tasks.Mailer_-DescriptorImpl>
+ <hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson</hudsonUrl>
+ <adminAddress>@hudson.admin.address@</adminAddress>
<smtpHost>@hudson.smtp.host@</smtpHost>
-</hudson.tasks.Mailer-DescriptorImpl>
+</hudson.tasks.Mailer_-DescriptorImpl>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Maven.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Maven.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/hudson.tasks.Maven.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,7 +3,7 @@
<installations>
<hudson.tasks.Maven_-MavenInstallation>
<name>apache-maven</name>
- <mavenHome>@hudson.maven.path@</mavenHome>
+ <home>@hudson.maven.path@</home>
</hudson.tasks.Maven_-MavenInstallation>
</installations>
</hudson.tasks.Maven_-DescriptorImpl>
\ No newline at end of file
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss405/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
<description>Build and test jBPM 3 on JBoss 4.0.5</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -19,7 +19,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -32,7 +32,7 @@
</triggers>
<axes>
<axis>
- <name>database</name>
+ <name>DATABASE</name>
<values>
<string>db2</string>
<string>hsqldb</string>
@@ -46,17 +46,13 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
+export JAVA_15_HOME=@java.home.jdk15@
export CONTAINER=jboss405
-export DATABASE=$database
-export JAVA_14_HOME=@java.home.jdk14@
-export JAVA_15_HOME=@java.home.jdk15@
-
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss423/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
<description>Build and test jBPM 3 on JBoss 4.2.3</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -19,7 +19,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -28,7 +28,7 @@
<triggers class="vector"/>
<axes>
<axis>
- <name>database</name>
+ <name>DATABASE</name>
<values>
<string>db2</string>
<string>hsqldb</string>
@@ -43,14 +43,11 @@
<hudson.tasks.Shell>
<command><![CDATA[
export CONTAINER=jboss423
-export DATABASE=$database
-
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss501/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
<description>Build and test jBPM 3 on JBoss 5.0.1</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -19,7 +19,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -28,7 +28,7 @@
<triggers class="vector"/>
<axes>
<axis>
- <name>database</name>
+ <name>DATABASE</name>
<values>
<string>db2</string>
<string>hsqldb</string>
@@ -43,14 +43,11 @@
<hudson.tasks.Shell>
<command><![CDATA[
export CONTAINER=jboss501
-export DATABASE=$database
-
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jboss510/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
<description>Build and test jBPM 3 on JBoss 5.1.0</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -19,7 +19,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -28,7 +28,7 @@
<triggers class="vector"/>
<axes>
<axis>
- <name>database</name>
+ <name>DATABASE</name>
<values>
<string>db2</string>
<string>hsqldb</string>
@@ -43,14 +43,11 @@
<hudson.tasks.Shell>
<command><![CDATA[
export CONTAINER=jboss510
-export DATABASE=$database
-
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk142/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="vector" />
<description>Build and test jBPM 3 on JDK 1.4.2</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -12,7 +12,6 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>DATABASE</name>
- <optional>false</optional>
<defaultValue>hsqldb</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
@@ -28,7 +27,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -39,16 +38,13 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-export CONTAINER=jboss405
-export JAVA_14_HOME=@java.home.jdk14@
export JAVA_15_HOME=@java.home.jdk15@
-
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
+export CONTAINER=jboss405
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk150/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="vector" />
<description>Build and test jBPM 3 on JDK 1.5.0</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -12,12 +12,10 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>CONTAINER</name>
- <optional>false</optional>
<defaultValue>jboss423</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>DATABASE</name>
- <optional>false</optional>
<defaultValue>hsqldb</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
@@ -33,7 +31,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -44,12 +42,11 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml 2010-08-05 21:24:11 UTC (rev 6544)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/jobs/jbpm3-jdk160/config.xml 2010-08-06 08:43:32 UTC (rev 6545)
@@ -3,8 +3,8 @@
<actions class="vector" />
<description>Build and test jBPM 3 on JDK 1.6.0</description>
<logRotator>
- <daysToKeep>60</daysToKeep>
- <numToKeep>-1</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
<properties>
@@ -12,12 +12,10 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>CONTAINER</name>
- <optional>false</optional>
<defaultValue>jboss510</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>DATABASE</name>
- <optional>false</optional>
<defaultValue>hsqldb</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
@@ -33,7 +31,7 @@
</locations>
<useUpdate>true</useUpdate>
<browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JbpmSvn/</url>
+ <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm3/</url>
<rootModule></rootModule>
</browser>
</scm>
@@ -44,12 +42,11 @@
<builders>
<hudson.tasks.Shell>
<command><![CDATA[
-export HUDSON_BASE=@hudson.base@
-export JBOSS_SERVER=@jboss.server.instance@
export JBOSS_BINDADDR=@jboss.bind.address@
# call continuous integration script
-sh jbpm/hudson/hudson-home/command.sh
+cd jbpm
+sh -x hudson/hudson-home/command.sh
]]></command>
</hudson.tasks.Shell>
</builders>
More information about the jbpm-commits
mailing list