[jbpm-commits] JBoss JBPM SVN: r2299 - in jbpm3/trunk: hudson and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-09-19 15:29:27 -0400 (Fri, 19 Sep 2008) New Revision: 2299 Modified: jbpm3/trunk/hudson/ant.properties.example jbpm3/trunk/hudson/build.xml jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/hudson/hudson-home/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/trunk/profiles.xml.example Log: Merge changes from jbpm-3.3.0.CR1 QA branch Modified: jbpm3/trunk/hudson/ant.properties.example =================================================================== --- jbpm3/trunk/hudson/ant.properties.example 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/ant.properties.example 2008-09-19 19:29:27 UTC (rev 2299) @@ -25,13 +25,13 @@ hudson.admin.port=8150 hudson.http.port=8180 -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.jboss422.zip=file:///home/tdiesler/Download/Java/jboss/jboss-4.2.2.GA.zip +hudson.jboss423.zip=file:///home/tdiesler/Download/Java/jboss/jboss-4.2.3.GA.zip +hudson.jboss500.zip=file:///home/tdiesler/Download/Java/jboss/jboss-5.0.0.CR2.zip hudson.mail.recipients= hudson.smtp.host=localhost -# Hudson (1.251) +# Hudson (1.252) apache-tomcat=5.5.20 -sun-hudson=2402/108356 +sun-hudson=2402/109746 Modified: jbpm3/trunk/hudson/build.xml =================================================================== --- jbpm3/trunk/hudson/build.xml 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/build.xml 2008-09-19 19:29:27 UTC (rev 2299) @@ -21,7 +21,6 @@ <!-- ================================================================== --> <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?" unless="ant.properties.available"/> @@ -37,7 +36,6 @@ </target> <target name="init-hudson" depends="init"> - <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"/> @@ -56,19 +54,49 @@ <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> <property name="hudson.password.${hudson.password}" value="true"/> <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> - + </target> + + <target name="init-thirdparty" depends="init-hudson"> <property name="thirdparty.dir" value="${hudson.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="jboss422.available" file="${thirdparty.dir}/jboss-4.2.2.GA.zip"/> + <available property="jboss423.available" file="${thirdparty.dir}/jboss-4.2.3.GA.zip"/> + <available property="jboss500.available" file="${thirdparty.dir}/jboss-5.0.0.CR2.zip"/> </target> <!-- - Setup the Hudson Tomcat instance + Get thirdparty dependencies --> - <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> - + <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss422,get-jboss423,get-jboss500"> + </target> + <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available"> <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-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}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + </target> + <target name="get-jboss422" depends="init-thirdparty" unless="jboss422.available"> + <property name="hudson.jboss422.zip" value="http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip&quo... + <get src="${hudson.jboss422.zip}" dest="${thirdparty.dir}/jboss-4.2.2.GA.zip" usetimestamp="true" verbose="true"/> + <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.2.GA.zip" overwrite="true"/> + </target> + <target name="get-jboss423" depends="init-thirdparty" unless="jboss423.available"> + <property name="hudson.jboss423.zip" value="http://downloads.sourceforge.net/jboss/jboss-4.2.3.GA.zip&quo... + <get src="${hudson.jboss423.zip}" dest="${thirdparty.dir}/jboss-4.2.3.GA.zip" usetimestamp="true" verbose="true"/> + <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.3.GA.zip" overwrite="true"/> + </target> + <target name="get-jboss500" depends="init-thirdparty" unless="jboss500.available"> + <property name="hudson.jboss500.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.0.CR2.zip&qu... + <get src="${hudson.jboss500.zip}" dest="${thirdparty.dir}/jboss-5.0.0.CR2.zip" usetimestamp="true" verbose="true"/> + <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.0.CR2.zip" overwrite="true"/> + </target> + + <!-- + Setup the Hudson Tomcat instance + --> + <target name="hudson-tomcat-setup" depends="thirdparty" unless="hudson.tomcat.available"> <!-- Install Tomcat --> <mkdir dir="${hudson.root}"/> @@ -80,37 +108,16 @@ </fileset> </chmod> - <!-- Configure Tomcat --> + <!-- Install Hudson --> <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - <copy todir="${hudson.tomcat}" overwrite="true"> - <fileset dir="${hudson.dir}/apache-tomcat"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filtersfile file="${hudson.dir}/ant.properties"/> - <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> <!-- Update the Hudson version --> <target name="hudson-update" depends="init-hudson"> - <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/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> @@ -118,8 +125,7 @@ <!-- Setup the Hudson QA environment --> - <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" - description="Setup the Hudson QA environment"> + <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" description="Setup the Hudson QA environment"> <!-- get the svn url --> <exec dir="${hudson.dir}/.." executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml"> @@ -129,6 +135,17 @@ <xmlproperty file="${hudson.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> + <filterset> + <filtersfile file="${hudson.dir}/ant.properties"/> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + <!-- Configure Hudson --> <copy todir="${hudson.home}" overwrite="true"> <fileset dir="${hudson.dir}/hudson-home"> Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-19 19:29:27 UTC (rev 2299) @@ -19,7 +19,7 @@ ;; jboss500*) - JBOSS_BUILD=jboss-5.0.0.CR1 + JBOSS_BUILD=jboss-5.0.0.CR2 ;; esac Modified: jbpm3/trunk/hudson/hudson-home/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/config.xml 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/hudson-home/config.xml 2008-09-19 19:29:27 UTC (rev 2299) @@ -5,6 +5,11 @@ <systemMessage> <![CDATA[ <h2&gt;jBPM-(a)version.id@ QA Environment</h2> + + <table> + <tr align=&quot;left&quot;&gt;&lt;th&gt;SVN&lt;/th&gt;&lt;td&gt;@hudson.jbpm.url(a)&lt;/td&gt;&lt;/tr&gt; + <tr align="left"><th>Bind Addr&lt;/th&gt;&lt;td&gt;@jboss.bind.address(a)&lt;/td&gt;&lt;/tr&gt; + </table> ]]> </systemMessage> <jdks> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-09-19 19:29:27 UTC (rev 2299) @@ -13,7 +13,7 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://svn.jboss.org/repos/jbpm/jbpm3/trunk</remote> + <remote&gt;@hudson.jbpm.url(a)&lt;/remote&gt; <local>jbpm</local> </hudson.scm.SubversionSCM_-ModuleLocation> </locations> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-19 19:29:27 UTC (rev 2299) @@ -27,7 +27,7 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://svn.jboss.org/repos/jbpm/jbpm3/trunk</remote> + <remote&gt;@hudson.jbpm.url(a)&lt;/remote&gt; <local>jbpm</local> </hudson.scm.SubversionSCM_-ModuleLocation> </locations> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-19 19:29:27 UTC (rev 2299) @@ -27,7 +27,7 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM_-ModuleLocation> - <remote>https://svn.jboss.org/repos/jbpm/jbpm3/trunk</remote> + <remote&gt;@hudson.jbpm.url(a)&lt;/remote&gt; <local>jbpm</local> </hudson.scm.SubversionSCM_-ModuleLocation> </locations> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-09-19 19:29:27 UTC (rev 2299) @@ -1,3 +1,10 @@ + <!-- + Out-of-the-box compatibility with Sybase + https://jira.jboss.org/jira/browse/JBPM-700 + + System Service QA Database Sybase + https://wiki.corp.jboss.com/bin/view/IT/SystemServiceQaDatabaseSybase + --> <!-- hibernate dialect --> <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> @@ -8,4 +15,4 @@ <property name="hibernate.connection.username">jbpmteam</property> <property name="hibernate.connection.password">jbpmteam</property> <!-- JDBC connection properties (end) --> - \ No newline at end of file + Modified: jbpm3/trunk/profiles.xml.example =================================================================== --- jbpm3/trunk/profiles.xml.example 2008-09-19 18:36:18 UTC (rev 2298) +++ jbpm3/trunk/profiles.xml.example 2008-09-19 19:29:27 UTC (rev 2299) @@ -13,7 +13,7 @@ <properties> <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> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> </properties> </profile>