Author: darran.lofthouse(a)jboss.com Date: 2008-08-15 11:05:15 -0400 (Fri, 15 Aug 2008) New Revision: 8109 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/build-thirdparty.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/etc/component-info.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties Log: Further version corrections and build script formatting. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/build-thirdparty.xml 2008-08-15 12:57:01 UTC (rev 8108) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import/build-thirdparty.xml 2008-08-15 15:05:15 UTC (rev 8109) @@ -126,47 +126,50 @@ <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target> - + <target name="thirdparty-classpath" depends="thirdparty-get"> - + <!-- The compile classpath for jbossws core --> - <path id="thirdparty.classpath"> - <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/getopt.jar"/> - <pathelement location="${thirdparty.dir}/javassist.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/jbosssx.jar"/> - <pathelement location="${thirdparty.dir}/mail.jar"/> - <pathelement location="${thirdparty.dir}/policy.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - <pathelement location="${thirdparty.dir}/xalan.jar"/> - <pathelement location="${thirdparty.dir}/xmlsec.jar"/> - <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jaxb-intros.jar"/> - </path> + <path id="thirdparty.classpath"> + <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> + <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar" /> + <pathelement + location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar" /> + <pathelement + location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar" /> + <pathelement location="${thirdparty.dir}/ant.jar" /> + <pathelement location="${thirdparty.dir}/activation.jar" /> + <pathelement location="${thirdparty.dir}/dom4j.jar" /> + <pathelement location="${thirdparty.dir}/getopt.jar" /> + <pathelement location="${thirdparty.dir}/javassist.jar" /> + <pathelement location="${thirdparty.dir}/jaxb-api.jar" /> + <pathelement location="${thirdparty.dir}/jaxb-impl.jar" /> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar" /> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar" /> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar" /> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar" /> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar" /> + <pathelement location="${thirdparty.dir}/jboss-j2ee.jar" /> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar" /> + <pathelement + location="${thirdparty.dir}/jboss-microcontainer.jar" /> + <pathelement location="${thirdparty.dir}/jboss-remoting.jar" /> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar" /> + <pathelement location="${thirdparty.dir}/jbosssx.jar" /> + <pathelement location="${thirdparty.dir}/mail.jar" /> + <pathelement location="${thirdparty.dir}/policy.jar" /> + <pathelement location="${thirdparty.dir}/servlet-api.jar" /> + <pathelement location="${thirdparty.dir}/stax-api.jar" /> + <pathelement location="${thirdparty.dir}/wsdl4j.jar" /> + <pathelement location="${thirdparty.dir}/wstx.jar" /> + <pathelement location="${thirdparty.dir}/xalan.jar" /> + <pathelement location="${thirdparty.dir}/xmlsec.jar" /> + <pathelement location="${thirdparty.dir}/xercesImpl.jar" /> + <pathelement location="${thirdparty.dir}/jboss-jaxb-intros.jar" /> + </path> + </target> </project> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml 2008-08-15 12:57:01 UTC (rev 8108) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-testsuite.xml 2008-08-15 15:05:15 UTC (rev 8109) @@ -10,218 +10,348 @@ <project> - <property name="tests.output.dir" value="${core.dir}/output/tests"/> - - <import file="${core.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <property name="tests.output.dir" value="${core.dir}/output/tests" /> - <!-- Define excluded tests --> - <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - - <property name="tests.dir" value="${core.dir}/src/test"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <import + file="${core.dir}/src/test-framework/ant-import/build-testsuite.xml" /> - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> + <!-- Define excluded tests --> + <property name="excludes-short-name" + value="test-excludes-${jbossws.integration.target}.txt" /> + <property name="excludesfile" + value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt" /> - <path id="ws.stack.classpath"> - <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - </path> + <property name="tests.dir" value="${core.dir}/src/test" /> + <property name="tests.java.dir" value="${tests.dir}/java" /> + <property name="tests.resources.dir" value="${tests.dir}/resources" /> + <!-- + Init the various classpaths + --> + <target name="tests-init" + depends="thirdparty-classpath,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${core.dir}/thirdparty/jbossws-common.jar" /> + <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar" /> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar" /> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar" /> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar" /> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar" /> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar" /> + </path> + <path id="tests.extra.classpath"> - <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${core.dir}/thirdparty/policy.jar"/> - <pathelement location="${core.dir}/thirdparty/qdox.jar"/> - <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> - <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/> + <pathelement + location="${core.dir}/thirdparty/jbossws-framework.jar" /> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar" /> + <pathelement location="${core.dir}/thirdparty/policy.jar" /> + <pathelement location="${core.dir}/thirdparty/qdox.jar" /> + <pathelement location="${core.dir}/thirdparty/stax-api.jar" /> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar" /> + <pathelement location="${core.dir}/thirdparty/wstx.jar" /> + <pathelement location="${core.dir}/thirdparty/xmlunit.jar" /> + <pathelement + location="${core.dir}/thirdparty/jboss-jaxb-intros.jar" /> </path> <!-- The jBPM BPEL classpath --> - <path id="jbpm.bpel.classpath"> - <path refid="ws.stack.classpath"/> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml --> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/> - <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/> - <pathelement location="${core.dir}/thirdparty/dom4j.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxen.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/> - <!-- - <pathelement location="${core.dir}/thirdparty/log4j.jar"/> - <pathelement location="${tests.etc.dir}"/> - --> - </path> + <path id="jbpm.bpel.classpath"> + <path refid="ws.stack.classpath" /> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel" /><!-- jbpm.cfg.xml --> + <pathelement + location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" /> + <pathelement + location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" /> + <pathelement + location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" /> + <pathelement + location="${core.dir}/thirdparty/commons-collections.jar" /> + <pathelement + location="${core.dir}/thirdparty/commons-logging.jar" /> + <pathelement location="${core.dir}/thirdparty/dom4j.jar" /> + <pathelement location="${core.dir}/thirdparty/jaxen.jar" /> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar" /> + <pathelement + location="${core.dir}/thirdparty/jboss-logging-log4j.jar" /> + <!-- + <pathelement location="${core.dir}/thirdparty/log4j.jar"/> + <pathelement location="${tests.etc.dir}"/> + --> + </path> - </target> + </target> - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> - <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> + <target name="wsconsume" depends="tests-init" + description="Consume JAX-WS contracts"> - <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> - <classpath refid="tests.client.classpath"/> + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" + classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath refid="tests.client.classpath" /> </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"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - </target> + <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" /> + <wsconsume + wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" + package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" + package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" + package="org.jboss.test.ws.interop.soapwsdl.baserpclit" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" + package="org.jboss.test.ws.jaxws.complex" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" + package="org.jboss.test.ws.jaxws.holder" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" + package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" + package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + <wsconsume + wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" + package="org.jboss.test.ws.jaxws.samples.wssecurity" + sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" + verbose="false" /> + </target> - <!-- - Generate BPEL sources - --> - <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources."> - <!-- create jbpm process archives --> - <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> - <!-- Copy the BPEL sar --> - <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> + <!-- + Generate BPEL sources + --> + <target name="servicegen" depends="tests-compile" + description="Generate the BPEL resources."> + <!-- create jbpm process archives --> + <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> + <!-- Copy the BPEL sar --> + <copy file="${core.dir}/thirdparty/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"> - <classpath refid="jbpm.bpel.classpath"/> - </taskdef> - <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" - bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> - </target> + <!-- generate wsdl binding and service definitions for bpel processes --> + <taskdef name="servicegen" + classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpm.bpel.classpath" /> + </taskdef> + <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" + bindingfile="hello-binding-.wsdl" + servicefile="hello-service.wsdl" /> + </target> - <!-- - Generate JAX-RPC sources - --> - <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts."> + <!-- + Generate JAX-RPC sources + --> + <target name="wstools" depends="tests-compile" + description="Generate the JAX-RPC artifacts."> - <!-- Define the JAX-RPC tools task --> - <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="ws.stack.classpath"/> - <classpath refid="thirdparty.classpath"/> - <classpath location="${core.dir}/thirdparty/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}"/> - </taskdef> + <!-- Define the JAX-RPC tools task --> + <taskdef name="wstools" + classname="org.jboss.ws.tools.ant.wstools"> + <classpath refid="ws.stack.classpath" /> + <classpath refid="thirdparty.classpath" /> + <classpath location="${core.dir}/thirdparty/concurrent.jar" /> + <classpath location="${tests.output.dir}/classes" /> + <classpath location="${tests.output.dir}" /> + </taskdef> - <!-- Generate JAX-RPC artifacts --> - <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"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <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/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/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"/> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> - </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> - </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> - </move> + <!-- Generate JAX-RPC artifacts --> + <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" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" + config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" + config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" + config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml" /> + <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/wsaddr/hello/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml" /> + <wstools + dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" + config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/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" /> + <move todir="${tests.output.dir}/wstools/java"> + <fileset + dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" + includes="org/**" /> + </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset + dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" + includes="org/**" /> + </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset + dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" + includes="org/**" /> + </move> - <!-- Copy generated resources --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.output.dir}/wstools/resources"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - </copy> - <!-- Copy resources that cannot (yet) be generated --> - <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> - <filterset> - <filter token="jboss.bind.address" value="${node0}"/> - </filterset> - </copy> - </target> + <!-- Copy generated resources --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.output.dir}/wstools/resources"> + <include name="**/*.wsdl" /> + <include name="**/*.xml" /> + </fileset> + </copy> + <!-- Copy resources that cannot (yet) be generated --> + <copy todir="${tests.output.dir}/resources/jaxrpc/samples" + overwrite="true"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples-override" /> + <filterset> + <filter token="jboss.bind.address" value="${node0}" /> + </filterset> + </copy> + </target> - <!-- - Generate JAX-WS sources - --> - <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts."> + <!-- + Generate JAX-WS sources + --> + <target name="wsprovide" depends="tests-compile" + description="Provide the JAX-WS contracts."> - <!-- Define the JAX-WS wsprovide task --> - <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> - <classpath refid="tests.client.classpath"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/> - </taskdef> + <!-- Define the JAX-WS wsprovide task --> + <taskdef name="wsprovide" + classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> + <classpath refid="tests.client.classpath" /> + <classpath location="${tests.output.dir}/classes" /> + <classpath + location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy" /> + </taskdef> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> - </target> + <wsprovide + resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" + genwsdl="true" + sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" + verbose="true" /> + <wsprovide + resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" + genwsdl="true" + sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean" /> + </target> - <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide"> - <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/> - </target> + <target name="tests-compile-generated-resources" + depends="servicegen,wstools,wsprovide"> + <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" + excludesfile="${excludesfile}" /> + </target> - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> - <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> - <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> - </target> + <target name="tests-compile" depends="wsconsume,tests-classpath" + description="Compile sources"> + <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" + excludesfile="${excludesfile}" /> + <macro-compile-classes srcdir="${core.dir}/src/test-framework/java" + excludesfile="${excludesfile}" /> + <macro-compile-classes srcdir="${core.dir}/src/test/java" + excludesfile="${excludesfile}" /> + </target> - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${core.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${core.dir}/src/test"/> - </target> + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" + description="Copy the deployment resources."> + <macro-copy-resources srcdir="${core.dir}/src/test-framework" /> + <macro-copy-resources srcdir="${core.dir}/src/test" /> + </target> - <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> - <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> - <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> - <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - </target> + <target name="tests-jars" + depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" + description="Build the deployments."> + <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" + target="build-jars-jaxrpc" /> + <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" + target="build-samples-jaxrpc" /> + <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" + target="build-jars-jaxws" /> + <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" + target="build-samples-jaxws" /> + <ant + antfile="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" + target="build-jars-jaxws" /> + </target> - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + <target name="tests-main" depends="tests-jars" + description="Build the deployments." /> </project> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/etc/component-info.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/etc/component-info.xml 2008-08-15 12:57:01 UTC (rev 8108) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/etc/component-info.xml 2008-08-15 15:05:15 UTC (rev 8109) @@ -33,6 +33,7 @@ </import> <import componentref="jbpm/bpel"> <compatible version="@jbpm-bpel@"/> + <compatible version="1.0.0.GA"/> </import> <import componentref="stax-api"> <compatible version="@stax-api@"/> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2008-08-15 12:57:01 UTC (rev 8108) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2008-08-15 15:05:15 UTC (rev 8109) @@ -16,7 +16,7 @@ # Thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 ibm-wsdl4j=1.6.2 -jbpm-bpel=1.1.0.GA +jbpm-bpel=1.1.0.Beta5 stax-api=1.0 sun-jaxb=2.1.4 sun-jaxws=2.1.1