Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 15:09:37 -0400 (Wed, 09 May 2007)
New Revision: 3023
Added:
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
Modified:
trunk/build/ant-import/build-thirdparty.xml
trunk/build/ant.properties.example
trunk/build/build.xml
trunk/build/version.properties
Log:
Fix path to jbossws-spi
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-05-09 19:09:37 UTC (rev 3023)
@@ -17,7 +17,7 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty"
depends="jbossws-spi-get,thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty"
depends="prepare,jbossws-spi-get,thirdparty-get,thirdparty-classpath">
</target>
<!--
@@ -66,8 +66,6 @@
<get
src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar"
dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar"
dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar"
dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar"
dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip"
dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar"
dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar"
dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar"
dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar"
usetimestamp="true" verbose="true"/>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/ant.properties.example 2007-05-09 19:09:37 UTC (rev 3023)
@@ -37,7 +37,7 @@
hudson.jbws-tc55.url=https://svn.jboss.org/repos/jbossws/projects/jbws-tc...
hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss50.build=jboss-5.0.0.Beta2
+hudson.jboss50.build=jboss-5.0.0.Beta3
hudson.jboss50.rev=HEAD
hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/build.xml 2007-05-09 19:09:37 UTC (rev 3023)
@@ -13,8 +13,8 @@
<project default="main" basedir="../build"
name="JBossWS-Build">
+ <import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-samples.xml"/>
<import file="${basedir}/ant-import/build-hudson.xml"/>
Added: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
(rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-09
19:09:37 UTC (rev 3023)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Integration-AS-4.2
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+SPIDIR=$WORKSPACE/jbossws-spi
+INTDIR=$WORKSPACE/jbws-jboss42
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/trunk/build/output/(a)hudson.jboss42.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# Build jbossws-spi
+#
+cd $SPIDIR
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+ant $ENVIRONMENT clean main
+
+#
+# Build jbossws
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi
+ant $ENVIRONMENT clean main
+
+#
+# Build jbws-jboss42
+#
+cd $INTDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/build/thirdparty/jbossws-spi
+cp $JBWSDIR/output/lib/*.jar $INTDIR/build/thirdparty/jbossws-core
+ant $ENVIRONMENT clean main
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $INTDIR/build
+ant $ENVIRONMENT deploy-jboss42
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $JBWSDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients(a)</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url(a)</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbossws-spi.url(a)</remote>
+ <local>jbossws-spi</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbws-jboss42.url(a)</remote>
+ <local>jbws-jboss42</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"/>
+ <description>Build and test jbossws-(a)version.id@ against
AS-4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on:
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
(rev 0)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-09
19:09:37 UTC (rev 3023)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-Integration-AS-5.0
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+SPIDIR=$WORKSPACE/jbossws-spi
+INTDIR=$WORKSPACE/jbws-jboss50
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@
+ENVIRONMENT="-Djbossws.integration.target=jboss50
-Djboss50.home=$JBOSS_INSTANCE"
+
+#
+# Build jbossws-spi
+#
+cd $SPIDIR
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+ant $ENVIRONMENT clean main
+
+#
+# Build jbossws
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi
+ant $ENVIRONMENT clean main
+
+#
+# Build jbws-jboss50
+#
+cd $INTDIR/build
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT thirdparty
+cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/build/thirdparty/jbossws-spi
+cp $JBWSDIR/output/lib/*.jar $INTDIR/build/thirdparty/jbossws-core
+ant $ENVIRONMENT clean main
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $INTDIR/build
+ant $ENVIRONMENT deploy-jboss50
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
+
+#
+# execute tests
+#
+cd $JBWSDIR/jbossws-tests
+ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients(a)</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url(a)</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbossws-spi.url(a)</remote>
+ <local>jbossws-spi</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jbws-jboss50.url(a)</remote>
+ <local>jbws-jboss50</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"/>
+ <description>Build and test jbossws-(a)version.id@ against
AS-5.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on:
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-09 19:05:56 UTC (rev 3022)
+++ trunk/build/version.properties 2007-05-09 19:09:37 UTC (rev 3023)
@@ -17,7 +17,7 @@
apache-xmlsec=1.3.0
ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
-jbossws-spi=SNAPSHOT
+jboss-jbossws-spi=SNAPSHOT
jbossws-wsconsume-impl=2.0.0
jbpm-bpel=1.1.0.Beta5
sun-jaxb=2.0.3jboss