Author: thomas.diesler(a)jboss.com Date: 2008-12-08 03:42:06 -0500 (Mon, 08 Dec 2008) New Revision: 3259 Added: jbpm3/trunk/hudson/profiles.xml.local.qa Modified: jbpm3/trunk/hudson/ant.properties.example jbpm3/trunk/hudson/build.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/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml Log: Add profiles.xml.local.qa Modified: jbpm3/trunk/hudson/ant.properties.example =================================================================== --- jbpm3/trunk/hudson/ant.properties.example 2008-12-08 08:17:44 UTC (rev 3258) +++ jbpm3/trunk/hudson/ant.properties.example 2008-12-08 08:42:06 UTC (rev 3259) @@ -21,13 +21,16 @@ hudson.maven.path=/usr/java/apache-maven-2.0.9 hudson.root=/home/hudson/workspace + +hudson.maven.profile=$JBPMDIR/hudson/profiles.xml.local.qa + hudson.host=jbpm.dyndns.org hudson.admin.port=8150 hudson.http.port=8180 -#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.jboss422.zip=file:///home/hudson/download/java/jboss/jboss-4.2.2.GA.zip +#hudson.jboss423.zip=file:///home/hudson/download/java/jboss/jboss-4.2.3.GA.zip +#hudson.jboss500.zip=file:///home/hudson/download/java/jboss/jboss-5.0.0.GA.zip hudson.mail.recipients= hudson.smtp.host=localhost Modified: jbpm3/trunk/hudson/build.xml =================================================================== --- jbpm3/trunk/hudson/build.xml 2008-12-08 08:17:44 UTC (rev 3258) +++ jbpm3/trunk/hudson/build.xml 2008-12-08 08:42:06 UTC (rev 3259) @@ -63,7 +63,7 @@ <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"/> + <available property="jboss500.available" file="${thirdparty.dir}/jboss-5.0.0.GA.zip"/> </target> <!-- @@ -72,7 +72,7 @@ <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss422,get-jboss423,get-jboss500"> <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-4.2.2.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.0.CR2.zip"/> + <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.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" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> @@ -89,8 +89,8 @@ <get src="${hudson.jboss423.zip}" dest="${thirdparty.dir}/jboss-4.2.3.GA.zip" usetimestamp="true" verbose="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"/> + <property name="hudson.jboss500.zip" value="http://downloads.sourceforge.net/jboss/jboss-5.0.0.GA.zip&quo... + <get src="${hudson.jboss500.zip}" dest="${thirdparty.dir}/jboss-5.0.0.GA.zip" usetimestamp="true" verbose="true"/> </target> <!-- Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-12-08 08:17:44 UTC (rev 3258) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-12-08 08:42:06 UTC (rev 3259) @@ -52,10 +52,12 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# copy the maven profile +cp @hudson.maven.profile@ $JBPMDIR/profiles.xml + # # call command.sh # -#/bin/sh $HUDSON_BASE/hudson-home/command.sh /bin/sh $JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-12-08 08:17:44 UTC (rev 3258) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-12-08 08:42:06 UTC (rev 3259) @@ -52,10 +52,12 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# copy the maven profile +cp @hudson.maven.profile@ $JBPMDIR/profiles.xml + # # call command.sh # -# /bin/sh $HUDSON_BASE/hudson-home/command.sh /bin/sh $JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml 2008-12-08 08:17:44 UTC (rev 3258) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml 2008-12-08 08:42:06 UTC (rev 3259) @@ -69,10 +69,12 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# copy the maven profile +cp @hudson.maven.profile@ $JBPMDIR/profiles.xml + # # call command.sh # -# /bin/sh $HUDSON_BASE/hudson-home/command.sh /bin/sh $JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml 2008-12-08 08:17:44 UTC (rev 3258) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml 2008-12-08 08:42:06 UTC (rev 3259) @@ -62,10 +62,12 @@ export JBOSS_SERVER=(a)jboss.server.instance@ export JBOSS_BINDADDR=(a)jboss.bind.address@ +# copy the maven profile +cp @hudson.maven.profile@ $JBPMDIR/profiles.xml + # # call command.sh # -# /bin/sh $HUDSON_BASE/hudson-home/command.sh /bin/sh $JBPMDIR/hudson/hudson-home/command.sh </command> </hudson.tasks.Shell> Added: jbpm3/trunk/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/trunk/hudson/profiles.xml.local.qa (rev 0) +++ jbpm3/trunk/hudson/profiles.xml.local.qa 2008-12-08 08:42:06 UTC (rev 3259) @@ -0,0 +1,40 @@ +<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 --> + <profile> + <id>jboss-home-profile</id> + <activation> + <property> + <name>user.name</name> + </property> + </activation> + <properties> + + <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url> + <jdbc.mysql.server>localhost</jdbc.mysql.server> + <jdbc.mysql.port>3306</jdbc.mysql.port> + <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> + <jdbc.mysql.username>jbpmtest</jdbc.mysql.username> + <jdbc.mysql.password></jdbc.mysql.password> + + <jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url> + <jdbc.postgresql.server>localhost</jdbc.postgresql.server> + <jdbc.postgresql.port>5432</jdbc.postgresql.port> + <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database> + <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> + <jdbc.postgresql.password></jdbc.postgresql.password> + + <jdbc.sybase.url>jdbc:jtds:sybase://localhost:5000/jbpmtest</jdbc.sybase.url> + <jdbc.sybase.server>localhost</jdbc.sybase.server> + <jdbc.sybase.port>5000</jdbc.sybase.port> + <jdbc.sybase.database>jbpmtest</jdbc.sybase.database> + <jdbc.sybase.username>jbpmtest</jdbc.sybase.username> + <jdbc.sybase.password>jbpmtest</jdbc.sybase.password> + + </properties> + </profile> + + </profiles> +</profilesXml>