[jbossws-commits] JBossWS SVN: r6238 - in stack/cxf/trunk: ant-import and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 08:51:49 -0400 (Fri, 04 Apr 2008) New Revision: 6238 Added: stack/cxf/trunk/ant-import-tests/ stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml stack/cxf/trunk/ant-import-tests/build-testsuite.xml Removed: stack/cxf/trunk/ant-import/build-testsuite-jars.xml stack/cxf/trunk/ant-import/build-testsuite.xml Modified: stack/cxf/trunk/build.xml Log: Allign tests build with metro Deleted: stack/cxf/trunk/ant-import/build-testsuite-jars.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2008-04-04 12:44:45 UTC (rev 6237) +++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2008-04-04 12:51:49 UTC (rev 6238) @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project> - - <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-testsuite-jars" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - - <!-- jaxws-cxf-descriptor --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-wsrm-basic-doc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-wsrm-basic-rpc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- Please add alphabetically --> - - </target> - -</project> Deleted: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2008-04-04 12:44:45 UTC (rev 6237) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2008-04-04 12:51:49 UTC (rev 6238) @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<project> - - <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> - - <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/> - - <!-- Define excludesfile --> - <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="tests-init" depends="tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/> - <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> - </path> - - </target> - - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> - - <target name="wsconsume" depends="tests-init" unless="noconsume" 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"/> - </taskdef> - - <wsconsume wsdl="${tests.framework.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.framework.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"/> - --> - </target> - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="wsconsume" description="Compile sources"> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.cxf.dir}/ant-import/build-testsuite-jars.xml" target="build-testsuite-jars"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - -</project> Added: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml (rev 0) +++ stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-04 12:51:49 UTC (rev 6238) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <description>JBossWS test archive builder</description> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="build-testsuite-jars" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + + <!-- jaxws-cxf-descriptor --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- jaxws-cxf-wsrm-basic-doc --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- jaxws-cxf-wsrm-basic-rpc --> + <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- Please add alphabetically --> + + </target> + +</project> Property changes on: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/cxf/trunk/ant-import-tests/build-testsuite.xml (from rev 6234, stack/cxf/trunk/ant-import/build-testsuite.xml) =================================================================== --- stack/cxf/trunk/ant-import-tests/build-testsuite.xml (rev 0) +++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 12:51:49 UTC (rev 6238) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> + + <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + + <!-- Define excludesfile --> + <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="tests-init" depends="tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/> + <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> + </path> + + </target> + + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> + + <target name="wsconsume" depends="tests-init" unless="noconsume" 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"/> + </taskdef> + + <wsconsume wsdl="${tests.framework.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.framework.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"/> + --> + </target> + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="wsconsume" description="Compile sources"> + <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + +</project> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-04 12:44:45 UTC (rev 6237) +++ stack/cxf/trunk/build.xml 2008-04-04 12:51:49 UTC (rev 6238) @@ -20,7 +20,6 @@ <import file="${basedir}/ant-import/build-prepare-deploy.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-testsuite.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> @@ -47,6 +46,8 @@ <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/> <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> + <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== -->