Author: richard.opalka(a)jboss.com Date: 2011-02-10 04:31:35 -0500 (Thu, 10 Feb 2011) New Revision: 13714 Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml Modified: hudson/trunk/ant.properties.example hudson/trunk/hudson-home/config.xml hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml hudson/trunk/scripts/jboss.sh Log: adding CXF AS7 core job Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2011-02-09 16:58:20 UTC (rev 13713) +++ hudson/trunk/ant.properties.example 2011-02-10 09:31:35 UTC (rev 13714) @@ -25,6 +25,10 @@ hudson.jboss600.build=jboss-6.0.0.Final hudson.jboss600.rev=HEAD +hudson.jboss700.url=https://github.com/jbossas/jboss-as +hudson.jboss700.build=jboss-7.0.0.Alpha2 +hudson.jboss700.rev=master + hudson.mail.recipients= hudson.smtp.host=localhost Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2011-02-09 16:58:20 UTC (rev 13713) +++ hudson/trunk/hudson-home/config.xml 2011-02-10 09:31:35 UTC (rev 13714) @@ -37,6 +37,7 @@ <tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr> <tr><td colspan=2></td></tr> <tr><th align=left&gt;@hudson.jboss600.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss600.rev@ @hudson.jboss600.url@</td></tr> + <tr><th align=left&gt;@hudson.jboss700.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss700.rev@ @hudson.jboss700.url@</td></tr> <tr><td colspan=2></td></tr> </table> ]]> @@ -109,6 +110,7 @@ <string>CXF-ALL</string> <string>CXF-LIGHT</string> <string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string> <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string> <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string> @@ -132,6 +134,7 @@ <no-comparator/> <string>CXF-LIGHT</string> <string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string> <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string> <string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string> <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string> Modified: hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml 2011-02-09 16:58:20 UTC (rev 13713) +++ hudson/trunk/hudson-home/jobs/AS-7.0.0/config.xml 2011-02-10 09:31:35 UTC (rev 13714) @@ -23,14 +23,14 @@ <string>uploadpack</string> <string>git-upload-pack</string> <string>url</string> - <string>https://github.com/jbossas/jboss-as.git</string> + <string>@hudson.jboss700.url@.git</string> <string>tagopt</string> <string></string> </org.spearce.jgit.transport.RemoteConfig> </remoteRepositories> <branches> <hudson.plugins.git.BranchSpec> - <name>master</name> + <name&gt;@hudson.jboss700.rev(a)&lt;/name&gt; </hudson.plugins.git.BranchSpec> </branches> <localBranch></localBranch> @@ -44,7 +44,7 @@ <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/> <gitTool>Default</gitTool> <browser class="hudson.plugins.git.browser.GithubWeb"> - <url>https://github.com/jbossas/jboss-as/</url> + <url&gt;@hudson.jboss700.url(a)&lt;/url&gt; </browser> <submoduleCfg class="list"/> <relativeTargetDir></relativeTargetDir> Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-02-09 16:58:20 UTC (rev 13713) +++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2011-02-10 09:31:35 UTC (rev 13714) @@ -8,6 +8,8 @@ , CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-CORE-AS-7.0.0-SUN-JDK-6 + , CXF-BINDIST-AS-6.0.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6 Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml (rev 0) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.0.0-SUN-JDK-6/config.xml 2011-02-10 09:31:35 UTC (rev 13714) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-7.0.0-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +SCRIPTS_DIR=$WORKSPACE/hudson-scripts +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss700 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.0.0/workspace/build/target/(a)hudson.jboss700.build@ + +# +# load test functions +# +. $SCRIPTS_DIR/jbossws-qa.sh + +# +# execute core tests +# +coreTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@jbossws.hudson.url(a)/scripts&lt;/remote&gt; + <local>hudson-scripts</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.cxf.url(a)&lt;/remote&gt; + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss700.build@ with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-02-09 16:58:20 UTC (rev 13713) +++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2011-02-10 09:31:35 UTC (rev 13714) @@ -8,6 +8,8 @@ , CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6 +, CXF-CORE-AS-7.0.0-SUN-JDK-6 + , CXF-BINDIST-AS-6.0.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6 Modified: hudson/trunk/scripts/jboss.sh =================================================================== --- hudson/trunk/scripts/jboss.sh 2011-02-09 16:58:20 UTC (rev 13713) +++ hudson/trunk/scripts/jboss.sh 2011-02-10 09:31:35 UTC (rev 13714) @@ -3,11 +3,20 @@ PROGNAME=`basename $0` DIRNAME=`dirname $0` JBOSS_HOME="$1" +CMD="$2" BINDADDR="$3" -CMD="$2" export JBOSS_HOME +PIDFILE="$JBOSS_HOME/bin/jboss.pid" +if [ -f "$JBOSS_HOME/bin/run.sh" ]; then + RUN_CMD="$DIRNAME/runjboss.sh -b $BINDADDR" +else + RUN_CMD="$JBOSS_HOME/bin/standalone.sh" + export LAUNCH_JBOSS_IN_BACKGROUND="true" + export JBOSS_PIDFILE=$PIDFILE +fi + # # Helper to complain. # @@ -15,22 +24,15 @@ echo "$PROGNAME: $*" } -if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then - warn "Cannot find: $JBOSS_HOME/bin/run.sh" - exit 1 -fi - case "$CMD" in start) # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid # It relies on bash specific features - # Do you want to hide jboss output? - /bin/bash $DIRNAME/runjboss.sh -b $BINDADDR & + /bin/bash $RUN_CMD & ;; stop) - pidfile="$JBOSS_HOME/bin/jboss.pid" - if [ -f "$pidfile" ]; then - pid=`cat "$pidfile"` + if [ -f "$PIDFILE" ]; then + pid=`cat "$PIDFILE"` echo "kill pid: $pid" kill $pid if [ "$?" -eq 0 ]; then @@ -38,10 +40,9 @@ sleep 20 kill -9 $pid &> /dev/null fi - rm "$pidfile" + rm "$PIDFILE" else - warn "No pid found, using shutdown" - $JBOSS_HOME/bin/shutdown.sh -S > /dev/null & + warn "No pid found!" fi ;; restart) @@ -49,5 +50,6 @@ $0 start ;; *) - echo "usage: $0 jboss_instance (start|stop|restart|help)" + echo "usage: $0 JBOSS_HOME (start|stop|restart|help)" esac +