[jbossws-commits] JBossWS SVN: r4192 - in framework/trunk: ant-import and 22 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 11:25:44 -0400 (Fri, 03 Aug 2007) New Revision: 4192 Modified: framework/trunk/ant-import/build-hudson.xml framework/trunk/ant.properties.example framework/trunk/hudson/hudson-home/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml Log: Fix hudson for native Modified: framework/trunk/ant-import/build-hudson.xml =================================================================== --- framework/trunk/ant-import/build-hudson.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/ant-import/build-hudson.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -82,17 +82,13 @@ description="Setup the Hudson QA environment"> <!-- get the svn url --> - <exec dir="${framework.dir}/.." executable="svn" failonerror="true" output="${framework.dir}/output/svn-info.xml"> + <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.dir}/output/svn-info.xml"> <arg line="info"/> <arg line="--xml"/> </exec> <xmlproperty file="${framework.dir}/output/svn-info.xml"/> - <property name="svn.url" value="${info.entry.url}"/> + <property name="hudson.framework.url" value="${info.entry.url}"/> - <exec executable="dirname" outputproperty="svn.basedir.local"> - <arg value="${basedir}"/> - </exec> - <!-- Configure Hudson --> <copy todir="${hudson.home}" overwrite="true"> <fileset dir="${framework.dir}/hudson/hudson-home"> @@ -101,8 +97,7 @@ <include name="*.xml"/> </fileset> <filterset> - <filter token="svn.basedir.local" value="${svn.basedir.local}"/> - <filter token="svn.url" value="${svn.url}"/> + <filter token="hudson.framework.url" value="${hudson.framework.url}"/> <filter token="hudson.home" value="${hudson.home}"/> <filtersfile file="${framework.dir}/version.properties"/> <filtersfile file="${framework.dir}/ant.properties"/> Modified: framework/trunk/ant.properties.example =================================================================== --- framework/trunk/ant.properties.example 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/ant.properties.example 2007-08-03 15:25:44 UTC (rev 4192) @@ -3,6 +3,9 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ +# The JBoss settings +jboss.bind.address=localhost + # JBoss Repository #jboss.repository=file:/home/tdiesler/svn/jboss.local.repository jboss.repository=http://repository.jboss.org @@ -16,6 +19,10 @@ hudson.admin.port=8150 hudson.http.port=8180 +hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk +hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk +hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk + hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk hudson.jboss50.build=jboss-5.0.0.Beta3 hudson.jboss50.rev=HEAD Modified: framework/trunk/hudson/hudson-home/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -7,10 +7,20 @@ <h2&gt;JBossWS-(a)version.id@ QA Environment</h2> <table> - <tr><th align=left>SVN:</th><td>@svn.url@</td></tr> + <tr><th align=left>JBossWS:</th><td>@hudson.framework.url@</td></tr> </table> <p/> + <b>Web Service Stack</b> + <p/> + + <table> + <tr><th align=left>Native:</th><td>@hudson.native.url@</td></tr> + <tr><th align=left>Metro:</th><td>@hudson.metro.url@</td></tr> + <tr><th align=left>CXF:</th><td>@hudson.cxf.url@</td></tr> + </table> + <p/> + <b>Target Container</b> <p/> Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=AS-Tests-AS-4.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/(a)hudson.jboss40.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40&quot; @@ -17,12 +18,12 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build/deploy jbossws-native # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 clean jars ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40 @@ -30,13 +31,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -62,7 +63,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -80,9 +81,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=AS-Tests-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ant $ENVIRONMENT clean deploy-jboss42 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,7 +62,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -79,9 +80,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=AS-Tests-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ant $ENVIRONMENT clean deploy-jboss50 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -61,7 +62,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -79,9 +80,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=JBWS-CoreTests-AS-4.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3 ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss40 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,13 +49,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -66,9 +67,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=JBWS-CoreTests-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,13 +49,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -66,9 +67,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=JBWS-CoreTests-AS-4.2-JDK6 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -28,25 +29,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -59,13 +60,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -77,9 +78,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=JBWS-CoreTests-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss50 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,13 +49,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -66,9 +67,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-Native-AS-4.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -20,12 +21,12 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist @@ -38,13 +39,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +58,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -75,9 +76,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-Native-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -20,12 +21,12 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist @@ -38,13 +39,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +58,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -75,9 +76,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-Native-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -20,12 +21,12 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist @@ -38,13 +39,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -57,7 +58,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -75,9 +76,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-SunRI-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -19,7 +20,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro @@ -37,13 +38,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,7 +57,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -74,8 +75,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.metro.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-SunRI-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -19,7 +20,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro @@ -37,13 +38,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,7 +57,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -74,8 +75,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.metro.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-XFire-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -19,7 +20,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro @@ -37,13 +38,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,7 +57,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -74,8 +75,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.cxf.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Distro-XFire-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -19,7 +20,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build distro @@ -37,13 +38,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -56,7 +57,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -74,8 +75,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.cxf.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-Native-AS-4.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3 ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build jbws-jboss40 # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss40 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,13 +49,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -66,9 +67,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-Native-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build jbws-jboss42 # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,13 +49,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -66,9 +67,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-Native-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; @@ -17,25 +18,25 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build deploy-jboss50 # -cd $JBWSDIR/jbossws-core +cd $STACKDIR cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss50 # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,13 +49,13 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -66,9 +67,13 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.framework.url(a)&lt;/remote&gt; + <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote&gt;@hudson.native.url(a)&lt;/remote&gt; + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-SunRI-AS-4.2 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -17,7 +18,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build sunri @@ -29,13 +30,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,7 +49,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -66,8 +67,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.metro.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-SunRI-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; @@ -17,7 +18,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build sunri-jboss50 @@ -29,13 +30,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,7 +49,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -66,8 +67,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.metro.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-XFire-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; @@ -17,7 +18,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build xfire @@ -29,13 +30,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,7 +49,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -66,8 +67,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.cxf.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-03 15:15:29 UTC (rev 4191) +++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-03 15:25:44 UTC (rev 4192) @@ -9,7 +9,8 @@ MODULE=Integration-XFire-AS-5.0 WORKSPACE=`pwd` -JBWSDIR=$WORKSPACE/jbossws +FRAMEWORKDIR=$WORKSPACE/framework +STACKDIR=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT=&quot;-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; @@ -17,7 +18,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # Build xfire @@ -29,13 +30,13 @@ # # start jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR # Was it successfully started? -$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$FRAMEWORKDIR/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 - $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR + $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi @@ -48,7 +49,7 @@ # # stop jbossas # -$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> @@ -66,8 +67,8 @@ <scm class="hudson.scm.SubversionSCM"> <locations> <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@svn.url(a)&lt;/remote&gt; - <local>jbossws</local> + <remote&gt;@hudson.cxf.url(a)&lt;/remote&gt; + <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate>