Author: thomas.diesler(a)jboss.com Date: 2007-05-12 04:05:23 -0400 (Sat, 12 May 2007) New Revision: 3056 Added: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml trunk/jbossws-core/ant-import/build-deploy.xml Removed: trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl trunk/jbossws-spi/version.properties Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/version.properties trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/build.xml trunk/jbossws-spi/ trunk/jbossws-spi/ant-import/build-thirdparty.xml trunk/jbws-jboss42/ trunk/jbws-jboss50/ trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ trunk/sunri-jboss50/ Log: Add JBRI to Hudson Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/ant-import/build-hudson.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -32,6 +32,11 @@ <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"/> + + <property name="thirdparty.dir" value="${core.dir}/thirdparty"/> + <mkdir dir="${build.output.dir}"/> + <mkdir dir="${thirdparty.dir}"/> + </target> <!-- Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/ant.properties.example 2007-05-12 08:05:23 UTC (rev 3056) @@ -8,6 +8,9 @@ #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 +# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] +jbossws.integration.target=jboss50 + # The JBoss server instance jboss.server.instance=default Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/build.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -18,6 +18,8 @@ <import file="${basedir}/ant-import/build-samples.xml"/> <import file="${basedir}/ant-import/build-hudson.xml"/> + <property name="build.output.dir" value="${build.dir}/output"/> + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> Added: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -0,0 +1,84 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBRI-Integration-AS-5.0 + +WORKSPACE=`pwd` +JBWSDIR=$WORKSPACE/jbossws +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; + +# +# copy ant.properties +# +cd $JBWSDIR/build +cp ant.properties.example ant.properties + +# +# Build sunri-jboss50 +# +cd $JBWSDIR/sunri-jboss50 +ant $ENVIRONMENT clean deploy + +# +# stop jbossas +# +$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# start jbossas +# +$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start +sleep 60 + +# +# execute tests +# +ant $ENVIRONMENT tests-clean tests 2>&amp;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&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;@svn.url(a)&lt;/remote&gt; + <local>jbossws</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/JBRI-Integration-AS-5.0/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: 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 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -57,12 +57,13 @@ # start jbossas # $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start +sleep 60 # # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # @@ -89,14 +90,6 @@ <remote&gt;@svn.url(a)&lt;/remote&gt; <local>jbossws</local> </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@hudson.jbossws-spi.url(a)&lt;/remote&gt; - <local>jbossws-spi</local> - </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@hudson.jbws-jboss42.url(a)&lt;/remote&gt; - <local>jbws-jboss42</local> - </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: 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 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -10,37 +10,20 @@ 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=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; # -# Build jbossws-spi +# copy ant.properties # -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 -cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/thirdparty/jbossws-spi -cp $JBWSDIR/jbossws-core/output/lib/*.jar $INTDIR/thirdparty/jbossws-core -ant $ENVIRONMENT clean main +cd $JBWSDIR/jbws-jboss50 +ant $ENVIRONMENT clean deploy # # stop jbossas @@ -48,21 +31,15 @@ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# deploy to jboss -# -cd $INTDIR -ant $ENVIRONMENT deploy - -# # start jbossas # $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start +sleep 60 # # execute tests # -cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # @@ -89,14 +66,6 @@ <remote&gt;@svn.url(a)&lt;/remote&gt; <local>jbossws</local> </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@hudson.jbossws-spi.url(a)&lt;/remote&gt; - <local>jbossws-spi</local> - </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote&gt;@hudson.jbws-jboss50.url(a)&lt;/remote&gt; - <local>jbws-jboss50</local> - </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -43,7 +43,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -38,7 +38,7 @@ # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -38,7 +38,7 @@ # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -38,7 +38,7 @@ # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss50 # @@ -37,8 +38,7 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/version.properties 2007-05-12 08:05:23 UTC (rev 3056) @@ -8,7 +8,7 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT -implementation.title=JBoss Web Services +implementation.title=JBoss Web Services - JBossWS implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org Added: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml (rev 0) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss50 --> + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> + <ant antfile="${jbws.jboss50.dir}/build.xml" target="deploy" inheritall="false"/> + </target> + +</project> Property changes on: trunk/jbossws-core/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -14,9 +14,31 @@ <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="jbossws.integration.target" value="jboss50"/> - <property name="excludesfile" value="${basedir}/src/test/resources/tests-jboss50-excludes.txt"/> + <!-- Available integration target --> + <property name="integration.target.${jbossws.integration.target}" value="true"/> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + <condition property="jboss.home" value="${jboss40.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> + </condition> + + <!-- Integration Target Server --> + <condition property="jbossws.integration.target.jboss"> + <isset property="jboss.home"/> + </condition> + <condition property="jbossws.integration.target.tomcat"> + <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> + </condition> + + <!-- Define excluded tests --> + <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> + <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> <!-- Init the various classpaths @@ -36,11 +58,11 @@ <path id="javac.classpath"> <path refid="jbossws.classpath"/> <path refid="core.thirdparty.classpath"/> - <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> - <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/policy.jar"/> - <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${core.thirdparty.dir}/junit.jar"/> + <pathelement location="${core.thirdparty.dir}/qdox.jar"/> + <pathelement location="${core.thirdparty.dir}/policy.jar"/> + <pathelement location="${core.thirdparty.dir}/xmlunit1.0.jar"/> <pathelement location="${jboss.home}/client/jboss-ejb3-client.jar"/> </path> @@ -69,18 +91,18 @@ <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/commons-collections.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/jaxen.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> + <pathelement location="${core.thirdparty.dir}/commons-collections.jar"/> + <pathelement location="${core.thirdparty.dir}/commons-logging.jar"/> + <pathelement location="${core.thirdparty.dir}/dom4j.jar"/> + <pathelement location="${core.thirdparty.dir}/jaxen.jar"/> + <pathelement location="${core.thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-logging-log4j.jar"/> <!-- - <pathelement location="${thirdparty.dir}/log4j.jar"/> + <pathelement location="${core.thirdparty.dir}/log4j.jar"/> <pathelement location="${tests.etc.dir}"/> --> </path> @@ -96,8 +118,8 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + <classpath location="${core.thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${core.thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> @@ -119,7 +141,7 @@ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> </zip> <!-- Copy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> + <copy file="${core.thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> <!-- generate wsdl binding and service definitions for bpel processes --> <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> @@ -137,11 +159,11 @@ <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> - <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath refid="core.thirdparty.classpath"/> + <classpath location="${core.thirdparty.dir}/jbossretro-rt.jar"/> + <classpath location="${core.thirdparty.dir}/jboss-backport-concurrent.jar"/> + <classpath location="${core.thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> @@ -193,9 +215,9 @@ <!-- Define the JAX-WS wsprovide task --> <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> - <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath refid="core.thirdparty.classpath"/> + <classpath location="${core.thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> </taskdef> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -25,22 +25,23 @@ <target name="core-thirdparty-init" depends="prepare"> <property name="core.thirdparty.dir" value="${core.dir}/thirdparty"/> - <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="core.checksum.ok"/> <condition property="core.force.thirdparty"> <or> <not> <available file="${core.thirdparty.dir}" type="dir"/> </not> - <isfalse value="${checksum.ok}"/> + <isfalse value="${core.checksum.ok}"/> <isset property="force.thirdparty.get"/> </or> </condition> + <echo message="checksum.ok = ${core.checksum.ok}"/> </target> <!-- thirdpartry-get --> - <target name="core-thirdparty-get" if="core.force.thirdparty" + <target name="core-thirdparty-get" depends="core-thirdparty-init" if="core.force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${core.thirdparty.dir}"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/build.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -16,6 +16,7 @@ <import file="${basedir}/../build/ant-import/build-setup.xml"/> <import file="${spi.dir}/build.xml"/> + <import file="${core.dir}/ant-import/build-deploy.xml"/> <import file="${core.dir}/ant-import/build-thirdparty.xml"/> <import file="${core.dir}/ant-import/build-testsuite.xml"/> Deleted: trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl 2007-05-12 08:05:23 UTC (rev 3056) @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<definitions name='HolderService' targetNamespace='http://holder.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://holder.jaxws.ws.test.jboss.org/' version='1.0' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='echoInOuts' type='tns:echoInOuts'/> - <xs:element name='echoInOutsResponse' type='tns:echoInOutsResponse'/> - <xs:element name='echoMixed' type='tns:echoMixed'/> - <xs:element name='echoMixedResponse' type='tns:echoMixedResponse'/> - <xs:element name='echoOuts' type='tns:echoOuts'/> - <xs:element name='echoOutsResponse' type='tns:echoOutsResponse'/> - <xs:element name='in' nillable='true' type='xs:string'/> - <xs:element name='inout' nillable='true' type='xs:string'/> - <xs:element name='out' nillable='true' type='xs:string'/> - <xs:complexType name='echoOuts'> - <xs:sequence> - <xs:element minOccurs='0' name='in1' type='xs:int'/> - <xs:element minOccurs='0' name='in2' type='xs:string'/> - <xs:element minOccurs='0' name='in3' type='xs:long'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoOutsResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:long'/> - <xs:element minOccurs='0' name='out1' type='xs:int'/> - <xs:element minOccurs='0' name='out2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoInOuts'> - <xs:sequence> - <xs:element minOccurs='0' name='in1' type='xs:long'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoInOutsResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:long'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoMixed'> - <xs:sequence> - <xs:element minOccurs='0' name='in1' type='xs:int'/> - <xs:element minOccurs='0' name='in2' type='xs:string'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - <xs:element minOccurs='0' name='in3' type='xs:long'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoMixedResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:long'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - <xs:element minOccurs='0' name='out1' type='xs:int'/> - <xs:element minOccurs='0' name='out2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='Holder_echoBareOutResponse'> - <part element='tns:out' name='out'/> - </message> - <message name='Holder_echoOutsResponse'> - <part element='tns:echoOutsResponse' name='echoOutsResponse'/> - </message> - <message name='Holder_echoMixed'> - <part element='tns:echoMixed' name='echoMixed'/> - </message> - <message name='Holder_echoInOuts'> - <part element='tns:echoInOuts' name='echoInOuts'/> - </message> - <message name='Holder_echoBareOut'> - <part element='tns:in' name='in'/> - </message> - <message name='Holder_echoBareInOut'> - <part element='tns:inout' name='inout'/> - </message> - <message name='Holder_echoMixedResponse'> - <part element='tns:echoMixedResponse' name='echoMixedResponse'/> - </message> - <message name='Holder_echoInOutsResponse'> - <part element='tns:echoInOutsResponse' name='echoInOutsResponse'/> - </message> - <message name='Holder_echoOuts'> - <part element='tns:echoOuts' name='echoOuts'/> - </message> - <message name='Holder_echoBareInOutResponse'> - <part element='tns:inout' name='inout'/> - </message> - <portType name='Holder'> - <operation name='echoBareInOut' parameterOrder='inout'> - <input message='tns:Holder_echoBareInOut'/> - <output message='tns:Holder_echoBareInOutResponse'/> - </operation> - <operation name='echoBareOut' parameterOrder='in out'> - <input message='tns:Holder_echoBareOut'/> - <output message='tns:Holder_echoBareOutResponse'/> - </operation> - <operation name='echoInOuts' parameterOrder='echoInOuts'> - <input message='tns:Holder_echoInOuts'/> - <output message='tns:Holder_echoInOutsResponse'/> - </operation> - <operation name='echoMixed' parameterOrder='echoMixed'> - <input message='tns:Holder_echoMixed'/> - <output message='tns:Holder_echoMixedResponse'/> - </operation> - <operation name='echoOuts' parameterOrder='echoOuts'> - <input message='tns:Holder_echoOuts'/> - <output message='tns:Holder_echoOutsResponse'/> - </operation> - </portType> - <binding name='HolderBinding' type='tns:Holder'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoBareInOut'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoBareOut'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoInOuts'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoMixed'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoOuts'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='HolderService'> - <port binding='tns:HolderBinding' name='HolderPort'> - <soap:address location='http:///@jbosstest.host.name@:8080/jaxws-holder/HolderService'/> - </port> - </service> -</definitions> Property changes on: trunk/jbossws-spi ___________________________________________________________________ Name: svn:ignore + output* thirdparty Modified: trunk/jbossws-spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -23,19 +23,20 @@ <target name="spi-thirdparty-init" depends="prepare"> <property name="spi.thirdparty.dir" value="${spi.dir}/thirdparty"/> - <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="spi.checksum.ok"/> <condition property="spi.force.thirdparty"> <or> <not> <available file="${spi.thirdparty.dir}" type="dir"/> </not> - <isfalse value="${checksum.ok}"/> + <isfalse value="${spi.checksum.ok}"/> <isset property="force.thirdparty.get"/> </or> </condition> + <echo message="checksum.ok = ${spi.checksum.ok}"/> </target> - <target name="spi-thirdparty-get" if="spi.force.thirdparty" + <target name="spi-thirdparty-get" depends="spi-thirdparty-init" if="spi.force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${spi.thirdparty.dir}"/> Deleted: trunk/jbossws-spi/version.properties =================================================================== --- trunk/jbossws-spi/version.properties 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-spi/version.properties 2007-05-12 08:05:23 UTC (rev 3056) @@ -1,76 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -specification.title=JBossWS-SPI -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-spi-2.1 - -version.id=2.1.0.DEV -repository.id=SNAPSHOT - -implementation.title=JBoss Web Services - JBossWS/SPI -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - - -# Thirdparty library versions -jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-jbossxb=1.0.0.CR10 -jboss-microcontainer=2.0.0.Beta3 -sun-jaxws=2.1.1 -sun-servlet=2.5 - - - - - - - - - - - -apache-xmlsec=1.3.0 -ibm-wsdl4j=1.6.2 -javassist=3.5.0.CR1 -jbossws-wsconsume-impl=2.0.0 -jbpm-bpel=1.1.0.Beta5 -sun-jaxb=2.0.3jboss -stax-api=1.0 - -# Build and Tomcat -jboss-jbossxb=1.0.0.CR10 -jboss-remoting=2.0.0.GA - -# thirdparty library versions -apache-ant=1.6.5 -apache-collections=3.1 -apache-log4j=1.2.8 -apache-logging=1.1.0.jboss -apache-tomcat=5.5.20 -apache-xalan=j_2.7.0 -apache-xerces=2.9.0 -dom4j=1.6.1 -eclipse-compiler=3.2.2 -gnu-getopt=1.0.10 -hibernate=3.2.1.GA -jaxen=1.1-beta-10 -jboss-backport-concurrent=2.1.0.GA -jboss-ejb3=1.0.0.CR9-jboss4.0.5 -jboss-jaxr=1.2.0.GA -jboss-jbossretro=1.0.4.GA -jboss-security=4.0.5.GA -jboss-vfs=2.0.0.Beta2 -jbossas-core-libs=4.0.5.GA -junit=3.8.1 -qdox=1.4 -sun-hudson=1.93 -sun-jaf=1.1 -sun-javamail=1.4 -sun-servlet=2.4 -woodstox=3.1.1 -wscommons-policy=1.0 -xmlunit=1.0 Property changes on: trunk/jbws-jboss42 ___________________________________________________________________ Name: svn:ignore + output* Property changes on: trunk/jbws-jboss50 ___________________________________________________________________ Name: svn:ignore + output* thirdparty version.properties.md5 Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -26,20 +26,22 @@ <property name="thirdparty.dir" value="${basedir}/thirdparty"/> <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <condition property="force.thirdparty.get"> + <condition property="jbws.force.thirdparty.get"> <or> <not> <available file="${thirdparty.dir}" type="dir"/> </not> <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> </or> </condition> + <echo message="checksum.ok = ${checksum.ok}"/> </target> <!-- thirdpartry-get --> - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="thirdparty-get" if="jbws.force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> @@ -67,6 +69,8 @@ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> Property changes on: trunk/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50 ___________________________________________________________________ Name: svn:externals + common https://svn.jboss.org/repos/jbossws/trunk/sunri-jboss50/src/main/java/org... Property changes on: trunk/sunri-jboss50 ___________________________________________________________________ Name: svn:ignore + output* version.properties.md5 thirdparty