May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3237 - in trunk/integration: jbws/ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-24 11:59:04 -0400 (Thu, 24 May 2007) New Revision: 3237 Added: trunk/integration/jbws/ant-import/build-distro.xml trunk/integration/jbws/src/main/etc/bindist-build.xml trunk/integration/jbws/version.properties Modified: trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/jbws/ant-import/build-release.xml trunk/integration/jbws/ant-import/build-thirdparty.xml trunk/integration/jbws/ant-import/macros-deploy-native.xml trunk/integration/jbws/build.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml Log: Native dist Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -20,7 +20,7 @@   - <target name="deploy-jboss50" depends="jars-jbws50" description="Deploy jbossws to jboss50"> + <target name="deploy-jboss50" depends="jars-native50" description="Deploy jbossws to jboss50"> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-native50 @@ -37,7 +37,7 @@ </target>  - <target name="deploy-jboss42" depends="jars-jbws42" description="Deploy jbossws to jboss42"> + <target name="deploy-jboss42" depends="jars-native42" description="Deploy jbossws to jboss42"> <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" Added: trunk/integration/jbws/ant-import/build-distro.xml =================================================================== --- trunk/integration/jbws/ant-import/build-distro.xml (rev 0) +++ trunk/integration/jbws/ant-import/build-distro.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-core.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-native42.sar"/> + <include name="jbossws-native50.sar"/> + <include name="jbossws-native50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${core.dir}/thirdparty"> + <include name="juddi-service.sar"/> + <include name="policy.jar"/> + </fileset> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.native.dir}/src/test"/> + </copy> + + <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> + <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> + </zip> + </target> + +</project> Property changes on: trunk/integration/jbws/ant-import/build-distro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jbws/ant-import/build-release.xml =================================================================== --- trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -26,7 +26,7 @@ <include name="jbossws-native50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${native.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> @@ -40,7 +40,7 @@ <include name="jbossws-native42.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${native.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: trunk/integration/jbws/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jbws/ant-import/build-thirdparty.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/build-thirdparty.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -31,7 +31,7 @@ <target name="thirdparty-classpath" depends="thirdparty-init">  - <path id="jbws50.integration.classpath"> + <path id="native50.integration.classpath"> </path> </target> Modified: trunk/integration/jbws/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-native.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/macros-deploy-native.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -69,7 +69,7 @@ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>  <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/build.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -16,6 +16,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${int.native.dir}/ant-import/build-deploy.xml"/> + <import file="${int.native.dir}/ant-import/build-distro.xml"/> <import file="${int.native.dir}/ant-import/build-release.xml"/> <import file="${int.native.dir}/ant-import/build-testsuite.xml"/> <import file="${int.native.dir}/ant-import/build-thirdparty.xml"/> @@ -24,15 +25,15 @@   - <property name="jbws.dir" value="${int.native.dir}"/> - <property name="jbws.src.dir" value="${jbws.dir}/src/main"/> - <property name="jbws.etc.dir" value="${jbws.src.dir}/etc"/> - <property name="jbws.java.dir" value="${jbws.src.dir}/java"/> - <property name="jbws.resources.dir" value="${jbws.src.dir}/resources"/> - <property name="jbws.output.dir" value="${jbws.dir}/output"/> - <property name="jbws.output.classes.dir" value="${jbws.output.dir}/classes"/> - <property name="jbws.output.etc.dir" value="${jbws.output.dir}/etc"/> - <property name="jbws.output.lib.dir" value="${jbws.output.dir}/lib"/> + <property name="native.dir" value="${int.native.dir}"/> + <property name="native.src.dir" value="${native.dir}/src/main"/> + <property name="native.etc.dir" value="${native.src.dir}/etc"/> + <property name="native.java.dir" value="${native.src.dir}/java"/> + <property name="native.resources.dir" value="${native.src.dir}/resources"/> + <property name="native.output.dir" value="${native.dir}/output"/> + <property name="native.output.classes.dir" value="${native.output.dir}/classes"/> + <property name="native.output.etc.dir" value="${native.output.dir}/etc"/> + <property name="native.output.lib.dir" value="${native.output.dir}/lib"/>   @@ -62,9 +63,9 @@  <target name="compile-etc" depends="init"> - <mkdir dir="${jbws.output.etc.dir}"/> - <copy todir="${jbws.output.etc.dir}" filtering="yes"> - <fileset dir="${jbws.etc.dir}"> + <mkdir dir="${native.output.etc.dir}"/> + <copy todir="${native.output.etc.dir}" filtering="yes"> + <fileset dir="${native.etc.dir}"> <include name="component-info-*.xml"/> </fileset> <fileset dir="${build.dir}/etc"> @@ -87,33 +88,33 @@  - <target name="jars" depends="compile,jars-jbws50,jars-jbws42" description="Builds all jar files."> + <target name="jars" depends="compile,jars-native42,jars-native50" description="Builds all jar files."> </target>  - <target name="jars-jbws50" depends="compile" if="jboss50.home"> + <target name="jars-native50" depends="compile" if="jboss50.home"> <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> - <mkdir dir="${jbws.output.lib.dir}"/> + <mkdir dir="${native.output.lib.dir}"/>  - <war warfile="${jbws.output.lib.dir}/jbossws-context.war" webxml="${jbws.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${jbws.resources.dir}/jbossws-context.war"> + <war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${native.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jbws.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> -  - <jar jarfile="${jbws.output.lib.dir}/jbossws-native50.sar" manifest="${jbws.output.etc.dir}/default.mf"> +  + <jar jarfile="${native.output.lib.dir}/jbossws-native50.sar" manifest="${native.output.etc.dir}/default.mf">  @@ -129,14 +130,14 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-native50.sar/META-INF"> + <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> -  - <zip zipfile="${jbws.output.lib.dir}/jbossws-native50-deployer.zip"> - <fileset dir="${jbws.resources.dir}/jbossws-native50.deployer"> +  + <zip zipfile="${native.output.lib.dir}/jbossws-native50-deployer.zip"> + <fileset dir="${native.resources.dir}/jbossws-native50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> @@ -146,15 +147,15 @@  - <target name="jars-jbws42" depends="compile" if="jboss42.home"> + <target name="jars-native42" depends="compile" if="jboss42.home"> <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> - <mkdir dir="${jbws.output.lib.dir}"/> + <mkdir dir="${native.output.lib.dir}"/> -  - <jar jarfile="${jbws.output.lib.dir}/jbossws-native42.sar" manifest="${jbws.output.etc.dir}/default.mf"> - <fileset dir="${jbws.output.lib.dir}"> +  + <jar jarfile="${native.output.lib.dir}/jbossws-native42.sar" manifest="${native.output.etc.dir}/default.mf"> + <fileset dir="${native.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> <fileset dir="${spi.dir}/output/lib"> @@ -173,13 +174,13 @@ <include name="xmlsec.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${jbws.resources.dir}/jbossws-native42.sar"> + <fileset dir="${native.resources.dir}/jbossws-native42.sar"> <include name="jbossws.beans/**"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-native42.sar/META-INF"> + <metainf dir="${native.resources.dir}/jbossws-native42.sar/META-INF"> <include name="jboss-service.xml"/> <include name="jboss-beans.xml"/> </metainf> @@ -192,7 +193,7 @@  <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws.output.dir}"/> + <delete dir="${native.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> Added: trunk/integration/jbws/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/jbws/src/main/etc/bindist-build.xml (rev 0) +++ trunk/integration/jbws/src/main/etc/bindist-build.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS/XFire"> + +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${lib.dir}/jboss-saaj.jar"/> + <pathelement location="${lib.dir}/jbossws-core.jar"/> + <pathelement location="${lib.dir}/jbossws-client.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/policy.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50"> + <macro-undeploy-native50/> + <macro-deploy-native50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> + <macro-undeploy-native50/> + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> Property changes on: trunk/integration/jbws/src/main/etc/bindist-build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jbws/version.properties =================================================================== --- trunk/integration/jbws/version.properties (rev 0) +++ trunk/integration/jbws/version.properties 2007-05-24 15:59:04 UTC (rev 3237) @@ -0,0 +1,5 @@ + +# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ + +native.implementation.title=JBoss Web Services - JBossWS/Native + Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -50,7 +50,7 @@ <available property="jboss42.available" file="${jboss42.available.file}"/> <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-jbws.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/build/macros-deploy-sunri.xml"/>  Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -13,6 +13,8 @@ <project> + <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> +    @@ -21,12 +23,16 @@ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - + <macro-deploy-xfire50 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss50.dir}/output/lib" + stacklibs="${int.xfire.dir}/output/lib" + thirdpartylibs="${int.xfire.dir}/thirdparty"/> </target>  <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + <macro-undeploy-xfire50/> </target> </project> Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -60,7 +60,7 @@ </macrodef>  - <macrodef name="macro-undeploy-xfire"> + <macrodef name="macro-undeploy-xfire50"> <sequential> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> </sequential>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3236 - in trunk: build/ant-import and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-24 11:12:38 -0400 (Thu, 24 May 2007) New Revision: 3236 Added: trunk/integration/jbws/ant-import/macros-deploy-native.xml trunk/integration/jbws/src/main/etc/component-info42.xml trunk/integration/jbws/src/main/etc/component-info50.xml trunk/integration/jbws/src/main/resources/jbossws-native42.sar/ trunk/integration/jbws/src/main/resources/jbossws-native50.deployer/ trunk/integration/jbws/src/main/resources/jbossws-native50.sar/ trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/ trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/ trunk/integration/xfire/ant-import/build-distro.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/src/main/resources/jbossws-xfire50.deployer/ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/ trunk/jbossws-core/src/test/etc/ Removed: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml trunk/integration/jbws/src/main/etc/component-info-jbws42.xml trunk/integration/jbws/src/main/etc/component-info-jbws50.xml trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar/ trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar/ trunk/integration/sunri/ant-import/build-distribution.xml trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer/ trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar/ Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/jbws/ant-import/build-release.xml trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/jbws/build.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/etc/ trunk/jbossws-core/ant-import/build-deploy.xml trunk/testsuite/ant-import/build-testsuite.xml Log: XFire binary dist Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/ant-import/build-release.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -43,7 +43,7 @@ <ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/> - <ant antfile="${int.jbws.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="release" inheritall="false"/> </target>  Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/ant-import/build-setup.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -23,7 +23,7 @@ <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> - <property name="int.jbws.dir" value="${basedir}/integration/jbws"/> + <property name="int.native.dir" value="${basedir}/integration/jbws"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -10,10 +10,9 @@ <project> - <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> - <property name="tests.java.dir" value="${tests.dir}/src/java"/> - <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> - <property name="tests.output.dir" value="${tests.dir}/output-tests"/> + <property name="tests.etc.dir" value="${tests.dir}/etc"/> + <property name="tests.java.dir" value="${tests.dir}/java"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/>   @@ -182,9 +181,15 @@ <macrodef name="macro-copy-resources"> <attribute name="srcdir"/> <sequential> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> +  + <copy todir="${tests.output.dir}/classes"> + <fileset dir="@{srcdir}/etc"> + <include name="jndi.properties"/> + <include name="log4j.xml"/> + </fileset> + </copy> +  <copy todir="${tests.output.dir}/classes"> <fileset dir="@{srcdir}/java"> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/build/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -42,7 +42,7 @@ <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${int.jbws.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/> </target> @@ -53,7 +53,7 @@ <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${int.jbws.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/> </target> @@ -66,7 +66,7 @@ </target> <target name="most" description="Builds almost everything." depends="prepare"> - <ant antfile="${int.jbws.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="tests-main" inheritall="false"/> Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -13,7 +13,7 @@ <project> - <import file="${int.jbws.dir}/ant-import/macros-deploy-jbws.xml"/> + <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>   @@ -23,32 +23,32 @@ <target name="deploy-jboss50" depends="jars-jbws50" description="Deploy jbossws to jboss50"> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-deploy-jbws50 + <macro-deploy-native50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" corelibs="${core.dir}/output/lib" - jbwslibs="${int.jbws.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - <macro-undeploy-jbws50/> + <macro-undeploy-native50/> </target>  <target name="deploy-jboss42" depends="jars-jbws42" description="Deploy jbossws to jboss42"> - <macro-deploy-jbws42 + <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" corelibs="${core.dir}/output/lib" - jbwslibs="${int.jbws.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> - <macro-undeploy-jbws42/> + <macro-undeploy-native42/> </target> </project> Modified: trunk/integration/jbws/ant-import/build-release.xml =================================================================== --- trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -17,30 +17,30 @@ <target name="release" depends="jars" description="Release to jboss.local.repository"> -  +  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.jbws.dir}/output/lib"> - <include name="jbossws-jbws50.sar"/> - <include name="jbossws-jbws50-deployer.zip"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-native50.sar"/> + <include name="jbossws-native50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jbws50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info-jbws50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> -  +  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.jbws.dir}/output/lib"> - <include name="jbossws-jbws42.sar"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-native42.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jbws42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info-jbws42.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -13,10 +13,10 @@ <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>  - <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"> + <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"> + <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> @@ -35,6 +35,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/policy.jar"/> </path> </target> Deleted: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,182 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - - <macrodef name="macro-deploy-jbws50"> - <attribute name="spilibs"/> - <attribute name="jbosslibs"/> - <attribute name="corelibs"/> - <attribute name="jbwslibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbwslibs}/jbossws-jbws50-deployer.zip"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{jbwslibs}/jbossws-jbws50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> -  - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbws42"> - <attribute name="spilibs"/> - <attribute name="jbosslibs"/> - <attribute name="corelibs"/> - <attribute name="jbwslibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="@{corelibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{jbwslibs}/jbossws-jbws42.sar"/> -  - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbws50"> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <delete> - <fileset dir="${jboss50.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> -  - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbws42"> - <sequential> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <delete> - <fileset dir="${jboss42.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/>  - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> -  - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -</project> Copied: trunk/integration/jbws/ant-import/macros-deploy-native.xml (from rev 3233, trunk/integration/jbws/ant-import/macros-deploy-jbws.xml) =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-native.xml (rev 0) +++ trunk/integration/jbws/ant-import/macros-deploy-native.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <macrodef name="macro-deploy-native50"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="corelibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> +  + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-native42"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="corelibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="@{corelibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> +  + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native50"> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> +  + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native42"> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/>  + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> +  + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -15,16 +15,16 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.jbws.dir}/ant-import/build-deploy.xml"/> - <import file="${int.jbws.dir}/ant-import/build-release.xml"/> - <import file="${int.jbws.dir}/ant-import/build-testsuite.xml"/> - <import file="${int.jbws.dir}/ant-import/build-thirdparty.xml"/> + <import file="${int.native.dir}/ant-import/build-deploy.xml"/> + <import file="${int.native.dir}/ant-import/build-release.xml"/> + <import file="${int.native.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.native.dir}/ant-import/build-thirdparty.xml"/>    - <property name="jbws.dir" value="${int.jbws.dir}"/> + <property name="jbws.dir" value="${int.native.dir}"/> <property name="jbws.src.dir" value="${jbws.dir}/src/main"/> <property name="jbws.etc.dir" value="${jbws.src.dir}/etc"/> <property name="jbws.java.dir" value="${jbws.src.dir}/java"/> @@ -74,7 +74,7 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> + <filter token="implementation.version" value="jbossws-native-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> @@ -111,7 +111,7 @@ </war>  - <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws.output.etc.dir}/default.mf"> + <jar jarfile="${jbws.output.lib.dir}/jbossws-native50.sar" manifest="${jbws.output.etc.dir}/default.mf">  - <zip zipfile="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"> - <fileset dir="${jbws.resources.dir}/jbossws-jboss50.deployer"> + <zip zipfile="${jbws.output.lib.dir}/jbossws-native50-deployer.zip"> + <fileset dir="${jbws.resources.dir}/jbossws-native50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> @@ -153,7 +153,7 @@ <mkdir dir="${jbws.output.lib.dir}"/>  - <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws42.sar" manifest="${jbws.output.etc.dir}/default.mf"> + <jar jarfile="${jbws.output.lib.dir}/jbossws-native42.sar" manifest="${jbws.output.etc.dir}/default.mf"> <fileset dir="${jbws.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> @@ -173,13 +173,13 @@ <include name="xmlsec.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${jbws.resources.dir}/jbossws-jbws42.sar"> + <fileset dir="${jbws.resources.dir}/jbossws-native42.sar"> <include name="jbossws.beans/**"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-jbws42.sar/META-INF"> + <metainf dir="${jbws.resources.dir}/jbossws-native42.sar/META-INF"> <include name="jboss-service.xml"/> <include name="jboss-beans.xml"/> </metainf> @@ -196,7 +196,7 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.jbws.dir}/output-tests"/> + <delete dir="${int.native.dir}/output-tests"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Deleted: trunk/integration/jbws/src/main/etc/component-info-jbws42.xml =================================================================== --- trunk/integration/jbws/src/main/etc/component-info-jbws42.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/src/main/etc/component-info-jbws42.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-jbws42"> - - <component id="jboss/jbossws-jbws42" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-jbws42.sar"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws"> - <compatible version="@repository.id@"/> - </import> - <import componentref="jboss/jbossws-jboss50"> - <compatible version="@repository.id@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@repository.id@"/> - </import> - - <export> - </export> - - </component> - -</project> Deleted: trunk/integration/jbws/src/main/etc/component-info-jbws50.xml =================================================================== --- trunk/integration/jbws/src/main/etc/component-info-jbws50.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/jbws/src/main/etc/component-info-jbws50.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,32 +0,0 @@ -<project name="jboss/jbossws-jbws50"> - - <component id="jboss/jbossws-jbws50" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-jbws50.sar"/> - <artifact id="jbossws-jbws50-deployer.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws"> - <compatible version="@repository.id@"/> - </import> - <import componentref="jboss/jbossws-jboss50"> - <compatible version="@repository.id@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@repository.id@"/> - </import> - - <export> - </export> - - </component> - -</project> Copied: trunk/integration/jbws/src/main/etc/component-info42.xml (from rev 3219, trunk/integration/jbws/src/main/etc/component-info-jbws42.xml) =================================================================== --- trunk/integration/jbws/src/main/etc/component-info42.xml (rev 0) +++ trunk/integration/jbws/src/main/etc/component-info42.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-native42"> + + <component id="jboss/jbossws-native42" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-native42.sar"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: trunk/integration/jbws/src/main/etc/component-info50.xml (from rev 3219, trunk/integration/jbws/src/main/etc/component-info-jbws50.xml) =================================================================== --- trunk/integration/jbws/src/main/etc/component-info50.xml (rev 0) +++ trunk/integration/jbws/src/main/etc/component-info50.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,32 @@ +<project name="jboss/jbossws-native50"> + + <component id="jboss/jbossws-native50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-native50.sar"/> + <artifact id="jbossws-native50-deployer.zip"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: trunk/integration/jbws/src/main/resources/jbossws-native42.sar (from rev 3219, trunk/integration/jbws/src/main/resources/jbossws-jbws42.sar) Copied: trunk/integration/jbws/src/main/resources/jbossws-native50.deployer (from rev 3219, trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/jbws/src/main/resources/jbossws-native50.sar (from rev 3219, trunk/integration/jbws/src/main/resources/jbossws-jbws50.sar) Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -21,12 +21,12 @@  <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" - sunrilibs="${int.sunri.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> </target> Deleted: trunk/integration/sunri/ant-import/build-distribution.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - - <target name="binary-dist" depends="jars" description="Build the binary distribution"> - - <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> - - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}/thirdparty"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - -  - <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/> - <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/> - -  - <copy todir="${bindist.build.dir}"> - <fileset dir="${build.dir}"> - <include name="version.properties"/> - </fileset> - <fileset dir="${build.dir}/ant-import"> - <include name="build-testsuite.xml"/> - </fileset> - <fileset dir="${int.jbws.dir}/ant-import"> - <include name="macros-deploy-jbws.xml"/> - </fileset> - <fileset dir="${int.sunri.dir}/ant-import"> - <include name="macros-deploy-sunri.xml"/> - </fileset> - <fileset dir="${testsuite.dir}/ant-import"> - <include name="build-jars-jaxws.xml"/> - </fileset> - </copy> - -  - <copy todir="${bindist.docs.dir}"> - <fileset dir="${build.dir}/etc"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - -  - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss42.dir}/output/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${int.sunri.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-sunri42.sar"/> - <include name="jbossws-sunri50.sar"/> - <include name="jbossws-sunri50-deployer.zip"/> - </fileset> - </copy> - <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> - <fileset dir="${int.sunri.dir}/thirdparty"/> - </copy> - -  - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${testsuite.dir}"> - <include name="src/**"/> - </fileset> - <fileset dir="${int.sunri.dir}"> - <include name="src/test/**"/> - </fileset> - </copy> - - <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> - <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> - </zip> - </target> - -</project> Added: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml (rev 0) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${int.sunri.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-sunri42.sar"/> + <include name="jbossws-sunri50.sar"/> + <include name="jbossws-sunri50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.sunri.dir}/src/test"/> + </copy> + + <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> + <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/> + </zip> + </target> + +</project> Property changes on: trunk/integration/sunri/ant-import/build-distro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -20,7 +20,7 @@ <macrodef name="macro-deploy-sunri50"> <attribute name="spilibs"/> <attribute name="jbosslibs"/> - <attribute name="sunrilibs"/> + <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> @@ -52,10 +52,10 @@ </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{sunrilibs}/jbossws-sunri50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-sunri50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{sunrilibs}/jbossws-sunri50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{sunrilibs}/jbossws-context.war" overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/> </sequential> </macrodef> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -16,7 +16,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${int.sunri.dir}/ant-import/build-deploy.xml"/> - <import file="${int.sunri.dir}/ant-import/build-distribution.xml"/> + <import file="${int.sunri.dir}/ant-import/build-distro.xml"/> <import file="${int.sunri.dir}/ant-import/build-release.xml"/> <import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/> <import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/> @@ -149,7 +149,7 @@ <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-jboss50.sar/META-INF"> + <metainf dir="${sunri.resources.dir}/jbossws-sunri50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -162,7 +162,7 @@ <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-sunri50.jar"/> </fileset> - <fileset dir="${sunri.resources.dir}/jbossws-jboss50.deployer"> + <fileset dir="${sunri.resources.dir}/jbossws-sunri50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -22,6 +22,7 @@ <property name="lib.dir" value="${basedir}/lib"/> <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -67,10 +68,10 @@ </condition>  - <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss50.txt"> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss42.txt"> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> @@ -106,7 +107,7 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/src/java"/> + <macro-compile-classes srcdir="${tests.dir}/java"/> </target>  @@ -115,7 +116,7 @@  <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}/src"/> + <macro-copy-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources"> @@ -130,11 +131,11 @@  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> - <macro-undeploy-jbws50/> + <macro-undeploy-native50/> <macro-deploy-sunri50 spilibs="${lib.dir}" jbosslibs="${lib.dir}" - sunrilibs="${lib.dir}" + stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}/thirdparty"/> </target> Copied: trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer (from rev 3219, trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar (from rev 3219, trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar) Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -19,39 +19,9 @@  <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> - - <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${xfire.output.lib.dir}/jbossws-xfire50-deployer.zip"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="${xfire.output.lib.dir}/jbossws-xfire50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${xfire.output.lib.dir}/jbossws-context.war" overwrite="true"/> </target>  Added: trunk/integration/xfire/ant-import/build-distro.xml =================================================================== --- trunk/integration/xfire/ant-import/build-distro.xml (rev 0) +++ trunk/integration/xfire/ant-import/build-distro.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty/client"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + +  + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${int.xfire.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-xfire42.sar"/> + <include name="jbossws-xfire50.sar"/> + <include name="jbossws-xfire50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.xfire.dir}/thirdparty"/> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty/client" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.xfire.dir}/src/test"/> + </copy> + + <zip destfile="${xfire.output.dir}/jbossws-xfire-${version.id}.zip"> + <fileset dir="${xfire.output.dir}" includes="jbossws-xfire-${version.id}/**"/> + </zip> + </target> + +</project> Property changes on: trunk/integration/xfire/ant-import/build-distro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml (rev 0) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <macrodef name="macro-deploy-xfire50"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-xfire50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-xfire"> + <sequential> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + </sequential> + </macrodef> + +</project> Property changes on: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/integration/xfire/build.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -16,6 +16,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${int.xfire.dir}/ant-import/build-deploy.xml"/> + <import file="${int.xfire.dir}/ant-import/build-distro.xml"/> <import file="${int.xfire.dir}/ant-import/build-release.xml"/> <import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/> <import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/> @@ -144,7 +145,7 @@ <include name="xfire-all.jar"/> <include name="xfire-jsr181-api.jar"/> </fileset> - <metainf dir="${xfire.resources.dir}/jbossws-jboss50.sar/META-INF"> + <metainf dir="${xfire.resources.dir}/jbossws-xfire50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -157,7 +158,7 @@ <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire50.jar"/> </fileset> - <fileset dir="${xfire.resources.dir}/jbossws-jboss50.deployer"> + <fileset dir="${xfire.resources.dir}/jbossws-xfire50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> Property changes on: trunk/integration/xfire/src/main/etc ___________________________________________________________________ Name: svn:ignore + bindist-build.xml Copied: trunk/integration/xfire/src/main/resources/jbossws-xfire50.deployer (from rev 3219, trunk/integration/xfire/src/main/resources/jbossws-jboss50.deployer) Copied: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar (from rev 3219, trunk/integration/xfire/src/main/resources/jbossws-jboss50.sar) Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -15,12 +15,12 @@  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.jbws.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> </target>  <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.jbws.dir}/build.xml" target="deploy-jboss42" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss42" inheritall="false"/> </target> </project> Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 14:18:30 UTC (rev 3235) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 15:12:38 UTC (rev 3236) @@ -1,6 +1,7 @@ <project> - <property name="tests.dir" value="${testsuite.dir}"/> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> @@ -24,7 +25,7 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${tests.dir}/src"/> + <macro-copy-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3235 - branches/jbossws-2.0/build.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-24 10:18:30 -0400 (Thu, 24 May 2007) New Revision: 3235 Modified: branches/jbossws-2.0/build/version.properties Log: Fix JBWS-1657, JBWS-1661 Modified: branches/jbossws-2.0/build/version.properties =================================================================== --- branches/jbossws-2.0/build/version.properties 2007-05-24 14:16:42 UTC (rev 3234) +++ branches/jbossws-2.0/build/version.properties 2007-05-24 14:18:30 UTC (rev 3235) @@ -18,7 +18,7 @@ ibm-wsdl4j=1.6.2 javassist=3.5.0.CR1 jbpm-bpel=1.1.0.Beta5 -sun-jaxb=2.0.3jboss +sun-jaxb=2.1.3jboss stax-api=1.0 # Build and Tomcat

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3234 - branches/jbossws-2.0/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-24 10:16:42 -0400 (Thu, 24 May 2007) New Revision: 3234 Modified: branches/jbossws-2.0/build/ant-import/build-deploy.xml Log: Replace jaxb*jar in <JBOSS_HOME>/lib/ as well Modified: branches/jbossws-2.0/build/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-deploy.xml 2007-05-24 13:45:57 UTC (rev 3233) +++ branches/jbossws-2.0/build/ant-import/build-deploy.xml 2007-05-24 14:16:42 UTC (rev 3234) @@ -77,6 +77,10 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> </copy> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3233 - in trunk: build/hudson/hudson-home/jobs/AS-4.2 and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-24 09:45:57 -0400 (Thu, 24 May 2007) New Revision: 3233 Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml trunk/integration/jbws/ant-import/macros-deploy-jbws.xml trunk/integration/sunri/ant-import/build-distribution.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/testsuite/ant-import/build-testsuite.xml Log: SunRI binary dist Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -10,9 +10,10 @@ <project> - <property name="tests.etc.dir" value="${tests.dir}/etc"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> + <property name="tests.java.dir" value="${tests.dir}/src/java"/> + <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> + <property name="tests.output.dir" value="${tests.dir}/output-tests"/>   @@ -91,7 +92,7 @@ <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -128,7 +129,7 @@ <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -181,8 +182,8 @@ <macrodef name="macro-copy-resources"> <attribute name="srcdir"/> <sequential> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>  <copy todir="${tests.output.dir}/classes"> @@ -264,7 +265,7 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${testsuite.dir}/src/etc/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> @@ -300,7 +301,7 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${testsuite.dir}/src/etc/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -22,7 +22,7 @@ # build jboss # cd $SVNBASE -rm -f thirdparty/libraries.ent +rm -rf thirdparty/* ./build/build.sh clean main # Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -22,7 +22,8 @@ # build jboss # cd $SVNBASE -./build/build.sh clean main +rm -rf thirdparty/* +ant -f ./build/build.xml clean main # # Verify build Modified: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -26,6 +26,12 @@ <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -39,9 +45,6 @@ <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> @@ -82,6 +85,12 @@ <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -95,9 +104,6 @@ <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> </copy> <copy todir="${jboss42.home}/lib" overwrite="true"> <fileset dir="@{spilibs}"> @@ -119,57 +125,57 @@  <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> + </sequential> </macrodef> <macrodef name="macro-undeploy-jbws50"> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <delete> - <fileset dir="${jboss50.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> -  - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> +  + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> <macrodef name="macro-undeploy-jbws42"> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <delete> - <fileset dir="${jboss42.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/>  - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> -  - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/>  + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> +  + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: trunk/integration/sunri/ant-import/build-distribution.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -27,7 +27,7 @@ <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> @@ -48,7 +48,6 @@ <include name="macros-deploy-jbws.xml"/> </fileset> <fileset dir="${int.sunri.dir}/ant-import"> - <include name="build-thirdparty.xml"/> <include name="macros-deploy-sunri.xml"/> </fileset> <fileset dir="${testsuite.dir}/ant-import"> @@ -81,12 +80,18 @@ <include name="jbossws-sunri50-deployer.zip"/> </fileset> </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy>  <copy todir="${bindist.tests.dir}" overwrite="true"> <fileset dir="${testsuite.dir}"> <include name="src/**"/> </fileset> + <fileset dir="${int.sunri.dir}"> + <include name="src/test/**"/> + </fileset> </copy> <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -24,35 +24,38 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{sunrilibs}/jbossws-sunri50-deployer.zip"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{sunrilibs}/jbossws-sunri50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{sunrilibs}/jbossws-context.war" overwrite="true"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{sunrilibs}/jbossws-sunri50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{sunrilibs}/jbossws-sunri50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{sunrilibs}/jbossws-context.war" overwrite="true"/> </sequential> </macrodef> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -13,10 +13,6 @@ <project default="main" basedir="." name="JBossWS/SunRI"> - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/build-thirdparty.xml"/> -    @@ -24,6 +20,7 @@ <property name="build.dir" value="${basedir}/build"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> <property name="tests.dir" value="${basedir}/tests"/> <property file="${basedir}/ant.properties"/> @@ -51,28 +48,52 @@ <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-jbws.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> +    - <target name="tests-init" depends="tests-classpath"> + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/http.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> + <pathelement location="${thirdparty.dir}/resolver.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/sjsxp.jar"/> + <pathelement location="${thirdparty.dir}/stax-ex.jar"/> + <pathelement location="${thirdparty.dir}/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> </path> <path id="tests.extra.classpath"> @@ -84,22 +105,45 @@   + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/src/java"/> + </target> +     - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${tests.dir}"/> + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}/src"/> </target> - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> </target> - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> + <macro-undeploy-jbws50/> + <macro-deploy-sunri50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + sunrilibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + </target> + +    @@ -109,11 +153,8 @@ <target name="clobber" depends="clean" description="Cleans up all generated files."> </target> - <target name="main" description="Executes the default target (most)." depends="most"/> + <target name="main" depends="most" description="Executes the default target (most)."/> - <target name="most" description="Builds almost everything." depends="tests-main"/> + <target name="most" depends="tests-main" description="Builds almost everything."/> - <target name="all" description="Create a distribution zip file" depends="most"> - </target> - </project> Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -1,7 +1,6 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> - <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/> + <property name="tests.dir" value="${testsuite.dir}"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> @@ -25,7 +24,7 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${tests.dir}"/> + <macro-copy-resources srcdir="${tests.dir}/src"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3232 - branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-24 08:28:22 -0400 (Thu, 24 May 2007) New Revision: 3232 Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java Log: Verify content-type as well Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-24 12:26:08 UTC (rev 3231) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-24 12:28:22 UTC (rev 3232) @@ -33,7 +33,7 @@ import java.net.URL; /** - * Test @XmlMimeType annocations on wrapped services. + * Test @XmlMimeType annotations on wrapped services. * The annotations should be copied to the generated wrapper beans. * * @author Heiko.Braun(a)jboss.com @@ -70,6 +70,7 @@ assertNotNull(response); assertEquals(response.getContent(), "Server data"); + assertEquals(response.getContentType(), "text/plain"); } }

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3231 - in branches/jbossws-2.0/jbossws-tests/src: resources/jaxws/samples/xop/doclit/WEB-INF and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-24 08:26:08 -0400 (Thu, 24 May 2007) New Revision: 3231 Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpoint.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java branches/jbossws-2.0/jbossws-tests/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml Log: Added testcase for xop with wrapped endpoints using parameter annotations Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpoint.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpoint.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpoint.java 2007-05-24 12:26:08 UTC (rev 3231) @@ -0,0 +1,16 @@ +package org.jboss.test.ws.jaxws.samples.xop.doclit; + +import javax.activation.DataHandler; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlMimeType; +import javax.xml.ws.BindingType; + +@WebService +@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public interface WrappedEndpoint +{ + @WebMethod + @XmlMimeType("text/plain") + DataHandler parameterAnnotation(@XmlMimeType("text/plain") DataHandler data); +} Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-05-24 12:26:08 UTC (rev 3231) @@ -0,0 +1,54 @@ +/* + * 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.test.ws.jaxws.samples.xop.doclit; + +import org.jboss.ws.WSException; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlMimeType; +import javax.xml.ws.BindingType; +import javax.activation.DataHandler; +import java.io.IOException; + +/** + * @author Heiko.Braun(a)jboss.com + */ +@WebService(name = "WrappedEndpoint", serviceName = "WrappedService", endpointInterface = "org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpoint") +public class WrappedEndpointImpl implements WrappedEndpoint +{ + + @WebMethod + @XmlMimeType("text/plain") + public DataHandler parameterAnnotation(@XmlMimeType("text/plain")DataHandler data) + { + try + { + System.out.println("Got " + data.getContent()); + return new DataHandler("Server data", "text/plain"); + } + catch (IOException e) + { + throw new WSException(e); + } + } +} Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-24 12:25:19 UTC (rev 3230) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-24 12:26:08 UTC (rev 3231) @@ -51,7 +51,7 @@ */ public class XOPHandlerTestCase extends XOPBase { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMService"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare"; public static Test suite() { Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-24 12:25:19 UTC (rev 3230) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-24 12:26:08 UTC (rev 3231) @@ -47,7 +47,7 @@ public class XOPTestCase extends XOPBase { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMService"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare"; public static Test suite() { Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-24 12:26:08 UTC (rev 3231) @@ -0,0 +1,75 @@ +/* + * 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.test.ws.jaxws.samples.xop.doclit; + +import junit.framework.Test; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.test.ws.JBossWSTest; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.soap.SOAPBinding; +import javax.activation.DataHandler; +import java.net.URL; + +/** + * Test @XmlMimeType annocations on wrapped services. + * The annotations should be copied to the generated wrapper beans. + * + * @author Heiko.Braun(a)jboss.com + */ +public class XOPWrappedTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/wrapped"; + + private WrappedEndpoint port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPWrappedTestCase.class, "jaxws-samples-xop-doclit.war"); + } + + protected void setUp() throws Exception + { + + QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "WrappedService"); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(WrappedEndpoint.class); + + SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + + } + + public void testParameterAnnotation() throws Exception + { + DataHandler request = new DataHandler("Client data", "text/plain"); + DataHandler response = port.parameterAnnotation(request); + + assertNotNull(response); + assertEquals(response.getContent(), "Server data"); + } + +} Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-05-24 12:25:19 UTC (rev 3230) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-05-24 12:26:08 UTC (rev 3231) @@ -1,17 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> - <servlet> - <servlet-name>MTOMService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>MTOMService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> + <servlet> + <servlet-name>MTOMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class> + </servlet> + <servlet> + <servlet-name>WrappedService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>MTOMService</servlet-name> + <url-pattern>/bare</url-pattern> + </servlet-mapping> + + + <servlet-mapping> + <servlet-name>WrappedService</servlet-name> + <url-pattern>/wrapped</url-pattern> + </servlet-mapping> </web-app>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3230 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-24 08:25:19 -0400 (Thu, 24 May 2007) New Revision: 3230 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java Log: Default mime-type for wrapper annotations Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-05-24 12:24:43 UTC (rev 3229) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-05-24 12:25:19 UTC (rev 3230) @@ -227,7 +227,8 @@ // @XmlMimeType if(attachments[1]) { - annotation = JavassistUtils.createAnnotation(XmlMimeType.class, constPool); + annotation = JavassistUtils.createAnnotation(XmlMimeType.class, constPool); + annotation.addParameter("value", "application/octet-stream"); // TODO: default mime annotation.markField(field); } clazz.addField(field);

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3229 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-05-24 08:24:43 -0400 (Thu, 24 May 2007) New Revision: 3229 Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java Log: scanner did miss @XmlMimeType on return types Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:50:42 UTC (rev 3228) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 12:24:43 UTC (rev 3229) @@ -138,7 +138,7 @@ else if (method.isAnnotationPresent(XmlMimeType.class)) { XmlMimeType mimeTypeDecl = method.getAnnotation(XmlMimeType.class); - new AttachmentScanResult(mimeTypeDecl.value(), AttachmentScanResult.Type.XOP); + result = new AttachmentScanResult(mimeTypeDecl.value(), AttachmentScanResult.Type.XOP); } if(result!=null) @@ -150,7 +150,7 @@ } // method parameter - int ordinate = 0; + int index = 0; for (Annotation[] parameterAnnotations : method.getParameterAnnotations()) { if (parameterAnnotations!=null) @@ -171,8 +171,8 @@ if(paramResult!=null) { - paramResult.setIndex(ordinate); - ordinate++; + paramResult.setIndex(index); + index++; results.add(paramResult); }

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3228 - trunk/jbossws-core.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-24 07:50:42 -0400 (Thu, 24 May 2007) New Revision: 3228 Modified: trunk/jbossws-core/build.xml Log: Generate jbossws-core-src.zip Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-24 11:42:45 UTC (rev 3227) +++ trunk/jbossws-core/build.xml 2007-05-24 11:50:42 UTC (rev 3228) @@ -198,7 +198,7 @@ </zip>  - <zip zipfile="${core.output.lib.dir}/jbossws-src.zip" > + <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" > <fileset dir="${core.java.dir}"/> </zip>

17 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007