Author: thomas.diesler(a)jboss.com Date: 2007-01-26 18:24:29 -0500 (Fri, 26 Jan 2007) New Revision: 2149 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/UnifiedVirtualFile.java Removed: trunk/build/hudson/hudson-home/hudson.scm.CVSSCM.xml trunk/build/hudson/hudson-home/hudson.scm.SubversionSCM.xml trunk/build/hudson/hudson-home/hudson.tasks.Ant.xml trunk/build/hudson/hudson-home/hudson.tasks.Maven.xml trunk/build/hudson/hudson-home/hudson.tasks.Shell.xml trunk/build/hudson/hudson-home/hudson.triggers.SCMTrigger.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedVirtualFile.java trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/.cvsignore Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/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-jdk14/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/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml trunk/build/version.properties trunk/integration-jboss40/build.xml trunk/integration-jboss42/build.xml trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java trunk/integration-jboss50/build.xml trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Resurect BPEL test.Fix NPE in jboss42 with invalid vfsRootFix JMS endpoint for jboss42 Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/ant-import/build-hudson.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -81,6 +81,7 @@ <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> <filter token="hudson.home" value="${hudson.home}"/> + <filtersfile file="${build.dir}/version.properties"/> <filtersfile file="${build.dir}/ant.properties"/> </filterset> </copy> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -25,15 +25,17 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> @@ -62,7 +64,6 @@ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> @@ -72,7 +73,9 @@ <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.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"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> + + <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> + <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/ant.properties.example 2007-01-26 23:24:29 UTC (rev 2149) @@ -26,15 +26,19 @@ hudson.jdk15=/usr/java/jdk1.5 hudson.jdk14=/usr/java/jdk1.4 +hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk hudson.jboss50.build=jboss-5.0.0.Beta2 +hudson.jboss50.rev=59935 + +hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2 hudson.jboss42.build=jboss-4.2.0.CR1 +hudson.jboss42.rev=HEAD + +hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0 hudson.jboss40.build=jboss-4.0.5.SP1 - -hudson.jboss50.rev=HEAD -hudson.jboss42.rev=HEAD hudson.jboss40.rev=HEAD -hudson.mail.recipients=thomas.diesler(a)jboss.com +hudson.mail.recipients=yourname(a)jboss.com hudson.smtp.host=pobox-2.corp.redhat.com # JBoss Repository Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/build.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -52,9 +52,10 @@ </target> <target name="main" description="Executes the default target (most)." depends="most"> - - <echo message="jbossws.integration.target = ${jbossws.integration.target}"/> - <echo message="To deploy jbossws, run: ant deploy-${jbossws.integration.target}"/> + <echo message="**********************************"/> + <echo message="* JBossWS core sucessfully build *"/> + <echo message="* ant hudson-setup *"/> + <echo message="**********************************"/> </target> <target name="most" description="Builds almost everything." depends="jars"/> @@ -62,51 +63,4 @@ <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> </target> - <target name="setup-hudson" description="Setup the Hudson QA environment"> - <echo/> - <echo message="hudson.root = ${hudson.root}"/> - <echo/> - - <mkdir dir="${hudson.root}"/> - <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> - <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> - <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/> - <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/> - - <!-- Configure Tomcat --> - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - <copy todir="${hudson.tomcat}"> - <fileset dir="${build.dir}/hudson/apache-tomcat"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filter token="hudson.home" value="${hudson.home}"/> - </filterset> - </copy> - - <!-- Configure Hudson --> - <copy todir="${hudson.home}" overwrite="true"> - <fileset dir="${build.dir}/hudson/hudson-home"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filter token="hudson.home" value="${hudson.home}"/> - <filter token="jbossws.hudson.mail" value="${jbossws.hudson.mail}"/> - </filterset> - </copy> - - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log"> - <arg line="start"/> - </exec> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson sucessfuly started *"/> - <echo message="* http://localhost:8180/hudson *"/> - <echo message="*************************************"/> - <echo/> - - </target> - - </project> Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -2,6 +2,26 @@ <hudson> <numExecutors>1</numExecutors> <useSecurity>false</useSecurity> + <systemMessage> +<![CDATA[ + <h2&gt;JBossWS-(a)version.id@ QA Environment</h2> + + <table> + <tr><th align=left>SVN:</th><td>@svn.url@</td></tr> + </table> + <p/> + + <b>Target Container</b> + <p/> + + <table> + <tr align=center><th align=left&gt;@hudson.jboss50.build(a)&lt;/th&gt;&lt;td&gt;svn co -r(a)hudson.jboss50.rev@ @hudson.jboss50.url@</td></tr> + <tr align=center><th align=left&gt;@hudson.jboss42.build(a)-ejb3&lt;/th&gt;&lt;td&gt;svn co -r(a)hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr> + <tr align=center><th align=left&gt;@hudson.jboss40.build(a)-ejb3&lt;/th&gt;&lt;td&gt;svn co -r(a)hudson.jboss40.rev@ @hudson.jboss40.url@</td></tr> + <tr align=center><th align=left>apache-tomcat-@apache-tomcat@</th></tr> + </table> +]]> + </systemMessage> <jdks/> <slaves/> <quietPeriod>5</quietPeriod> @@ -74,7 +94,6 @@ <jobNames class="tree-set"> <no-comparator/> <string>JBWS-Samples-AS-4.0</string> - <string>JBWS-Samples-AS-4.0-jdk14</string> <string>JBWS-Samples-AS-4.2</string> <string>JBWS-Samples-AS-5.0</string> <string>JBWS-Samples-TC-5.5</string> Deleted: trunk/build/hudson/hudson-home/hudson.scm.CVSSCM.xml =================================================================== --- trunk/build/hudson/hudson-home/hudson.scm.CVSSCM.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/hudson.scm.CVSSCM.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.scm.CVSSCM-DescriptorImpl> - <cvsPassFile></cvsPassFile> - <browsers/> -</hudson.scm.CVSSCM-DescriptorImpl> \ No newline at end of file Deleted: trunk/build/hudson/hudson-home/hudson.scm.SubversionSCM.xml =================================================================== --- trunk/build/hudson/hudson-home/hudson.scm.SubversionSCM.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/hudson.scm.SubversionSCM.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,4 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.scm.SubversionSCM-DescriptorImpl> - <svnExe>svn</svnExe> -</hudson.scm.SubversionSCM-DescriptorImpl> \ No newline at end of file Deleted: trunk/build/hudson/hudson-home/hudson.tasks.Ant.xml =================================================================== --- trunk/build/hudson/hudson-home/hudson.tasks.Ant.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/hudson.tasks.Ant.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,4 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.tasks.Ant-DescriptorImpl> - <installations/> -</hudson.tasks.Ant-DescriptorImpl> \ No newline at end of file Deleted: trunk/build/hudson/hudson-home/hudson.tasks.Maven.xml =================================================================== --- trunk/build/hudson/hudson-home/hudson.tasks.Maven.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/hudson.tasks.Maven.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,4 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.tasks.Maven-DescriptorImpl> - <installations/> -</hudson.tasks.Maven-DescriptorImpl> \ No newline at end of file Deleted: trunk/build/hudson/hudson-home/hudson.tasks.Shell.xml =================================================================== --- trunk/build/hudson/hudson-home/hudson.tasks.Shell.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/hudson.tasks.Shell.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,4 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.tasks.Shell-DescriptorImpl> - <shell>/bin/sh</shell> -</hudson.tasks.Shell-DescriptorImpl> \ No newline at end of file Deleted: trunk/build/hudson/hudson-home/hudson.triggers.SCMTrigger.xml =================================================================== --- trunk/build/hudson/hudson-home/hudson.triggers.SCMTrigger.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/hudson.triggers.SCMTrigger.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,4 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<hudson.triggers.SCMTrigger-DescriptorImpl> - <maximumThreads>0</maximumThreads> -</hudson.triggers.SCMTrigger-DescriptorImpl> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -7,7 +7,7 @@ # Module settings # MODULE=AS-4.0 -SVNBASE=Branch_4_0 +SVNBASE=`basename @hudson.jboss40.url@` # # checkout with an explicit version @@ -15,7 +15,7 @@ if [ -d "$SVNBASE" ]; then svn up -r(a)hudson.jboss40.rev@ $SVNBASE else - svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE + svn co -r(a)hudson.jboss40.rev@ @hudson.jboss40.url@ fi # @@ -34,11 +34,11 @@ </hudson.tasks.Shell> </builders> <publishers class="vector"> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -7,7 +7,7 @@ # Module settings # MODULE=AS-4.0-jdk14 -SVNBASE=Branch_4_0 +SVNBASE=`basename @hudson.jboss40.url@` # # checkout with an explicit version @@ -15,7 +15,7 @@ if [ -d "$SVNBASE" ]; then svn up -r(a)hudson.jboss40.rev@ $SVNBASE else - svn co -r(a)hudson.jboss40.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE + svn co -r(a)hudson.jboss40.rev@ @hudson.jboss40.url@ fi export JAVA_HOME=(a)hudson.jdk14@ @@ -36,11 +36,11 @@ </hudson.tasks.Shell> </builders> <publishers class="vector"> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -7,7 +7,7 @@ # Module settings # MODULE=AS-4.2 -SVNBASE=Branch_4_2 +SVNBASE=`basename @hudson.jboss42.url@` # # checkout with an explicit version @@ -15,7 +15,7 @@ if [ -d "$SVNBASE" ]; then svn up -r(a)hudson.jboss42.rev@ $SVNBASE else - svn co -r(a)hudson.jboss42.rev@ https://svn.jboss.org/repos/jbossas/branches/$SVNBASE + svn co -r(a)hudson.jboss42.rev@ @hudson.jboss42.url@ fi # @@ -34,11 +34,11 @@ </hudson.tasks.Shell> </builders> <publishers class="vector"> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -7,7 +7,7 @@ # Module settings # MODULE=AS-5.0 -SVNBASE=trunk +SVNBASE=`basename @hudson.jboss50.url@` # # checkout with an explicit version @@ -15,7 +15,7 @@ if [ -d "$SVNBASE" ]; then svn up -r(a)hudson.jboss50.rev@ $SVNBASE else - svn co -r(a)hudson.jboss50.rev@ https://svn.jboss.org/repos/jbossas/$SVNBASE + svn co -r(a)hudson.jboss50.rev@ @hudson.jboss50.url@ fi # @@ -34,11 +34,11 @@ </hudson.tasks.Shell> </builders> <publishers class="vector"> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -28,7 +28,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss40 +ant $ENVIRONMENT clean deploy-jboss40 # # build the testsuite @@ -65,11 +65,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -28,7 +28,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss40-jdk14 +ant $ENVIRONMENT clean deploy-jboss40-jdk14 export JAVA_HOME=(a)hudson.jdk14@ @@ -67,11 +67,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -28,7 +28,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 +ant $ENVIRONMENT clean deploy-jboss42 # # build the testsuite @@ -65,11 +65,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -28,7 +28,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 +ant $ENVIRONMENT clean deploy-jboss50 # # build the testsuite @@ -65,11 +65,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -22,7 +22,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 +ant $ENVIRONMENT clean deploy-jboss42 # # start jbossas @@ -54,11 +54,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -22,7 +22,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 +ant $ENVIRONMENT clean deploy-jboss50 # # start jbossas @@ -54,11 +54,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -54,11 +54,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -54,11 +54,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -57,11 +57,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -57,11 +57,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -57,11 +57,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -55,11 +55,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -52,11 +52,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -54,11 +54,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -52,11 +52,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> 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-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -52,11 +52,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -53,11 +53,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -57,11 +57,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -59,11 +59,11 @@ <hudson.tasks.junit.JUnitResultArchiver> <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@jbossws.hudson.mail(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.SubversionSCM"> Modified: trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -27,11 +27,11 @@ </hudson.tasks.Shell> </builders> <publishers class="vector"> - <hudson.tasks.Mailer> + <!--hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> + <hudson.tasks.Mailer--> </publishers> <buildWrappers class="vector"/> <scm class="hudson.scm.NullSCM"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/build/version.properties 2007-01-26 23:24:29 UTC (rev 2149) @@ -24,11 +24,13 @@ # thirdparty library versions apache-ant=1.6.5 +apache-collections=3.1 apache-log4j=1.2.8 apache-logging=1.0.5.GA-jboss apache-tomcat=5.5.20 apache-xalan=j_2.7.0 apache-xerces=2.7.1 +dom4j=1.6.1 gnu-getopt=1.0.10 hibernate=3.2.1.GA jboss-backport-concurrent=2.1.0.GA Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/integration-jboss40/build.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -321,6 +321,8 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> + <!-- deploy the BPEL sar --> + <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -360,6 +362,8 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> + <!-- deploy the BPEL sar --> + <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${jboss40.output.lib.dir}"> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/integration-jboss42/build.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -155,6 +155,8 @@ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> + <!-- deploy the BPEL sar --> + <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -31,6 +31,7 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; /** * Build container independent deployment info. @@ -48,10 +49,10 @@ buildDeploymentInfo(udi.parent, di.parent); } + udi.vfRoot = new ResourceLoaderAdapter(di.localCl); udi.name = di.getCanonicalName(); udi.simpleName = di.shortName; udi.url = getDeploymentURL(di); - udi.vfRoot = null; udi.classLoader = di.annotationsCl; udi.deployedObject = di.deployedObject; Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/integration-jboss50/build.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -164,6 +164,8 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> + <!-- deploy the BPEL sar --> + <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${jboss.server.instance}/deploy"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -25,7 +25,7 @@ import java.net.URL; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; // $Id$ Modified: trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -43,6 +43,7 @@ import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.w3c.dom.Element; /** @@ -67,6 +68,7 @@ String contextRoot = getContextRoot(warURL); + udi.vfRoot = new ResourceLoaderAdapter(loader); udi.name = contextRoot; udi.simpleName = contextRoot.substring(1) + ".war"; udi.url = warURL; Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/UnifiedVirtualFile.java (from rev 2145, branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/UnifiedVirtualFile.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/UnifiedVirtualFile.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core; + +// $Id$ + +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; + +/** + * An adaptor to a VirtualFile from jboss-vfs.jar + * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public interface UnifiedVirtualFile extends Serializable +{ + UnifiedVirtualFile findChild(String child) throws IOException; + + URL toURL(); +} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -47,7 +47,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; /** * This ServiceObjectFactory reconstructs a javax.xml.ws.Service Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; /** * Represents a <service-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -48,7 +48,7 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -31,6 +31,8 @@ import javax.management.ObjectName; +import org.jboss.ws.core.UnifiedVirtualFile; + /** * The container independent deployment info. * Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedVirtualFile.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedVirtualFile.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/UnifiedVirtualFile.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.server; - -// $Id$ - -import java.io.IOException; -import java.io.Serializable; -import java.net.URL; - -/** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public interface UnifiedVirtualFile extends Serializable -{ - UnifiedVirtualFile findChild(String child) throws IOException; - - URL toURL(); -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -25,8 +25,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.extensions.security.WSSecurityDispatcher; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -26,8 +26,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; -import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.extensions.security.WSSecurityDispatcher; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -24,7 +24,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; import org.jboss.ws.metadata.j2ee.*; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -33,8 +33,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.Style; -import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.*; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.NCName; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -43,6 +43,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonSOAPBinding; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.Use; @@ -50,10 +51,9 @@ import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; +import org.jboss.ws.core.jaxws.JAXBContextCache; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; -import org.jboss.ws.core.jaxws.JAXBContextCache; -import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -28,7 +28,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; /** * The default file adapter loads resources through an associated classloader. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -30,8 +30,8 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; +import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.ServiceEndpointManager; -import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -21,7 +21,7 @@ */ package org.jboss.ws.metadata.wsse; -import org.jboss.ws.core.server.UnifiedVirtualFile; +import org.jboss.ws.core.UnifiedVirtualFile; import java.io.IOException; import java.io.InputStream; Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -1526,11 +1526,13 @@ </metainf> </jar> - <!-- jaxrpc-samples-wssecurity-sign --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <!-- jaxrpc-samples-store-pass-encrypt.war --> + <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> @@ -1538,7 +1540,7 @@ <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> <include name="jboss-wsse-server.xml"/> </webinf> <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> @@ -1546,35 +1548,66 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> </metainf> </jar> - <!-- jaxrpc-samples-wssecurity-encrypt --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <!-- jaxrpc-samples-wsbpel --> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" + webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" /> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" /> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" /> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> + <include name="webservices.xml" /> + <include name="classes/bpel-application.xml" /> + </webinf> + <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> + <include name="jaxrpc-mapping.xml" /> + <include name="wsdl/**" /> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" /> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" /> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF"> + <include name="application-client.xml" /> + <include name="jboss-client.xml" /> + </metainf> + <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> + <include name="jaxrpc-mapping.xml" /> + </metainf> + </jar> + + <!-- jaxrpc-samples-wssecurity-sign --> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> <include name="jboss-wsse-server.xml"/> </webinf> <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> @@ -1582,12 +1615,12 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> @@ -1598,21 +1631,19 @@ </metainf> </jar> - <!-- jaxrpc-samples-store-pass-encrypt.war --> - <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> + <!-- jaxrpc-samples-wssecurity-encrypt --> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> <include name="jboss-wsse-server.xml"/> </webinf> <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> @@ -1620,19 +1651,19 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> </metainf> </jar> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/build.xml 2007-01-26 23:24:29 UTC (rev 2149) @@ -185,6 +185,7 @@ </target> <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> + <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.jars.classpath"/> @@ -203,6 +204,21 @@ <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <path refid="javac.classpath"/> </path> + + <!-- The jBPM BPEL classpath --> + <path id="jbpm.bpel.classpath"> + <path refid="jbossws.jars.classpath"/> + <fileset dir="${thirdparty.dir}/jbpm-bpel"> + <include name="jbpm*.jar" /> + <include name="commons-lang*.jar" /> + <include name="jaxen*.jar" /> + </fileset> + <pathelement location="${thirdparty.dir}/commons-collections.jar"/> + <pathelement location="${thirdparty.dir}/commons-logging.jar"/> + <pathelement location="${thirdparty.dir}/dom4j.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/jbpm-bpel"/> + </path> </target> <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> @@ -287,6 +303,10 @@ Generate samples sources --> <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpm.bpel.classpath"/> + </taskdef> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> <classpath location="${jbossws.client.jar}"/> @@ -296,6 +316,15 @@ <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> + + <mkdir dir="${tests.output.dir}/libs"/> + <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> + </zip> + + <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" + outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" /> + <mkdir dir="${tests.output.dir}/wstools/java"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> @@ -312,6 +341,7 @@ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" /> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${tests.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${tests.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -11,6 +11,7 @@ import java.rmi.RemoteException; import org.jboss.logging.Logger; +import org.jboss.ws.integration.jboss42.jms.JMSTransportSupport; /** * An example of a MDB acting as a web service endpoint. @@ -18,7 +19,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 02-Oct-2004 */ -public class OrganizationJMSEndpoint //extends JMSTransportSupport +public class OrganizationJMSEndpoint extends JMSTransportSupport { // provide logging private static final Logger log = Logger.getLogger(OrganizationJMSEndpoint.class); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-01-26 23:24:29 UTC (rev 2149) @@ -33,34 +33,31 @@ { private HelloWorldService service; - /* public static Test suite() { return JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); } - */ protected void setUp() throws Exception { + if (true) + { + System.out.println("FIXME: [JBWS-1496] BPEL in jbossws-samples"); + return; + } + if (service == null) { - if (isTargetJBoss()) - { - //InitialContext iniCtx = getInitialContext(); - //service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); - } - else - { - throw new IllegalStateException("Unsupported target server"); - } + InitialContext iniCtx = getInitialContext(); + service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); } } public void testSayHelloProxy() throws Exception { - if (isTargetJBoss()) + if (true) { - System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + System.out.println("FIXME: [JBWS-1496] BPEL in jbossws-samples"); return; } @@ -72,9 +69,9 @@ public void testSayHelloDII() throws Exception { - if (isTargetJBoss()) + if (true) { - System.out.println("FIXME: [JBWS-868] BPEL in jbossws-samples"); + System.out.println("FIXME: [JBWS-1496] BPEL in jbossws-samples"); return; } Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/.cvsignore =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/.cvsignore 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/.cvsignore 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,2 +0,0 @@ -wsdl -jaxrpc-mapping.xml Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,7 +1,9 @@ +# Always excludes org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** + +# EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase* org/jboss/test/ws/jaxws/webserviceref/** - Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,16 +1,17 @@ +# Always excludes org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* -org/jboss/test/ws/jaxws/webserviceref/** -# EJB3 excludes +# EJB3/Injection excludes org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase* org/jboss/test/ws/jaxws/eardeployment/** +org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws944/** org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/webserviceref/** org/jboss/test/ws/jaxws/xop/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,6 +1,9 @@ +# Always excludes org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** + +# EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase* org/jboss/test/ws/jaxws/webserviceref/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,16 +1,17 @@ +# Always excludes org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* -org/jboss/test/ws/jaxws/webserviceref/** -# EJB3 excludes +# EJB3/Injection excludes org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase* org/jboss/test/ws/jaxws/eardeployment/** +org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws944/** org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/webserviceref/** org/jboss/test/ws/jaxws/xop/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-26 23:24:29 UTC (rev 2149) @@ -1,3 +1,7 @@ -org/jboss/test/ws/interop/microsoft/** +# Always excludes +org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** + +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-26 22:57:52 UTC (rev 2148) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-26 23:24:29 UTC (rev 2149) @@ -3,7 +3,7 @@ org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** -# EJB/Injection excludes +# EJB3/Injection excludes org/jboss/test/ws/jaxrpc/jbws1011/** org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*