February 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5824 - in stack/native/trunk: src/main/distro and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 11:51:51 -0500 (Wed, 27 Feb 2008) New Revision: 5824 Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix bin-dist deployment. Fix chmod of deployed *.sh files Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -48,7 +48,7 @@  <copy todir="${bindist.build.dir}"> <fileset dir="${core.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> + <include name="jbossws.default.undeploy.files"/> <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${core.distro.dir}"> Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -15,13 +15,15 @@ <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> + <property name="deploy.dir" value="${core.dir}/output/deploy"/> + <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/> +     <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421"> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -36,7 +38,6 @@  <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -52,7 +53,6 @@  <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -67,7 +67,6 @@  <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -85,7 +84,6 @@  <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501"> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -69,8 +69,8 @@ <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <mkdir dir="${core.output.deploy.dir}/lib/endorsed"/> - <copy todir="${core.output.deploy.dir}/lib/endorsed" overwrite="true"> + <mkdir dir="${deploy.dir}/lib/endorsed"/> + <copy todir="${deploy.dir}/lib/endorsed" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.endorsed.patternset"/> </fileset> @@ -90,18 +90,17 @@ <sequential>  - <unzip dest="${core.output.deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <unzip dest="${deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>  - <copy todir="${core.output.deploy.dir}/client"> + <copy todir="${deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy>  - <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib"> <fileset dir="@{thirdpartylibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -127,16 +126,17 @@ <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>  - <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/> <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>  <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${core.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/> </sequential> </macrodef> @@ -149,10 +149,10 @@ <attribute name="jbosshome"/> <sequential> - <delete dir="${core.output.deploy.dir}"/> + <delete dir="${deploy.dir}"/> <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/> - <loadfile property="jbossws.undeploy.files" srcfile="${core.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <delete> @@ -172,14 +172,15 @@ <sequential> <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> +  - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <mkdir dir="${deploy.dir}/bin"/> + <unzip dest="${deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>  - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> <include name="jbossws-jboss421.jar"/> @@ -191,8 +192,8 @@ </copy>  - <mkdir dir="${core.output.deploy.dir}/lib"/> - <copy todir="${core.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> <include name="jboss-xml-binding.jar"/> @@ -200,8 +201,8 @@ </copy>  - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"/> - <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/server/${jboss.server.instance}/lib"/> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss421.jar"/> </fileset> @@ -229,13 +230,12 @@ <sequential>  - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <mkdir dir="${deploy.dir}/bin"/> + <unzip dest="${deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>  - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -256,6 +256,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -277,6 +278,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -299,13 +301,12 @@ <sequential>  - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <mkdir dir="${deploy.dir}/bin"/> + <unzip dest="${deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/>  - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -315,15 +316,15 @@ </copy>  - <mkdir dir="${core.output.deploy.dir}/lib"/> - <copy todir="${core.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> </copy>  - <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -341,6 +342,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -362,6 +364,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -19,12 +19,15 @@ <property name="build.dir" value="${basedir}/build"/> <property name="bin.dir" value="${basedir}/bin"/> + <property name="deploy.dir" value="${basedir}/output/deploy"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> <property name="thirdparty.dir" value="${basedir}/lib"/> <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${basedir}/output"/> - + + <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/> + <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -96,7 +99,6 @@ <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-project-gen.xml"/> - <import file="${basedir}/build/macros-deploy-framework.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:36:37 UTC (rev 5823) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:51:51 UTC (rev 5824) @@ -20,58 +20,42 @@  <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws/native to jboss421"> <macro-deploy-native421 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss421.home}"/> </target> <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws/native from jboss421"> + <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421"> <macro-undeploy-native421/> - <macro-undeploy-framework jbosshome="${jboss421.home}"/> </target> - <target name="undeploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> - </target>  <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422"> <macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/native from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/native from jboss422"> <macro-undeploy-native422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> - </target>  <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423"> <macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/native from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/native from jboss423"> <macro-undeploy-native423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> - </target>  <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500"> <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -79,7 +63,6 @@ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500"> <macro-undeploy-native500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target>  @@ -89,7 +72,6 @@  <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/native to jboss501"> <macro-deploy-native501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -97,7 +79,6 @@ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> <macro-undeploy-native501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> </project>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5823 - in stack/metro/trunk: ant-import-tests and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-02-27 11:36:37 -0500 (Wed, 27 Feb 2008) New Revision: 5823 Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java stack/metro/trunk/src/test/resources/jaxws/ stack/metro/trunk/src/test/resources/jaxws/jbws1871/ stack/metro/trunk/src/test/resources/jaxws/jbws1871/WEB-INF/ stack/metro/trunk/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/ant.properties.example stack/metro/trunk/metro-trunk.iml Log: Fix JBWS-1871: Support @HandlerChain on Service classes Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-27 15:20:42 UTC (rev 5822) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-27 16:36:37 UTC (rev 5823) @@ -19,7 +19,18 @@ <target name="build-jars-jaxws" description="Build the deployments."> <mkdir dir="${tests.output.dir}/libs"/> - + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1871.war" + webxml="${tests.output.dir}/resources/jaxws/jbws1871/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1871/WEB-INF"> + <include name="**/*"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/wsit-rm.war" webxml="${tests.output.dir}/resources/wsit/rm/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/metro/trunk/ant.properties.example =================================================================== --- stack/metro/trunk/ant.properties.example 2008-02-27 15:20:42 UTC (rev 5822) +++ stack/metro/trunk/ant.properties.example 2008-02-27 16:36:37 UTC (rev 5823) @@ -51,4 +51,4 @@ # Login to CVS # cvs -d :pserver:yourid@cvs.dev.java.net:/cvs login # -cvs.user=yourid +cvs.user=guest Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-02-27 15:20:42 UTC (rev 5822) +++ stack/metro/trunk/metro-trunk.iml 2008-02-27 16:36:37 UTC (rev 5823) @@ -370,7 +370,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="common" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -380,6 +379,15 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws1871; + +import org.jboss.wsf.test.GenericSOAPHandler; + +import javax.xml.ws.handler.MessageContext; + +/** + * Intentionally creates an Exception. + * Causes client side to fail + */ +public class CausesAnExceptionHandler extends GenericSOAPHandler +{ + protected boolean handleOutbound(MessageContext messageContext) + { + throw new RuntimeException("Intentionally created Exception"); + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/CausesAnExceptionHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws1871; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.jws.HandlerChain; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.logging.Logger; + +@WebServiceClient(name = "JBWS1871EndpointImplService", targetNamespace = "http://jbws1871.jaxws.ws.test.jboss.org/", wsdlLocation = "http://127.0.0.1:8080/jaxws-jbws1871?wsdl") +@HandlerChain(file = "jaxws-handler.xml") +public class HandlerChainService extends Service +{ + + private final static URL JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION; + private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getName()); + + static { + URL url = null; + try { + URL baseUrl; + baseUrl = org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getResource("."); + url = new URL(baseUrl, "http://127.0.0.1:8080/jaxws-jbws1871?wsdl"); + } catch (MalformedURLException e) { + logger.warning("Failed to create URL for the wsdl Location: 'http://127.0.0.1:8080/jaxws-jbws1871?wsdl', retrying as a local file"); + logger.warning(e.getMessage()); + } + JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION = url; + } + + public HandlerChainService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public HandlerChainService() { + super(JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION, new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplService")); + } + + /** + * + * @return + * returns JBWS1871EndpointImpl + */ + @WebEndpoint(name = "JBWS1871EndpointImplPort") + public JBWS1871EndpointImpl getJBWS1871EndpointImplPort() { + return super.getPort(new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplPort"), JBWS1871EndpointImpl.class); + } + +} + Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/HandlerChainService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws1871; + +import javax.jws.WebService; + +@WebService +public interface JBWS1871Endpoint +{ + public String echo(String msg); +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871Endpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws1871; + +import javax.jws.WebService; + + +@WebService +public class JBWS1871EndpointImpl implements JBWS1871Endpoint +{ + + public String echo(String msg) + { + return msg; + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,58 @@ + +package org.jboss.test.ws.jaxws.jbws1871; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.logging.Logger; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.3-b02- + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "JBWS1871EndpointImplService", targetNamespace = "http://jbws1871.jaxws.ws.test.jboss.org/", wsdlLocation = "http://127.0.0.1:8080/jaxws-jbws1871?wsdl") +public class JBWS1871EndpointImplService + extends Service +{ + + private final static URL JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION; + private final static Logger logger = Logger.getLogger(org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getName()); + + static { + URL url = null; + try { + URL baseUrl; + baseUrl = org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService.class.getResource("."); + url = new URL(baseUrl, "http://127.0.0.1:8080/jaxws-jbws1871?wsdl"); + } catch (MalformedURLException e) { + logger.warning("Failed to create URL for the wsdl Location: 'http://127.0.0.1:8080/jaxws-jbws1871?wsdl', retrying as a local file"); + logger.warning(e.getMessage()); + } + JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION = url; + } + + public JBWS1871EndpointImplService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public JBWS1871EndpointImplService() { + super(JBWS1871ENDPOINTIMPLSERVICE_WSDL_LOCATION, new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplService")); + } + + /** + * + * @return + * returns JBWS1871EndpointImpl + */ + @WebEndpoint(name = "JBWS1871EndpointImplPort") + public JBWS1871EndpointImpl getJBWS1871EndpointImplPort() { + return super.getPort(new QName("http://jbws1871.jaxws.ws.test.jboss.org/", "JBWS1871EndpointImplPort"), JBWS1871EndpointImpl.class); + } + +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871EndpointImplService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws1871; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import junit.framework.Test; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +/** + * Conformance (Handler resolver for a HandlerChain annotation): For a generated service class (see 2.7) + * which is annotated with a HandlerChain annotation, the default handler resolver MUST return handler + * chains consistent with the contents of the handler chain descriptor referenced by the HandlerChain annotation. + */ +public class JBWS1871TestCase extends JBossWSTest +{ + private final static String TNS = "http://jbws1871.jaxws.ws.test.jboss.org/"; + private final static QName portName = new QName(TNS, "JBWS1871EndpointImplPort"); + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1871TestCase.class, "jaxws-jbws1871.war"); + } + + public void testServiceWithoutHandlerChain() throws Exception + { + Service service = new JBWS1871EndpointImplService(); + JBWS1871Endpoint port = service.getPort(portName, JBWS1871Endpoint.class); + + String res = port.echo("testServiceWithoutHandlerChain"); + assertEquals(res, "testServiceWithoutHandlerChain"); + } + + public void testServiceWithHandlerChain() throws Exception + { + Service service = new HandlerChainService(); + JBWS1871Endpoint port = service.getPort(portName, JBWS1871Endpoint.class); + + try + { + String res = port.echo("testServiceWithHandlerChain"); + fail("CausesAnExceptionHandler.class on HandlerChainService.class should throw an Exception upon invocation"); + } catch (WebServiceException e) + { + assertEquals("java.lang.RuntimeException: Intentionally created Exception", e.getMessage()); + } + + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/JBWS1871TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.jbws1871.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "echo", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echo", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/") +public class Echo { + + @XmlElement(name = "arg0", namespace = "") + private String arg0; + + /** + * + * @return + * returns String + */ + public String getArg0() { + return this.arg0; + } + + /** + * + * @param arg0 + * the value for the arg0 property + */ + public void setArg0(String arg0) { + this.arg0 = arg0; + } + +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/Echo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.jbws1871.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "echoResponse", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echoResponse", namespace = "http://jbws1871.jaxws.ws.test.jboss.org/") +public class EchoResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws/EchoResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>SOAPMessageTrace</handler-name> + <handler-class>org.jboss.test.ws.jaxws.jbws1871.CausesAnExceptionHandler</handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1871/jaxws-handler.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml 2008-02-27 16:36:37 UTC (rev 5823) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/metro/trunk/src/test/resources/jaxws/jbws1871/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5822 - stack/cxf/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-27 10:20:42 -0500 (Wed, 27 Feb 2008) New Revision: 5822 Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml Log: [JBWS-1989] Creating ant.properties.example in binary distro Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-27 15:20:32 UTC (rev 5821) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-27 15:20:42 UTC (rev 5822) @@ -35,7 +35,7 @@ <mkdir dir="${bindist.tools.dir}"/>  - <copy tofile="${bindist.dir}/ant.properties" file="${cxf.distro.dir}/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties.example" file="${cxf.distro.dir}/ant.properties.example"> <filterset> <filtersfile file="${cxf.dir}/ant.properties"/> </filterset>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5821 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-27 10:20:32 -0500 (Wed, 27 Feb 2008) New Revision: 5821 Modified: stack/metro/trunk/ant-import/build-bin-dist.xml Log: [JBWS-1989] Creating ant.properties.example in binary distro Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-27 15:20:24 UTC (rev 5820) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-27 15:20:32 UTC (rev 5821) @@ -35,7 +35,7 @@ <mkdir dir="${bindist.tools.dir}"/>  - <copy tofile="${bindist.dir}/ant.properties" file="${metro.distro.dir}/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties.example" file="${metro.distro.dir}/ant.properties.example"> <filterset> <filtersfile file="${metro.dir}/ant.properties"/> </filterset>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5820 - stack/native/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-02-27 10:20:24 -0500 (Wed, 27 Feb 2008) New Revision: 5820 Modified: stack/native/trunk/ant-import/build-bin-dist.xml Log: [JBWS-1989] Creating ant.properties.example in binary distro Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-27 15:09:15 UTC (rev 5819) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-27 15:20:24 UTC (rev 5820) @@ -35,7 +35,7 @@ <mkdir dir="${bindist.tools.dir}"/>  - <copy tofile="${bindist.dir}/ant.properties" file="${core.distro.dir}/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties.example" file="${core.distro.dir}/ant.properties.example"> <filterset> <filtersfile file="${core.dir}/ant.properties"/> </filterset>

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5819 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/addressing/jaxws and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 10:09:15 -0500 (Wed, 27 Feb 2008) New Revision: 5819 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java stack/native/trunk/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java Log: [JBWS-1844] Implement Provider.createW3CEndpointReference (WIP) Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-02-27 11:01:42 UTC (rev 5818) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-02-27 15:09:15 UTC (rev 5819) @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Proxy; +import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.Iterator; @@ -45,6 +46,10 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.Service.Mode; +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.ReferenceParameters; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.spi.ServiceDelegate21; import javax.xml.ws.wsaddressing.W3CEndpointReference; @@ -75,6 +80,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.w3c.dom.Element; /** * Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations. @@ -457,61 +463,121 @@ @Override public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Mode mode, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); - return createDispatch(portName, type, mode); + if (features != null) + log.warn("WebServiceFeature not implemented"); + + Dispatch<T> dispatch = createDispatch(portName, type, mode); + return dispatch; } @Override public <T> Dispatch<T> createDispatch(EndpointReference epr, Class<T> type, Mode mode, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); + if (features != null) + log.warn("WebServiceFeature not implemented"); + QName portName = null; if (epr instanceof W3CEndpointReference) { W3CEndpointReference w3c = (W3CEndpointReference)epr; portName = w3c.getEndpointName(); } - return createDispatch(portName, type, mode); + Dispatch<T> dispatch = createDispatch(portName, type, mode); + return dispatch; } @Override public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Mode mode, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); - return createDispatch(portName, context, mode); + if (features != null) + log.warn("WebServiceFeature not implemented"); + + Dispatch<Object> dispatch = createDispatch(portName, context, mode); + return dispatch; } @Override public Dispatch<Object> createDispatch(EndpointReference epr, JAXBContext context, Mode mode, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); + if (features != null) + log.warn("WebServiceFeature not implemented"); + QName portName = null; if (epr instanceof W3CEndpointReference) { W3CEndpointReference w3c = (W3CEndpointReference)epr; portName = w3c.getEndpointName(); } - return createDispatch(portName, context, mode); + + Dispatch<Object> dispatch = createDispatch(portName, context, mode); + return dispatch; } @Override public <T> T getPort(QName portName, Class<T> sei, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); - return getPort(portName, sei); + if (features != null) + log.warn("WebServiceFeature not implemented"); + + T port = getPort(portName, sei); + return port; } @Override public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); - return getPort(sei); + if (features != null) + log.warn("WebServiceFeature not implemented"); + + T port = getPort(sei); + initAddressingProperties(port, epr); + return port; } @Override public <T> T getPort(Class<T> sei, WebServiceFeature... features) { - log.warn("WebServiceFeature not implemented"); - return getPort(sei); + if (features != null) + log.warn("WebServiceFeature not implemented"); + + T port = getPort(sei); + return port; } + + // Workaround for [JBWS-2015] Modify addressing handlers to work with the JAXWS-2.1 API + private <T> void initAddressingProperties(T port, EndpointReference epr) + { + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); + AddressingProperties addrProps = builder.newAddressingProperties(); + reqContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); + + if (epr instanceof W3CEndpointReference) + { + try + { + W3CEndpointReference w3cepr = (W3CEndpointReference)epr; + if (w3cepr.getAddress() != null) + addrProps.setTo(builder.newURI(w3cepr.getAddress())); + + List<Element> w3cRefParams = w3cepr.getReferenceParameters(); + if (w3cRefParams != null) + { + ReferenceParameters refParams = addrProps.getReferenceParameters(); + for (Element w3cRefParam : w3cRefParams) + { + refParams.addElement(w3cRefParam); + } + } + } + catch (URISyntaxException ex) + { + throw new IllegalArgumentException(ex); + } + } + else + { + throw new IllegalArgumentException("Unsupported EPR type: " + epr); + } + } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2008-02-27 11:01:42 UTC (rev 5818) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2008-02-27 15:09:15 UTC (rev 5819) @@ -24,6 +24,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import javax.xml.namespace.QName; @@ -37,6 +39,8 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; import javax.xml.ws.handler.soap.SOAPMessageContext; + +import java.net.URISyntaxException; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -84,18 +88,29 @@ } addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); - if (addrProps != null) - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - addrProps.writeHeaders(soapMessage); - } - else - { - // supply default addressing properties - addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties(); - msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); - msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); - } + if (addrProps == null) + { + // supply default addressing properties + addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties(); + msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); + msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION); + } + + if (addrProps.getAction() == null) + { + try + { + OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData(); + addrProps.setAction(ADDR_BUILDER.newURI(opMetaData.getJavaName())); + } + catch (URISyntaxException ex) + { + // ignore + } + } + + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + addrProps.writeHeaders(soapMessage); return true; } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2008-02-27 11:01:42 UTC (rev 5818) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2008-02-27 15:09:15 UTC (rev 5819) @@ -23,6 +23,29 @@ //$Id$ +import java.lang.reflect.Array; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; +import javax.xml.soap.SOAPHeader; +import javax.xml.soap.SOAPHeaderElement; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.addressing.AddressingConstants; +import javax.xml.ws.addressing.AddressingException; +import javax.xml.ws.addressing.AttributedURI; +import javax.xml.ws.addressing.ReferenceParameters; +import javax.xml.ws.addressing.Relationship; +import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; + import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; @@ -34,19 +57,6 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import javax.xml.namespace.QName; -import javax.xml.soap.*; -import javax.xml.ws.addressing.*; -import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; -import javax.xml.ws.addressing.soap.SOAPAddressingProperties; -import java.lang.reflect.Array; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * Subimplementation of <code>AddressingProperties</code> includes methods that * read and write the Message Addressing Properties to a <code>SOAPMessage</code>. @@ -283,11 +293,14 @@ // Write wsa:ReferenceParameters ReferenceParameters refParams = getReferenceParameters(); - if (refParams.getElements().size() > 0 || refParams.getAttributes().size() > 0) + if (refParams.getElements().size() > 0) { - SOAPElement wsaRefParams = soapHeader.addChildElement(new NameImpl(ADDR.getReferenceParametersQName())); - appendAttributes(wsaRefParams, refParams.getAttributes()); - appendElements(wsaRefParams, refParams.getElements()); + for (Object obj : refParams.getElements()) + { + SOAPElement refElement = appendElement(soapHeader, obj); + QName refQName = new QName(getNamespaceURI(), "IsReferenceParameter"); + refElement.addAttribute(refQName, "true"); + } } appendElements(soapHeader, getElements()); @@ -334,24 +347,9 @@ { try { - SOAPFactoryImpl factory = (SOAPFactoryImpl)SOAPFactory.newInstance(); for (Object obj : elements) { - if (obj instanceof Element) - { - SOAPElement child = factory.createElement((Element)obj); - soapElement.addChildElement(child); - } - else if (obj instanceof String) - { - Element el = DOMUtils.parse((String)obj); - SOAPElement child = factory.createElement(el); - soapElement.addChildElement(child); - } - else - { - throw new AddressingException("Unsupported element: " + obj.getClass().getName()); - } + appendElement(soapElement, obj); } } catch (RuntimeException rte) @@ -364,6 +362,39 @@ } } + private SOAPElement appendElement(SOAPElement soapElement, Object obj) + { + SOAPElement child = null; + try + { + SOAPFactoryImpl factory = (SOAPFactoryImpl)SOAPFactory.newInstance(); + if (obj instanceof Element) + { + child = factory.createElement((Element)obj); + soapElement.addChildElement(child); + } + else if (obj instanceof String) + { + Element el = DOMUtils.parse((String)obj); + child = factory.createElement(el); + soapElement.addChildElement(child); + } + else + { + throw new AddressingException("Unsupported element: " + obj.getClass().getName()); + } + return child; + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new AddressingException("Cannot append elements", ex); + } + } + private String getPrefixedName(QName qname) { String prefix = qname.getPrefix(); Modified: stack/native/trunk/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2008-02-27 11:01:42 UTC (rev 5818) +++ stack/native/trunk/src/main/resources/standard-config/standard-jaxws-endpoint-config.xml 2008-02-27 15:09:15 UTC (rev 5819) @@ -36,6 +36,10 @@ <javaee:handler-name>WSAddressing Handler</javaee:handler-name> <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> </javaee:handler-chain> </post-handler-chains> </endpoint-config> @@ -49,6 +53,10 @@ <javaee:handler-name>WSAddressing Handler</javaee:handler-name> <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> </javaee:handler-chain> </post-handler-chains> </endpoint-config> @@ -62,6 +70,10 @@ <javaee:handler-name>WSSecurity Handler</javaee:handler-name> <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> </javaee:handler-chain> </post-handler-chains> </endpoint-config> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2008-02-27 11:01:42 UTC (rev 5818) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2008-02-27 15:09:15 UTC (rev 5819) @@ -31,6 +31,8 @@ import junit.framework.Test; +import org.jboss.ws.core.StubExt; +import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -49,12 +51,13 @@ return new JBossWSTestSetup(EndpointReferenceTestCase.class, "jaxws-epr.jar"); } - public void _testSimple() throws Exception + public void testSimple() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl?wsdl"); QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); Service service = Service.create(wsdlURL, serviceName); TestEndpoint port = service.getPort(TestEndpoint.class); + ((StubExt)port).setConfigName("Standard WSAddressing Client"); String retStr = port.echo("hello"); assertEquals("hello", retStr); } @@ -62,15 +65,19 @@ public void testEndpointReference() throws Exception { String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl"; + URL wsdlURL = new URL(address + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); - + W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); builder = builder.address(address); builder = builder.serviceName(serviceName); + builder.referenceParameter(DOMUtils.parse("<fabrikam:CustomerKey xmlns:fabrikam='http://example.com/fabrikam'>123456789</fabrikam:CustomerKey>")); + builder.referenceParameter(DOMUtils.parse("<fabrikam:ShoppingCart xmlns:fabrikam='http://example.com/fabrikam'>ABCDEFG</fabrikam:ShoppingCart>")); W3CEndpointReference epr = builder.build(); - - Service21 service = Service21.create(serviceName); + + Service21 service = Service21.create(wsdlURL, serviceName); TestEndpoint port = service.getPort(epr, TestEndpoint.class); + ((StubExt)port).setConfigName("Standard WSAddressing Client"); String retStr = port.echo("hello"); assertEquals("hello", retStr); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java 2008-02-27 11:01:42 UTC (rev 5818) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java 2008-02-27 15:09:15 UTC (rev 5819) @@ -23,24 +23,60 @@ // $Id$ +import java.io.ByteArrayOutputStream; + +import javax.annotation.Resource; import javax.ejb.Stateless; import javax.jws.WebMethod; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.addressing.JAXWSAConstants; +import javax.xml.ws.addressing.ReferenceParameters; +import javax.xml.ws.addressing.soap.SOAPAddressingProperties; +import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; +import org.jboss.ws.annotation.EndpointConfig; +import org.w3c.dom.Element; @WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/epr") @SOAPBinding(style = SOAPBinding.Style.RPC) @Stateless +@EndpointConfig(configName = "Standard WSAddressing Endpoint") public class TestEndpointImpl implements TestEndpoint { // provide logging private final static Logger log = Logger.getLogger(TestEndpointImpl.class); + @Resource + WebServiceContext context; + @WebMethod public String echo(String input) { + try + { + SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); + + // log message + SOAPMessage soapMessage = msgContext.getMessage(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + soapMessage.writeTo(baos); + log.info(new String(baos.toByteArray())); + + SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); + ReferenceParameters refParams = addrProps.getReferenceParameters(); + for (Object refParam : refParams.getElements()) + { + input += "|" + ((Element)refParam).getNodeValue(); + } + } + catch (Exception ex) + { + throw new RuntimeException(ex); + } return input; } }

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5818 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-27 06:01:42 -0500 (Wed, 27 Feb 2008) New Revision: 5818 Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMStore.java Log: fix synchronization issue + remove useless code Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-02-27 10:39:59 UTC (rev 5817) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-02-27 11:01:42 UTC (rev 5818) @@ -52,7 +52,6 @@ { InvocationHandler origInvHandler = ep.getInvocationHandler(); InvocationHandler wsrmInvHandler = new RMInvocationHandler(origInvHandler, (ArchiveDeployment)dep); - // TODO: implement wsrm data dir clean up here ep.setInvocationHandler(wsrmInvHandler); RMHelper.setupRMOperations(sepMetaData); log.info("WS-RM invocation handler associated with endpoint " + ep.getAddress()); @@ -70,7 +69,7 @@ { RMInvocationHandler rmInvHandler = (RMInvocationHandler)invHandler; ep.setInvocationHandler(rmInvHandler.getDelegate()); - log.info("WS-RM invocation handler removed from endpoint " + ep.getAddress()); + log.info("WS-RM invocation handler removed for endpoint " + ep.getAddress()); } } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2008-02-27 10:39:59 UTC (rev 5817) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2008-02-27 11:01:42 UTC (rev 5818) @@ -121,7 +121,7 @@ * @param inv invocation * @return RM response context to be set after target endpoint invocation */ - private synchronized Map<String, Object> prepareResponseContext(Endpoint ep, Invocation inv) + private static synchronized Map<String, Object> prepareResponseContext(Endpoint ep, Invocation inv, String dataDir) { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); AddressingProperties addrProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); @@ -268,7 +268,7 @@ @Override public final void invoke(Endpoint ep, Invocation inv) throws Exception { - Map<String, Object> rmResponseContext = prepareResponseContext(ep, inv); + Map<String, Object> rmResponseContext = prepareResponseContext(ep, inv, this.dataDir); if (inv.getJavaMethod() != null) { Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2008-02-27 10:39:59 UTC (rev 5817) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2008-02-27 11:01:42 UTC (rev 5818) @@ -21,18 +21,18 @@ */ package org.jboss.ws.extensions.wsrm.server; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; +import java.io.FileInputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.Iterator; +import java.io.ByteArrayOutputStream; + import java.util.Set; import java.util.TreeSet; +import java.util.Iterator; import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.wsrm.RMSequence; @@ -124,16 +124,6 @@ return this.outboundId; } - public void serialize() - { - throw new NotImplementedException(); - } - - public void deserialize() - { - throw new NotImplementedException(); - } - public final void addReceivedInboundMessage(long messageId) { this.receivedInboundMessages.add(messageId); @@ -173,6 +163,11 @@ { return this.receivedInboundMessages; } + + public long getCreationTime() + { + return this.creationTime; + } public void close() { @@ -211,7 +206,7 @@ public String toString() { - return this.inboundId + " - " + this.outboundId; + return this.sequenceId + "[" + this.inboundId + " - " + this.outboundId + "]"; } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMStore.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMStore.java 2008-02-27 10:39:59 UTC (rev 5817) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMStore.java 2008-02-27 11:01:42 UTC (rev 5818) @@ -81,6 +81,10 @@ { return sequence; } + if ((sequence.getCreationTime() + sequence.getDuration()) >= System.currentTimeMillis()) + { + sequences[i].delete(); // clean up timeouted sequences + } } catch (IOException ioe) {

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5817 - in stack: metro/trunk and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 05:39:59 -0500 (Wed, 27 Feb 2008) New Revision: 5817 Added: stack/cxf/trunk/ant-import/jbossws.default.undeploy.files stack/metro/trunk/ant-import/jbossws.default.undeploy.files stack/native/trunk/ant-import/jbossws.default.undeploy.files stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java Removed: stack/cxf/trunk/ant-import/macros-deploy-framework.xml stack/metro/trunk/ant-import/macros-deploy-framework.xml stack/native/trunk/ant-import/macros-deploy-framework.xml stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java Modified: stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/macros-deploy-metro.xml stack/metro/trunk/build.xml stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import-tests/build-testsuite.xml stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/macros-deploy-native.xml stack/native/trunk/build.xml stack/native/trunk/src/main/java/javax/xml/ws/Service.java stack/native/trunk/src/main/java/javax/xml/ws/Service21.java stack/native/trunk/src/main/java/javax/xml/ws/spi/ServiceDelegate.java stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java Log: Unify stack deployment using filesets. Add EPR test. Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -13,91 +13,58 @@ <project> - <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> - +  -  +   - -  - <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss422"> - <macro-deploy-cxf422 - stacklibs="${int.cxf.dir}/output/lib" - thirdpartylibs="${int.cxf.dir}/thirdparty"/> - - <macro-deploy-framework - thirdpartylibs="${int.cxf.dir}/thirdparty" - jbosshome="${jboss422.home}"/> + + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> + <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> + <macro-deploy-cxf422 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> - -  - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422"> + + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42"> <macro-undeploy-cxf422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - +  -  +   - -  - <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss423"> - <macro-deploy-cxf423 - stacklibs="${int.cxf.dir}/output/lib" - thirdpartylibs="${int.cxf.dir}/thirdparty"/> - - <macro-deploy-framework - thirdpartylibs="${int.cxf.dir}/thirdparty" - jbosshome="${jboss423.home}"/> + + <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss42"> + <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> + <macro-deploy-cxf423 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> - -  - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423"> + + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss42"> <macro-undeploy-cxf423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - +  -  +   - -  - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss500"> - <macro-deploy-cxf500 - stacklibs="${int.cxf.dir}/output/lib" - thirdpartylibs="${int.cxf.dir}/thirdparty"/> - <macro-deploy-framework - thirdpartylibs="${int.cxf.dir}/thirdparty" - jbosshome="${jboss500.home}"/> + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> + <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> + <macro-deploy-cxf500 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> - -  - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> + + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50"> <macro-undeploy-cxf500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> - +  -  +   - -  - <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/cxf to jboss501"> - <macro-deploy-cxf501 - stacklibs="${int.cxf.dir}/output/lib" - thirdpartylibs="${int.cxf.dir}/thirdparty"/> - <macro-deploy-framework - thirdpartylibs="${int.cxf.dir}/thirdparty" - jbosshome="${jboss501.home}"/> + <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/cxf to jboss50"> + <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> + <macro-deploy-cxf501 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> - -  - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss501"> + + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss50"> <macro-undeploy-cxf501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> - + </project> Added: stack/cxf/trunk/ant-import/jbossws.default.undeploy.files =================================================================== --- stack/cxf/trunk/ant-import/jbossws.default.undeploy.files (rev 0) +++ stack/cxf/trunk/ant-import/jbossws.default.undeploy.files 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar \ No newline at end of file Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -13,279 +13,263 @@ <project> +  + <patternset id="client.patternset"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> + </patternset> + + <patternset id="lib.patternset"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </patternset> + + <patternset id="server.lib.patternset"> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> + </patternset> +  -  +   -  - <macrodef name="macro-deploy-cxf422"> - <attribute name="stacklibs"/> + <macrodef name="macro-deploy-framework"> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <delete dir="${cxf.output.deploy.dir}"/> +  + <unzip dest="${cxf.output.deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> + <chmod dir="${cxf.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> -  - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> +  + <copy todir="${cxf.output.deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> + <patternset refid="client.patternset"/> </fileset> </copy> -  - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> +  + <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> + <patternset refid="server.lib.patternset"/> </fileset> </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws"> + <attribute name="jbosshome"/> + <attribute name="sarname"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> -  - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-cxf42.sar"/> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> +  + <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/@{sarname}"/> + <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss422.home}" overwrite="true"> +  + <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> +  <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - + <echo file="${cxf.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${cxf.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + </sequential> </macrodef> -  - <macrodef name="macro-undeploy-cxf422"> +  +  +  + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="jbosshome"/> <sequential> - <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${cxf.output.deploy.dir}"/> + + <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <delete> - <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/> + <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/> </delete> </sequential> </macrodef>  -  +   -  - <macrodef name="macro-deploy-cxf423"> + <macrodef name="macro-deploy-cxf42x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <delete dir="${cxf.output.deploy.dir}"/> -  <mkdir dir="${cxf.output.deploy.dir}/client"/> <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <patternset refid="client.patternset"/> + </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> + <patternset refid="client.patternset"/> </fileset> </copy> -  +  <mkdir dir="${cxf.output.deploy.dir}/lib"/> <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> + <patternset refid="lib.patternset"/> </fileset> </copy> -  - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-cxf42.sar"/> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss423.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> -  +  +  +  + + <macrodef name="macro-deploy-cxf422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-cxf422"> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws jbosshome="${jboss422.home}"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-cxf423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> + +  <macrodef name="macro-undeploy-cxf423"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws jbosshome="${jboss423.home}"/> </sequential> </macrodef>  -  +   -  - <macrodef name="macro-deploy-cxf500"> + <macrodef name="macro-deploy-cxf50x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <delete dir="${cxf.output.deploy.dir}"/> -  <mkdir dir="${cxf.output.deploy.dir}/client"/> <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <patternset refid="client.patternset"/> + </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> + <patternset refid="client.patternset"/> </fileset> </copy> -  +  <mkdir dir="${cxf.output.deploy.dir}/lib"/> <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> + <patternset refid="lib.patternset"/> </fileset> </copy> -  - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/> +  <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> + <fileset dir="@{stacklibs}"> + <patternset refid="server.lib.patternset"/> </fileset> </copy> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-cxf50.sar"/> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss500.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> -  +  +  +  + + <macrodef name="macro-deploy-cxf500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> + +  <macrodef name="macro-undeploy-cxf500"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-undeploy-jbossws jbosshome="${jboss500.home}"/> </sequential> </macrodef>  -  +   -  <macrodef name="macro-deploy-cxf501"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - - <delete dir="${cxf.output.deploy.dir}"/> - -  - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - </copy> - -  - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - -  - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/> - <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - </fileset> - </copy> - - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-cxf50.sar"/> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss501.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - + <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> </macrodef> -  +  <macrodef name="macro-undeploy-cxf501"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws jbosshome="${jboss501.home}"/> </sequential> </macrodef> Deleted: stack/cxf/trunk/ant-import/macros-deploy-framework.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/cxf/trunk/ant-import/macros-deploy-framework.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - -  - <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - -  - <copy todir="@{jbosshome}/client"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - -  - <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-framework"> - <attribute name="jbosshome"/> - <sequential> - <delete> -  - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - -  - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - -  - <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> \ No newline at end of file Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -13,45 +13,32 @@ <project> - <import file="${int.metro.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.metro.dir}/ant-import/macros-deploy-metro.xml"/>    - <target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/metro to jboss42"> - <macro-deploy-metro422 - stacklibs="${int.metro.dir}/output/lib" - thirdpartylibs="${int.metro.dir}/thirdparty"/> - - <macro-deploy-framework - thirdpartylibs="${int.metro.dir}/thirdparty" - jbosshome="${jboss422.home}"/> + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/metro to jboss42"> + <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> + <macro-deploy-metro422 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/metro from jboss42"> <macro-undeploy-metro422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target>    - <target name="deploy-jboss423" depends="jars-jboss423, undeploy-jboss423" description="Deploy jbossws/metro to jboss42"> - <macro-deploy-metro423 - stacklibs="${int.metro.dir}/output/lib" - thirdpartylibs="${int.metro.dir}/thirdparty"/> - - <macro-deploy-framework - thirdpartylibs="${int.metro.dir}/thirdparty" - jbosshome="${jboss423.home}"/> + <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/metro to jboss42"> + <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> + <macro-deploy-metro423 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/metro from jboss42"> <macro-undeploy-metro423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target>  @@ -59,18 +46,12 @@  <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/metro to jboss50"> - <macro-deploy-metro500 - stacklibs="${int.metro.dir}/output/lib" - thirdpartylibs="${int.metro.dir}/thirdparty"/> - - <macro-deploy-framework - thirdpartylibs="${int.metro.dir}/thirdparty" - jbosshome="${jboss500.home}"/> + <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> + <macro-deploy-metro500 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss50"> <macro-undeploy-metro500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target>  @@ -78,18 +59,12 @@  <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/metro to jboss50"> - <macro-deploy-metro501 - stacklibs="${int.metro.dir}/output/lib" - thirdpartylibs="${int.metro.dir}/thirdparty"/> - - <macro-deploy-framework - thirdpartylibs="${int.metro.dir}/thirdparty" - jbosshome="${jboss501.home}"/> + <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> + <macro-deploy-metro501 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss50"> <macro-undeploy-metro501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> </project> Added: stack/metro/trunk/ant-import/jbossws.default.undeploy.files =================================================================== --- stack/metro/trunk/ant-import/jbossws.default.undeploy.files (rev 0) +++ stack/metro/trunk/ant-import/jbossws.default.undeploy.files 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar \ No newline at end of file Deleted: stack/metro/trunk/ant-import/macros-deploy-framework.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/metro/trunk/ant-import/macros-deploy-framework.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - -  - <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - -  - <copy todir="@{jbosshome}/client"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - -  - <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-framework"> - <attribute name="jbosshome"/> - <sequential> - <delete> -  - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - -  - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - -  - <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -12,17 +12,13 @@  <project> - -  - <patternset id="client.stack.patternset"> - <include name="jbossws-metro-client.jar"/> - </patternset> - +  <patternset id="client.patternset"> + <include name="jbossws-metro-client.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -35,101 +31,121 @@ <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> </patternset> - + <patternset id="lib.patternset"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </patternset> - - <patternset id="serverlib.patternset"> + + <patternset id="server.lib.patternset"> <include name="jaxws-api.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/> </patternset> - +  -  +   - - <macrodef name="macro-deploy-metro422"> - <attribute name="stacklibs"/> + + <macrodef name="macro-deploy-framework"> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <delete dir="${metro.output.deploy.dir}"/> +  + <unzip dest="${metro.output.deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> + <chmod dir="${metro.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> - <mkdir dir="${metro.output.deploy.dir}/client"/> - <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> - </fileset> +  + <copy todir="${metro.output.deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy> - <mkdir dir="${metro.output.deploy.dir}/lib"/> - <copy todir="${metro.output.deploy.dir}/lib" overwrite="true"> +  + <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"> <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> + <patternset refid="server.lib.patternset"/> </fileset> </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws"> + <attribute name="jbosshome"/> + <attribute name="sarname"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-metro42.sar"/> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> +  + <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/@{sarname}"/> + <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss422.home}" overwrite="true"> +  + <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> +  <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - + <echo file="${metro.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${metro.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + </sequential> </macrodef> - -  - <macrodef name="macro-undeploy-metro422"> + +  +  +  + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="jbosshome"/> <sequential> - <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> + <delete dir="${metro.output.deploy.dir}"/> + + <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${int.metro.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <delete> - <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/> + <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/> </delete> </sequential> </macrodef> - +  -  +   - - <macrodef name="macro-deploy-metro423"> + + <macrodef name="macro-deploy-metro42x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <delete dir="${metro.output.deploy.dir}"/> - +  <mkdir dir="${metro.output.deploy.dir}/client"/> - <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> + <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="client.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy> +  <mkdir dir="${metro.output.deploy.dir}/lib"/> <copy todir="${metro.output.deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> @@ -137,178 +153,133 @@ </fileset> </copy> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-metro42.sar"/> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss423.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> - + +  +  +  + + <macrodef name="macro-deploy-metro422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-metro42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-metro42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-metro422"> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws jbosshome="${jboss422.home}"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-metro423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-metro42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-metro42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> +  <macrodef name="macro-undeploy-metro423"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws jbosshome="${jboss423.home}"/> </sequential> </macrodef> - +  -  +   - - <macrodef name="macro-deploy-metro500"> + + <macrodef name="macro-deploy-metro50x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - - <delete dir="${metro.output.deploy.dir}"/>  <mkdir dir="${metro.output.deploy.dir}/client"/> <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> + <patternset refid="client.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy> - -  + +  <mkdir dir="${metro.output.deploy.dir}/lib"/> <copy todir="${metro.output.deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> </copy> - -  - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"/> + +  <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="serverlib.patternset"/> + <fileset dir="@{stacklibs}"> + <patternset refid="server.lib.patternset"/> </fileset> </copy> - - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-metro50.sar"/> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss500.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> - + +  +  +  + + <macrodef name="macro-deploy-metro500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-metro50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-metro50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> +  <macrodef name="macro-undeploy-metro500"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-undeploy-jbossws jbosshome="${jboss500.home}"/> </sequential> </macrodef> - +  -  +   - + <macrodef name="macro-deploy-metro501"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - - <delete dir="${metro.output.deploy.dir}"/> - -  - <mkdir dir="${metro.output.deploy.dir}/client"/> - <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - -  - <mkdir dir="${metro.output.deploy.dir}/lib"/> - <copy todir="${metro.output.deploy.dir}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - -  - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"/> - <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="serverlib.patternset"/> - </fileset> - </copy> - - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-metro50.sar"/> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${metro.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss501.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - + <macro-deploy-metro50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-metro50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> </macrodef> - +  <macrodef name="macro-undeploy-metro501"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws jbosshome="${jboss501.home}"/> </sequential> </macrodef> - -</project> + +</project> \ No newline at end of file Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/metro/trunk/build.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -100,7 +100,7 @@  - <target name="jars" depends="build.metro,compile,jars-jboss422,jars-jboss423,jars-jboss50" description="Builds all jar files."> + <target name="jars" depends="build.metro,compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target> <target name="jars-common" depends="build.metro,compile"> @@ -201,7 +201,7 @@ </jar> </target> - <target name="jars-jboss422" depends="jars-common" if="jboss422.home"> + <target name="jars-jboss42" depends="jars-common"> <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> @@ -263,13 +263,6 @@ </jar> </target> - <target name="jars-jboss423" depends="jars-common" if="jboss423.home"> - -  - <property name="jboss422.home" value="${jboss423.home}"/> - <antcall target="jars-jboss422"/> - </target> -  <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -13,7 +13,6 @@ <project> - <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${core.dir}/ant-import/macros-deploy-native.xml"/>  @@ -22,95 +21,73 @@  <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421"> + <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss421.home}"/> </target> - <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  - <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws from jboss421"> + <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421"> <macro-undeploy-native421/> - <macro-undeploy-framework jbosshome="${jboss421.home}"/> </target> - <target name="undeploy-jboss421-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> - </target>  <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss422.home}"/> </target> - <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> <macro-undeploy-native422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> - </target>  <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss423.home}"/> </target> - <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> <macro-undeploy-native423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> - </target>  <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> + <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss500.home}"/> </target> - <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  - <target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500"> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> <macro-undeploy-native500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> - <target name="undeploy-jboss500-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> - </target> -     <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501"> + <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty"/> <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-framework thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss501.home}"/> </target> - <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> @@ -118,12 +95,6 @@  <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> <macro-undeploy-native501/> - <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> - <target name="undeploy-jboss501-endorsed" depends="prepare"> - <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> - </target> - </project> Added: stack/native/trunk/ant-import/jbossws.default.undeploy.files =================================================================== --- stack/native/trunk/ant-import/jbossws.default.undeploy.files (rev 0) +++ stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar \ No newline at end of file Deleted: stack/native/trunk/ant-import/macros-deploy-framework.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - -  - <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - -  - <copy todir="@{jbosshome}/client"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - -  - <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-framework"> - <attribute name="jbosshome"/> - <sequential> - <delete> -  - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - -  - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - -  - <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> \ No newline at end of file Modified: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -13,43 +13,152 @@ <project> +  + <patternset id="client.patternset"> + <include name="jbossws-client.jar"/> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </patternset> + + <patternset id="lib.patternset"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </patternset> + + <patternset id="lib.endorsed.patternset"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jaxb-api.jar"/> + </patternset> + + <patternset id="server.lib.patternset"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </patternset> +     <macrodef name="macro-deploy-endorsed"> - <attribute name="jbosshome"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> + <mkdir dir="${core.output.deploy.dir}/lib/endorsed"/> + <copy todir="${core.output.deploy.dir}/lib/endorsed" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> + <patternset refid="lib.endorsed.patternset"/> </fileset> <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> + <patternset refid="lib.endorsed.patternset"/> </fileset> </copy> </sequential> </macrodef> -  - <macrodef name="macro-undeploy-endorsed"> +  +  +  + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <sequential> + +  + <unzip dest="${core.output.deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> + <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${core.output.deploy.dir}/client"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + </fileset> + </copy> + +  + <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws"> <attribute name="jbosshome"/> + <attribute name="sarname"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> <sequential> + +  + <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/@{sarname}"/> + <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + +  + <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <copy todir="@{jbosshome}" overwrite="true"> + <fileset refid="jbossws.deploy.files"/> + </copy> + +  + <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> + <echo file="${core.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${core.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="jbosshome"/> + <sequential> + + <delete dir="${core.output.deploy.dir}"/> + + <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${core.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <delete> - <fileset dir="@{jbosshome}/lib/endorsed"> - <include name="jaxb-api.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> + <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/> </delete> + </sequential> </macrodef> @@ -63,8 +172,6 @@ <sequential> <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> - <delete dir="${core.output.deploy.dir}"/> -  <mkdir dir="${core.output.deploy.dir}/bin"/> <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> @@ -74,24 +181,12 @@ <mkdir dir="${core.output.deploy.dir}/client"/> <copy todir="${core.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> + <patternset refid="client.patternset"/> + <include name="jbossws-jboss421.jar"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jbossws-jboss421.jar"/> + <patternset refid="client.patternset"/> <include name="jboss-xml-binding.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> </fileset> </copy> @@ -99,11 +194,12 @@ <mkdir dir="${core.output.deploy.dir}/lib"/> <copy todir="${core.output.deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> + <patternset refid="lib.patternset"/> <include name="jboss-xml-binding.jar"/> </fileset> </copy> -  +  <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"/> <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> @@ -111,49 +207,27 @@ </fileset> </copy> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + <macro-deploy-jbossws jbosshome="${jboss421.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss421.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> <macrodef name="macro-undeploy-native421"> <sequential> <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss421.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <macro-undeploy-jbossws jbosshome="${jboss421.home}"/> </sequential> </macrodef>  -  +   - <macrodef name="macro-deploy-native422"> + <macrodef name="macro-deploy-native42x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <delete dir="${core.output.deploy.dir}"/> -  <mkdir dir="${core.output.deploy.dir}/bin"/> <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> @@ -163,54 +237,34 @@ <mkdir dir="${core.output.deploy.dir}/client"/> <copy todir="${core.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> + <patternset refid="client.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> + <patternset refid="client.patternset"/> </fileset> </copy> -  - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss422.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> +  +  +  + + <macrodef name="macro-deploy-native422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> + <macrodef name="macro-undeploy-native422"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws jbosshome="${jboss422.home}"/> </sequential> </macrodef> @@ -222,81 +276,28 @@ <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - - <delete dir="${core.output.deploy.dir}"/> - -  - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> - -  - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.output.deploy.dir}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.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="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - -  - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss423.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> </macrodef> <macrodef name="macro-undeploy-native423"> <sequential> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss423.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws jbosshome="${jboss423.home}"/> </sequential> </macrodef>  -  +   - <macrodef name="macro-deploy-native500"> + <macrodef name="macro-deploy-native50x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <delete dir="${core.output.deploy.dir}"/> -  <mkdir dir="${core.output.deploy.dir}/bin"/> <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> @@ -306,22 +307,10 @@ <mkdir dir="${core.output.deploy.dir}/client"/> <copy todir="${core.output.deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> + <patternset refid="client.patternset"/> </fileset> <fileset dir="@{thirdpartylibs}"> - <include name="policy.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> + <patternset refid="client.patternset"/> </fileset> </copy> @@ -329,50 +318,38 @@ <mkdir dir="${core.output.deploy.dir}/lib"/> <copy todir="${core.output.deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> + <patternset refid="lib.patternset"/> </fileset> </copy>  <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> + <patternset refid="server.lib.patternset"/> </fileset> </copy> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss500.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - </sequential> </macrodef> +  +  +  + + <macrodef name="macro-deploy-native500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + </sequential> + </macrodef> + <macrodef name="macro-undeploy-native500"> <sequential> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss500.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <macro-undeploy-jbossws jbosshome="${jboss500.home}"/> </sequential> </macrodef> @@ -380,93 +357,21 @@   - <macrodef name="macro-deploy-native501"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - - <delete dir="${core.output.deploy.dir}"/> - -  - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> - -  - <mkdir dir="${core.output.deploy.dir}/client"/> - <copy todir="${core.output.deploy.dir}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="policy.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - -  - <mkdir dir="${core.output.deploy.dir}/lib"/> - <copy todir="${core.output.deploy.dir}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - -  - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"/> - <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{stacklibs}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> - <mkdir dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - - <fileset id="jbossws.deploy.files" dir="${core.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss501.home}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${core.output.deploy.dir}/jbossws.deploy.files.txt" message="${jbossws.deploy.files}"/> - <replace file="${core.output.deploy.dir}/jbossws.deploy.files.txt" token=";" value=" "/> - <copy todir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${core.output.deploy.dir}/jbossws.deploy.files.txt" overwrite="true"/> - + <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> + <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> </macrodef> <macrodef name="macro-undeploy-native501"> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - - <loadfile property="jbossws.undeploy.files" srcfile="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deploy.files.txt" failonerror="false"/> - <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> - <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete> - <fileset dir="${jboss501.home}" includes="${jbossws.undeploy.files}"/> - </delete> - + <macro-undeploy-jbossws jbosshome="${jboss501.home}"/> </sequential> </macrodef> -</project> +</project> \ No newline at end of file Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -98,6 +98,14 @@ </webinf> </war> +  + <jar destfile="${tests.output.dir}/libs/jaxws-epr.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/epr/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/epr/*TestCase.class"/> + </fileset> + </jar> +  <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -70,7 +70,7 @@   - <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> + <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/build.xml 2008-02-27 10:39:59 UTC (rev 5817) @@ -159,7 +159,7 @@  <target name="compile-etc" depends="init"> <mkdir dir="${core.output.etc.dir}"/> - <copy todir="${core.output.etc.dir}" filtering="yes" overwrite="true"> + <copy todir="${core.output.etc.dir}" filtering="yes"> <fileset dir="${core.etc.dir}"/> <filterset> <filter token="java.vm.version" value="${java.vm.version}"/> Modified: stack/native/trunk/src/main/java/javax/xml/ws/Service.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Service.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/javax/xml/ws/Service.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -23,15 +23,14 @@ // $Id$ +import java.net.URL; +import java.util.Iterator; + import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.spi.Provider; -import javax.xml.ws.spi.ServiceDelegate; import javax.xml.ws.spi.ServiceDelegate21; -import javax.xml.ws.spi.Provider21; -import java.net.URL; -import java.util.Iterator; /** * <code>Service</code> objects provide the client view of a Web service. @@ -82,6 +81,35 @@ delegate = (ServiceDelegate21)Provider.provider().createServiceDelegate(wsdlDocumentLocation, serviceName, this.getClass()); } + /** + * Create a <code>Service</code> instance. + * + * The specified WSDL document location and service qualified name MUST + * uniquely identify a <code>wsdl:service</code> element. + * + * @param wsdlLocation URL for the WSDL document location + * for the service + * @param serviceName QName for the service + * @throws WebServiceException If any error in creation of the + * specified service. + **/ + public static Service create(URL wsdlLocation, QName serviceName) + { + return new Service(wsdlLocation, serviceName); + } + + /** + * Create a <code>Service</code> instance. + * + * @param serviceName QName for the service + * @throws WebServiceException If any error in creation of the + * specified service + */ + public static Service create(QName serviceName) + { + return create(null, serviceName); + } + /** * The getPort method returns a proxy. A service client * uses this proxy to invoke operations on the target @@ -316,33 +344,4 @@ { delegate.setExecutor(executor); } - - /** - * Create a <code>Service</code> instance. - * - * The specified WSDL document location and service qualified name MUST - * uniquely identify a <code>wsdl:service</code> element. - * - * @param wsdlLocation URL for the WSDL document location - * for the service - * @param serviceName QName for the service - * @throws WebServiceException If any error in creation of the - * specified service. - **/ - public static Service create(URL wsdlLocation, QName serviceName) - { - return new Service(wsdlLocation, serviceName); - } - - /** - * Create a <code>Service</code> instance. - * - * @param serviceName QName for the service - * @throws WebServiceException If any error in creation of the - * specified service - */ - public static Service create(QName serviceName) - { - return create(null, serviceName); - } } Modified: stack/native/trunk/src/main/java/javax/xml/ws/Service21.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/Service21.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/javax/xml/ws/Service21.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -21,6 +21,8 @@ */ package javax.xml.ws; +// $Id$ + import javax.xml.namespace.QName; import javax.xml.bind.JAXBContext; import java.net.URL; @@ -29,15 +31,44 @@ * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public abstract class Service21 extends Service +public class Service21 extends Service { - + protected Service21(URL wsdlDocumentLocation, QName serviceName) { super(wsdlDocumentLocation, serviceName); } /** + * Create a <code>Service</code> instance. + * + * The specified WSDL document location and service qualified name MUST + * uniquely identify a <code>wsdl:service</code> element. + * + * @param wsdlLocation URL for the WSDL document location + * for the service + * @param serviceName QName for the service + * @throws WebServiceException If any error in creation of the + * specified service. + **/ + public static Service21 create(URL wsdlLocation, QName serviceName) + { + return new Service21(wsdlLocation, serviceName); + } + + /** + * Create a <code>Service</code> instance. + * + * @param serviceName QName for the service + * @throws WebServiceException If any error in creation of the + * specified service + */ + public static Service21 create(QName serviceName) + { + return create(null, serviceName); + } + + /** * Creates a <code>Dispatch</code> instance for use with objects of * the users choosing. If there * are any reference parameters in the Modified: stack/native/trunk/src/main/java/javax/xml/ws/spi/ServiceDelegate.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/spi/ServiceDelegate.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/javax/xml/ws/spi/ServiceDelegate.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -46,9 +46,10 @@ * * @since JAX-WS 2.0 */ -public abstract class ServiceDelegate { - - protected ServiceDelegate() { +public abstract class ServiceDelegate +{ + protected ServiceDelegate() + { } /** @@ -79,8 +80,7 @@ * @see java.lang.reflect.Proxy * @see java.lang.reflect.InvocationHandler **/ - public abstract <T> T getPort(QName portName, - Class<T> serviceEndpointInterface); + public abstract <T> T getPort(QName portName, Class<T> serviceEndpointInterface); /** * The getPort method returns a proxy. The parameter @@ -107,9 +107,6 @@ **/ public abstract <T> T getPort(Class<T> serviceEndpointInterface); - - - /** * Creates a new port for the service. Ports created in this way contain * no WSDL port type information and can only be used for creating @@ -125,11 +122,8 @@ * @see javax.xml.ws.soap.SOAPBinding#SOAP12HTTP_BINDING * @see javax.xml.ws.http.HTTPBinding#HTTP_BINDING **/ - public abstract void addPort(QName portName, String bindingId, - String endpointAddress); + public abstract void addPort(QName portName, String bindingId, String endpointAddress); - - /** * Creates a <code>Dispatch</code> instance for use with objects of * the users choosing. @@ -151,10 +145,8 @@ * @see javax.xml.transform.Source * @see javax.xml.soap.SOAPMessage **/ - public abstract <T> Dispatch<T> createDispatch(QName portName, Class<T> type, - Service.Mode mode); + public abstract <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Service.Mode mode); - /** * Creates a <code>Dispatch</code> instance for use with JAXB * generated objects. @@ -174,8 +166,7 @@ * * @see javax.xml.bind.JAXBContext **/ - public abstract Dispatch<Object> createDispatch(QName portName, - JAXBContext context, Service.Mode mode); + public abstract Dispatch<Object> createDispatch(QName portName, JAXBContext context, Service.Mode mode); /** * Gets the name of this service. Modified: stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -23,6 +23,8 @@ // $Id$ +import java.net.MalformedURLException; +import java.net.URL; import java.util.List; import java.util.Map; @@ -33,6 +35,7 @@ import javax.xml.bind.annotation.XmlAnyElement; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.namespace.QName; @@ -41,10 +44,9 @@ import javax.xml.ws.EndpointReference; import javax.xml.ws.WebServiceException; +import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.w3c.dom.Element; -import org.jboss.ws.core.jaxws.JAXBContextFactory; - /** * This class represents a W3C Addressing EndpointReferece which is * a remote reference to a web service endpoint that supports the @@ -64,87 +66,237 @@ */ // XmlRootElement allows this class to be marshalled on its own -@XmlRootElement(name="EndpointReference",namespace=W3CEndpointReference.NS) -@XmlType(name="EndpointReferenceType",namespace=W3CEndpointReference.NS) -public final class W3CEndpointReference extends EndpointReference { +@XmlRootElement(name = "EndpointReference", namespace = W3CEndpointReference.NS) +@XmlType(name = "EndpointReferenceType", namespace = W3CEndpointReference.NS) +public final class W3CEndpointReference extends EndpointReference +{ + protected static final String NS = "http://www.w3.org/2005/08/addressing"; + + private final static JAXBContext w3cjc = getW3CJaxbContext(); + + // private but necessary properties for databinding + @XmlElement(name = "Address", namespace = NS) + private Address address; + @XmlElement(name = "ReferenceParameters", namespace = NS) + private Elements referenceParameters; + @XmlElement(name = "Metadata", namespace = NS) + private Elements metadata; + @XmlAnyAttribute + Map<QName, String> attributes; + @XmlAnyElement + List<Element> elements; - private final static JAXBContext w3cjc = getW3CJaxbContext(); + // not marshalled + private QName serviceName; + private QName endpointName; + private URL wsdlLocation; + + protected W3CEndpointReference() + { + } - protected W3CEndpointReference() { - } + /** + * construct an EPR from infoset representation + * + * @param source A source object containing valid XmlInfoset + * instance consistent with the W3C WS-Addressing Core + * recommendation. + * + * @throws WebServiceException + * If the source does NOT contain a valid W3C WS-Addressing + * EndpointReference. + * @throws NullPointerException + * If the <code>null</code> <code>source</code> value is given + */ + public W3CEndpointReference(Source source) + { + try + { + W3CEndpointReference epr = w3cjc.createUnmarshaller().unmarshal(source, W3CEndpointReference.class).getValue(); + this.address = epr.address; + this.metadata = epr.metadata; + this.referenceParameters = epr.referenceParameters; + } + catch (JAXBException e) + { + throw new WebServiceException("Error unmarshalling W3CEndpointReference ", e); + } + catch (ClassCastException e) + { + throw new WebServiceException("Source did not contain W3CEndpointReference", e); + } + } - /** - * construct an EPR from infoset representation - * - * @param source A source object containing valid XmlInfoset - * instance consistent with the W3C WS-Addressing Core - * recommendation. - * - * @throws WebServiceException - * If the source does NOT contain a valid W3C WS-Addressing - * EndpointReference. - * @throws NullPointerException - * If the <code>null</code> <code>source</code> value is given - */ - public W3CEndpointReference(Source source) { - try { - W3CEndpointReference epr = w3cjc.createUnmarshaller().unmarshal(source,W3CEndpointReference.class).getValue(); - this.address = epr.address; - this.metadata = epr.metadata; - this.referenceParameters = epr.referenceParameters; - } catch (JAXBException e) { - throw new WebServiceException("Error unmarshalling W3CEndpointReference " ,e); - } catch (ClassCastException e) { - throw new WebServiceException("Source did not contain W3CEndpointReference", e); - } - } + @XmlTransient + public String getAddress() + { + return address != null ? address.getUri() : null; + } - /** - * {@inheritDoc} - */ - public void writeTo(Result result){ - try { - Marshaller marshaller = w3cjc.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); - marshaller.marshal(this, result); - } catch (JAXBException e) { - throw new WebServiceException("Error marshalling W3CEndpointReference. ", e); - } - } + void setAddress(String address) + { + this.address = new Address(address); + } + + @XmlTransient + public QName getServiceName() + { + return serviceName; + } - private static JAXBContext getW3CJaxbContext() { - return JAXBContextFactory.newInstance().createContext(new Class[] { W3CEndpointReference.class}); - } + public void setServiceName(QName serviceName) + { + this.serviceName = serviceName; + } - // private but necessary properties for databinding - @XmlElement(name="Address",namespace=NS) - private Address address; - @XmlElement(name="ReferenceParameters",namespace=NS) - private Elements referenceParameters; - @XmlElement(name="Metadata",namespace=NS) - private Elements metadata; - @XmlAnyAttribute - Map<QName,String> attributes; - @XmlAnyElement - List<Element> elements; + @XmlTransient + public QName getEndpointName() + { + return endpointName; + } + public void setEndpointName(QName endpointName) + { + this.endpointName = endpointName; + } - private static class Address { - protected Address() {} - @XmlValue - String uri; - @XmlAnyAttribute - Map<QName,String> attributes; - } + @XmlTransient + public List<Element> getMetadata() + { + return metadata != null ? metadata.getElements() : null; + } + public void setMetadata(List<Element> metadata) + { + this.metadata = new Elements(metadata); + } - private static class Elements { - protected Elements() {} - @XmlAnyElement - List<Element> elements; - @XmlAnyAttribute - Map<QName,String> attributes; - } + @XmlTransient + public URL getWsdlLocation() + { + return wsdlLocation; + } - protected static final String NS = "http://www.w3.org/2005/08/addressing"; + public void setWsdlLocation(String wsdlLocation) + { + try + { + this.wsdlLocation = wsdlLocation != null ? new URL(wsdlLocation) : null; + } + catch (MalformedURLException e) + { + throw new IllegalArgumentException("Invalid URL: " + wsdlLocation); + } + } + + @XmlTransient + public List<Element> getReferenceParameters() + { + return referenceParameters != null ? referenceParameters.getElements() : null; + } + + public void setReferenceParameters(List<Element> metadata) + { + this.referenceParameters = new Elements(metadata); + } + + /** + * {@inheritDoc} + */ + public void writeTo(Result result) + { + try + { + Marshaller marshaller = w3cjc.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.marshal(this, result); + } + catch (JAXBException e) + { + throw new WebServiceException("Error marshalling W3CEndpointReference. ", e); + } + } + + private static JAXBContext getW3CJaxbContext() + { + return JAXBContextFactory.newInstance().createContext(new Class[] { W3CEndpointReference.class }); + } + + private static class Address + { + @XmlValue + String uri; + @XmlAnyAttribute + Map<QName, String> attributes; + + protected Address() + { + } + + public Address(String uri) + { + this.uri = uri; + } + + @XmlTransient + public String getUri() + { + return uri; + } + + public void setUri(String uri) + { + this.uri = uri; + } + + @XmlTransient + public Map<QName, String> getAttributes() + { + return attributes; + } + + public void setAttributes(Map<QName, String> attributes) + { + this.attributes = attributes; + } + } + + private static class Elements + { + @XmlAnyElement + List<Element> elements; + @XmlAnyAttribute + Map<QName, String> attributes; + + protected Elements() + { + } + + public Elements(List<Element> elements) + { + this.elements = elements; + } + + @XmlTransient + public List<Element> getElements() + { + return elements; + } + + public void setElements(List<Element> elements) + { + this.elements = elements; + } + + @XmlTransient + public Map<QName, String> getAttributes() + { + return attributes; + } + + public void setAttributes(Map<QName, String> attributes) + { + this.attributes = attributes; + } + } } Modified: stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java =================================================================== --- stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -23,18 +23,14 @@ // $Id$ - import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.WebServiceException; -import javax.xml.ws.spi.Provider; -import javax.xml.ws.spi.Provider21; import org.w3c.dom.Element; - /** * This class is used to build <code>W3CEndpointReference</code> * instances. The intended use of this clsss is for @@ -62,202 +58,217 @@ * * @since JAX-WS 2.1 */ -public final class W3CEndpointReferenceBuilder { - - public W3CEndpointReferenceBuilder() { - referenceParameters = new ArrayList<Element>(); - metadata = new ArrayList<Element>(); - } - - /** - * Sets the <code>address</code> to the - * <code>W3CEndpointReference</code> instance's - * <code>wsa:Address</code>. - * <p> - * The <code>address</code> MUST be set to a non-<code>null</code> - * value when building a <code>W3CEndpointReference</code> for a - * web service endpoint that is not published by the same - * Java EE application or when running on Java SE. - * - * @param address The address of the endpoint to be targeted - * by the returned <code>W3CEndpointReference<code>. - * - * @return A <code>W3CEndpointReferenceBuilder</code> instance with - * the <code>address</code> set to the <code>wsa:Address</code>. - */ - public W3CEndpointReferenceBuilder address(String address) { - this.address = address; - return this; - } - - /** - * Sets the <code>serviceName</code> as the - * <code>wsaw:ServiceName</code> element in the - * <code>wsa:Metadata</code> element. - * - * @param serviceName The service name of the endpoint to be targeted - * by the returned <code>W3CEndpointReference<code>. This property - * may also be used with the <code>endpointName</code> (portName) - * property to lookup the <code>address</code> of a web service - * endpoint that is published by the same Java EE application. - * - * @return A <code>W3CEndpointReferenceBuilder</code> instance with - * the <code>serviceName</code> element added to the - * <code>wsa:Metadata</code> element. - * - */ - public W3CEndpointReferenceBuilder serviceName(QName serviceName) { - this.serviceName = serviceName; - return this; - } - - /** - * Sets the <code>endpointName</code> as and attribute on - * <code>wsaw:ServiceName</code> element in the - * <code>wsa:Metadata</code> element. This method can only - * be called after the {@link #serviceName} method has been called. - * - * @param endpointName The name of the endpoint to be targeted - * by the returned <code>W3CEndpointReference<code>. The - * <code>endpointName</code> (portName) property may also be - * used with the <code>serviceName</code> property to lookup - * the <code>address</code> of a web service - * endpoint published by the same Java EE application. - * - * @return A <code>W3CEndpointReferenceBuilder</code> instance with - * the <code>endpointName</code> atrribute added to the - * <code>wsaw:ServiceName</code> element in the - * <code>wsa:Metadata</code> element. - * - * @throws javax.lang.IllegalStateException If the <code>serviceName</code> has not - * been set. - */ - public W3CEndpointReferenceBuilder endpointName(QName endpointName) { - if (serviceName == null) { - throw new IllegalStateException("The W3CEndpointReferenceBuilder's serviceName must be set before setting the endpointName: "+endpointName); - } - - this.endpointName = endpointName; - return this; - } - - /** - * Sets the <code>wsdlDocumentLocation</code> that will be inlined - * in the <code>W3CEndpointReferenc</code> instance's - * <code>wsa:Metadata</code>. - * - * @param wsdlDocumentLocation The location of the WSDL document to - * be inlined in the <code>wsa:Metadata</code> of the - * <code>W3CEndpointReference<code>. - * - * @return A <code>W3CEndpointReferenceBuilder</code> instance with - * the <code>wsdlDocumentLocation</code> that is to be inlined. - * - */ - public W3CEndpointReferenceBuilder wsdlDocumentLocation(String wsdlDocumentLocation) { - this.wsdlDocumentLocation = wsdlDocumentLocation; - return this; - } - - /** - * Adds the <code>referenceParameter</code> to the - * <code>W3CEndpointReference</code> instance - * <code>wsa:ReferenceParameters</code> element. - * - * @param referenceParameter The element to be added to the - * <code>wsa:ReferenceParameters</code> element. - * - * @return A <code>W3CEndpointReferenceBuilder</code> instance with - * the <code>referenceParameter</code> added to the - * <code>wsa:ReferenceParameters</code> element. - * - * @throws java.lang.IllegalArgumentException if <code>referenceParameter</code> - * is <code>null</code>. - */ - public W3CEndpointReferenceBuilder referenceParameter(Element referenceParameter) { - if (referenceParameter == null) - throw new java.lang.IllegalArgumentException("The referenceParameter cannot be null."); - referenceParameters.add(referenceParameter); - return this; - } - - /** - * Adds the <code>metadataElement</code> to the - * <code>W3CEndpointReference</code> instance's - * <code>wsa:Metadata</code> element. - * - * @param metadataElement The element to be added to the - * <code>wsa:Metadata</code> element. - * - * @return A <code>W3CEndpointReferenceBuilder</code> instance with - * the <code>metadataElement</code> added to the - * <code>wsa:Metadata</code> element. - * - * @throws java.lang.IllegalArgumentException if <code>metadataElement</code> - * is <code>null</code>. - */ - public W3CEndpointReferenceBuilder metadata(Element metadataElement) { - if (metadataElement == null) - throw new java.lang.IllegalArgumentException("The metadataElement cannot be null."); - metadata.add(metadataElement); - return this; - } - - /** - * Builds a <code>W3CEndpointReference</code> from the accumulated - * properties set on this <code>W3CEndpointReferenceBuilder</code> - * instance. - * <p> - * This method can be used to create a <code>W3CEndpointReference</code> - * for any endpoint by specifying the <code>address</code> property along - * with any other desired properties. This method - * can also be used to create a <code>W3CEndpointReference</code> for - * an endpoint that is published by the same Java EE application. - * This method can automatically determine the <code>address</code> of - * an endpoint published by the same Java EE application that is identified by the - * <code>serviceName</code> and - * <code>endpointName</code> properties. If the <code>address</code> is - * <code>null</code> and the <code>serviceName</code> and - * <code>endpointName</code> - * do not identify an endpoint published by the same Java EE application, a - * <code>javax.lang.IllegalStateException</code> MUST be thrown. - * - * - * @return <code>W3CEndpointReference</code> from the accumulated - * properties set on this <code>W3CEndpointReferenceBuilder</code> - * instance. This method never returns <code>null</code>. - * - * @throws javax.lang.IllegalStateException - * <ul> - * <li>If the <code>address</code>, <code>serviceName</code> and - * <code>endpointName</code> are all <code>null</code>. - * <li>If the <code>serviceName</code> service is <code>null</code> and the - * <code>endpointName</code> is NOT <code>null</code>. - * <li>If the <code>address</code> property is <code>null</code> and - * the <code>serviceName</code> and <code>endpointName</code> do not - * specify a valid endpoint published by the same Java EE - * application. - * <li>If the <code>serviceName</code>is NOT <code>null</code> - * and is not present in the specified WSDL. - * <li>If the <code>endpointName</code> port is not <code>null<code> and it - * is not present in <code>serviceName</code> service in the WSDL. - * <li>If the <code>wsdlDocumentLocation</code> is NOT <code>null</code> Pr - * and does not represent a valid WSDL. - * </ul> - * @throws WebServiceException If an error occurs while creating the - * <code>W3CEndpointReference</code>. - * - */ - public W3CEndpointReference build() { - return ((Provider21)Provider.provider()).createW3CEndpointReference(address, - serviceName, endpointName, metadata, wsdlDocumentLocation, - referenceParameters); - } - - private String address; - private List<Element> referenceParameters; - private List<Element> metadata; - private QName serviceName; - private QName endpointName; - private String wsdlDocumentLocation; +public final class W3CEndpointReferenceBuilder +{ + + private String address; + private List<Element> parameters; + private List<Element> metadata; + private QName serviceName; + private QName endpointName; + private String wsdlLocation; + + public W3CEndpointReferenceBuilder() + { + parameters = new ArrayList<Element>(); + metadata = new ArrayList<Element>(); + } + + /** + * Sets the <code>address</code> to the + * <code>W3CEndpointReference</code> instance's + * <code>wsa:Address</code>. + * <p> + * The <code>address</code> MUST be set to a non-<code>null</code> + * value when building a <code>W3CEndpointReference</code> for a + * web service endpoint that is not published by the same + * Java EE application or when running on Java SE. + * + * @param address The address of the endpoint to be targeted + * by the returned <code>W3CEndpointReference<code>. + * + * @return A <code>W3CEndpointReferenceBuilder</code> instance with + * the <code>address</code> set to the <code>wsa:Address</code>. + */ + public W3CEndpointReferenceBuilder address(String address) + { + this.address = address; + return this; + } + + /** + * Sets the <code>serviceName</code> as the + * <code>wsaw:ServiceName</code> element in the + * <code>wsa:Metadata</code> element. + * + * @param serviceName The service name of the endpoint to be targeted + * by the returned <code>W3CEndpointReference<code>. This property + * may also be used with the <code>endpointName</code> (portName) + * property to lookup the <code>address</code> of a web service + * endpoint that is published by the same Java EE application. + * + * @return A <code>W3CEndpointReferenceBuilder</code> instance with + * the <code>serviceName</code> element added to the + * <code>wsa:Metadata</code> element. + * + */ + public W3CEndpointReferenceBuilder serviceName(QName serviceName) + { + this.serviceName = serviceName; + return this; + } + + /** + * Sets the <code>endpointName</code> as and attribute on + * <code>wsaw:ServiceName</code> element in the + * <code>wsa:Metadata</code> element. This method can only + * be called after the {@link #serviceName} method has been called. + * + * @param endpointName The name of the endpoint to be targeted + * by the returned <code>W3CEndpointReference<code>. The + * <code>endpointName</code> (portName) property may also be + * used with the <code>serviceName</code> property to lookup + * the <code>address</code> of a web service + * endpoint published by the same Java EE application. + * + * @return A <code>W3CEndpointReferenceBuilder</code> instance with + * the <code>endpointName</code> atrribute added to the + * <code>wsaw:ServiceName</code> element in the + * <code>wsa:Metadata</code> element. + * + * @throws javax.lang.IllegalStateException If the <code>serviceName</code> has not + * been set. + */ + public W3CEndpointReferenceBuilder endpointName(QName endpointName) + { + if (serviceName == null) + { + throw new IllegalStateException("The W3CEndpointReferenceBuilder's serviceName must be set before setting the endpointName: " + endpointName); + } + + this.endpointName = endpointName; + return this; + } + + /** + * Sets the <code>wsdlDocumentLocation</code> that will be inlined + * in the <code>W3CEndpointReferenc</code> instance's + * <code>wsa:Metadata</code>. + * + * @param wsdlDocumentLocation The location of the WSDL document to + * be inlined in the <code>wsa:Metadata</code> of the + * <code>W3CEndpointReference<code>. + * + * @return A <code>W3CEndpointReferenceBuilder</code> instance with + * the <code>wsdlDocumentLocation</code> that is to be inlined. + * + */ + public W3CEndpointReferenceBuilder wsdlDocumentLocation(String wsdlDocumentLocation) + { + this.wsdlLocation = wsdlDocumentLocation; + return this; + } + + /** + * Adds the <code>referenceParameter</code> to the + * <code>W3CEndpointReference</code> instance + * <code>wsa:ReferenceParameters</code> element. + * + * @param referenceParameter The element to be added to the + * <code>wsa:ReferenceParameters</code> element. + * + * @return A <code>W3CEndpointReferenceBuilder</code> instance with + * the <code>referenceParameter</code> added to the + * <code>wsa:ReferenceParameters</code> element. + * + * @throws java.lang.IllegalArgumentException if <code>referenceParameter</code> + * is <code>null</code>. + */ + public W3CEndpointReferenceBuilder referenceParameter(Element referenceParameter) + { + if (referenceParameter == null) + throw new java.lang.IllegalArgumentException("The referenceParameter cannot be null."); + parameters.add(referenceParameter); + return this; + } + + /** + * Adds the <code>metadataElement</code> to the + * <code>W3CEndpointReference</code> instance's + * <code>wsa:Metadata</code> element. + * + * @param metadataElement The element to be added to the + * <code>wsa:Metadata</code> element. + * + * @return A <code>W3CEndpointReferenceBuilder</code> instance with + * the <code>metadataElement</code> added to the + * <code>wsa:Metadata</code> element. + * + * @throws java.lang.IllegalArgumentException if <code>metadataElement</code> + * is <code>null</code>. + */ + public W3CEndpointReferenceBuilder metadata(Element metadataElement) + { + if (metadataElement == null) + throw new java.lang.IllegalArgumentException("The metadataElement cannot be null."); + metadata.add(metadataElement); + return this; + } + + /** + * Builds a <code>W3CEndpointReference</code> from the accumulated + * properties set on this <code>W3CEndpointReferenceBuilder</code> + * instance. + * <p> + * This method can be used to create a <code>W3CEndpointReference</code> + * for any endpoint by specifying the <code>address</code> property along + * with any other desired properties. This method + * can also be used to create a <code>W3CEndpointReference</code> for + * an endpoint that is published by the same Java EE application. + * This method can automatically determine the <code>address</code> of + * an endpoint published by the same Java EE application that is identified by the + * <code>serviceName</code> and + * <code>endpointName</code> properties. If the <code>address</code> is + * <code>null</code> and the <code>serviceName</code> and + * <code>endpointName</code> + * do not identify an endpoint published by the same Java EE application, a + * <code>javax.lang.IllegalStateException</code> MUST be thrown. + * + * + * @return <code>W3CEndpointReference</code> from the accumulated + * properties set on this <code>W3CEndpointReferenceBuilder</code> + * instance. This method never returns <code>null</code>. + * + * @throws javax.lang.IllegalStateException + * <ul> + * <li>If the <code>address</code>, <code>serviceName</code> and + * <code>endpointName</code> are all <code>null</code>. + * <li>If the <code>serviceName</code> service is <code>null</code> and the + * <code>endpointName</code> is NOT <code>null</code>. + * <li>If the <code>address</code> property is <code>null</code> and + * the <code>serviceName</code> and <code>endpointName</code> do not + * specify a valid endpoint published by the same Java EE + * application. + * <li>If the <code>serviceName</code>is NOT <code>null</code> + * and is not present in the specified WSDL. + * <li>If the <code>endpointName</code> port is not <code>null<code> and it + * is not present in <code>serviceName</code> service in the WSDL. + * <li>If the <code>wsdlDocumentLocation</code> is NOT <code>null</code> Pr + * and does not represent a valid WSDL. + * </ul> + * @throws WebServiceException If an error occurs while creating the + * <code>W3CEndpointReference</code>. + * + */ + public W3CEndpointReference build() + { + W3CEndpointReference epr = new W3CEndpointReference(); + epr.setAddress(address); + epr.setServiceName(serviceName); + epr.setEndpointName(endpointName); + epr.setMetadata(metadata); + epr.setWsdlLocation(wsdlLocation); + epr.setReferenceParameters(parameters); + return epr; + } } Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -1,135 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.spi; - -// $Id$ - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.ws.Endpoint; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.soap.SOAPBinding; -import javax.xml.ws.spi.Provider; -import javax.xml.ws.spi.ServiceDelegate; -import javax.xml.ws.spi.Provider21; -import javax.xml.ws.wsaddressing.W3CEndpointReference; - -import org.jboss.util.NotImplementedException; -import org.jboss.wsf.common.DOMUtils; -import org.w3c.dom.Element; - -/** - * Service provider for ServiceDelegate and Endpoint objects. - * - * @author Thomas.Diesler(a)jboss.com - * @since 03-May-2006 - */ -public class ProviderImpl extends Provider21 -{ - // 6.2 Conformance (Concrete javax.xml.ws.spi.Provider required): An implementation MUST provide - // a concrete class that extends javax.xml.ws.spi.Provider. Such a class MUST have a public constructor - // which takes no arguments. - public ProviderImpl() - { - } - - @Override - public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass) - { - ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass); - DOMUtils.clearThreadLocals(); - return delegate; - } - - @Override - public Endpoint createEndpoint(String bindingId, Object implementor) - { - EndpointImpl endpoint = new EndpointImpl(bindingId, implementor); - return endpoint; - } - - @Override - public Endpoint createAndPublishEndpoint(String address, Object implementor) - { - // 6.3 Conformance (Provider createAndPublishEndpoint Method): The effect of invoking the createAnd- - // PublishEndpoint method on a Provider MUST be the same as first invoking the createEndpoint - // method with the binding ID appropriate to the URL scheme used by the address, then invoking the - // publish(String address) method on the resulting endpoint. - - String bindingId = getBindingFromAddress(address); - EndpointImpl endpoint = (EndpointImpl)createEndpoint(bindingId, implementor); - endpoint.publish(address); - return endpoint; - } - - private String getBindingFromAddress(String address) - { - String bindingId; - try - { - URL url = new URL(address); - String protocol = url.getProtocol(); - if (protocol.startsWith("http")) - { - bindingId = SOAPBinding.SOAP11HTTP_BINDING; - } - else - { - throw new IllegalArgumentException("Unsupported protocol: " + address); - } - } - catch (MalformedURLException e) - { - throw new IllegalArgumentException("Invalid endpoint address: " + address); - } - return bindingId; - } - - @Override - public <T extends EndpointReference> T createEndpointReference(Class<T> clazz, QName serviceName, QName portName, Source wsdlDocumentLocation, Element... referenceParameters) - { - throw new NotImplementedException(); - } - - @Override - public W3CEndpointReference createW3CEndpointReference(String address, QName serviceName, QName portName, List<Element> metadata, String wsdlDocumentLocation, List<Element> referenceParameters) - { - throw new NotImplementedException(); - } - - @Override - public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features) - { - throw new NotImplementedException(); - } - - @Override - public EndpointReference readEndpointReference(Source eprInfoset) - { - throw new NotImplementedException(); - } -} \ No newline at end of file Added: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1,152 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws.spi; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.ws.Endpoint; +import javax.xml.ws.EndpointReference; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.soap.SOAPBinding; +import javax.xml.ws.spi.Provider21; +import javax.xml.ws.spi.ServiceDelegate; +import javax.xml.ws.spi.ServiceDelegate21; +import javax.xml.ws.wsaddressing.W3CEndpointReference; +import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; + +import org.jboss.util.NotImplementedException; +import org.w3c.dom.Element; + +/** + * Service provider for ServiceDelegate and Endpoint objects. + * + * @author Thomas.Diesler(a)jboss.com + * @since 03-May-2006 + */ +public class ProviderImpl extends Provider21 +{ + // 6.2 Conformance (Concrete javax.xml.ws.spi.Provider required): An implementation MUST provide + // a concrete class that extends javax.xml.ws.spi.Provider. Such a class MUST have a public constructor + // which takes no arguments. + public ProviderImpl() + { + } + + @Override + public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass) + { + ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass); + return delegate; + } + + @Override + public Endpoint createEndpoint(String bindingId, Object implementor) + { + EndpointImpl endpoint = new EndpointImpl(bindingId, implementor); + return endpoint; + } + + @Override + public Endpoint createAndPublishEndpoint(String address, Object implementor) + { + // 6.3 Conformance (Provider createAndPublishEndpoint Method): The effect of invoking the createAnd- + // PublishEndpoint method on a Provider MUST be the same as first invoking the createEndpoint + // method with the binding ID appropriate to the URL scheme used by the address, then invoking the + // publish(String address) method on the resulting endpoint. + + String bindingId = getBindingFromAddress(address); + EndpointImpl endpoint = (EndpointImpl)createEndpoint(bindingId, implementor); + endpoint.publish(address); + return endpoint; + } + + private String getBindingFromAddress(String address) + { + String bindingId; + try + { + URL url = new URL(address); + String protocol = url.getProtocol(); + if (protocol.startsWith("http")) + { + bindingId = SOAPBinding.SOAP11HTTP_BINDING; + } + else + { + throw new IllegalArgumentException("Unsupported protocol: " + address); + } + } + catch (MalformedURLException e) + { + throw new IllegalArgumentException("Invalid endpoint address: " + address); + } + return bindingId; + } + + @Override + public <T extends EndpointReference> T createEndpointReference(Class<T> clazz, QName serviceName, QName portName, Source wsdlDocumentLocation, + Element... referenceParameters) + { + throw new NotImplementedException(); + } + + @Override + public W3CEndpointReference createW3CEndpointReference(String address, QName serviceName, QName portName, List<Element> metadata, String wsdlDocumentLocation, + List<Element> referenceParameters) + { + W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); + builder = builder.address(address).serviceName(serviceName).endpointName(portName).wsdlDocumentLocation(wsdlDocumentLocation); + for (Element el : metadata) + builder = builder.metadata(el); + for (Element el : referenceParameters) + builder = builder.referenceParameter(el); + return builder.build(); + } + + @Override + public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features) + { + URL wsdlLocation = null; + QName serviceName = null; + if (epr instanceof W3CEndpointReference) + { + W3CEndpointReference w3c = (W3CEndpointReference)epr; + wsdlLocation = w3c.getWsdlLocation(); + serviceName = w3c.getServiceName(); + } + ServiceDelegate21 delegate = (ServiceDelegate21)createServiceDelegate(wsdlLocation, serviceName, Service.class); + return delegate.getPort(epr, sei, features); + } + + @Override + public EndpointReference readEndpointReference(Source eprInfoset) + { + throw new NotImplementedException(); + } +} \ No newline at end of file Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-02-26 18:25:04 UTC (rev 5816) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -46,11 +46,10 @@ import javax.xml.ws.WebServiceFeature; import javax.xml.ws.Service.Mode; import javax.xml.ws.handler.HandlerResolver; -import javax.xml.ws.spi.ServiceDelegate; import javax.xml.ws.spi.ServiceDelegate21; +import javax.xml.ws.wsaddressing.W3CEndpointReference; import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; @@ -126,7 +125,7 @@ wsdlURL = null; } } - + if (wsdlURL != null) { JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder(); @@ -188,7 +187,7 @@ QName portType = getPortTypeName(seiClass); epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, portType, Type.JAXWS); } - + String seiClassName = seiClass.getName(); epMetaData.setServiceEndpointInterfaceName(seiClassName); @@ -382,15 +381,15 @@ { if (seiClass == null) throw new IllegalArgumentException("SEI class cannot be null"); - + try { ExecutorService executor = (ExecutorService)getExecutor(); ClientProxy handler = new ClientProxy(executor, new ClientImpl(epMetaData, handlerResolver)); ClassLoader cl = epMetaData.getClassLoader(); - + T proxy; - try + try { proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, RMProvider.class, BindingProvider.class, StubExt.class }, handler); } @@ -458,42 +457,61 @@ @Override public <T> Dispatch<T> createDispatch(QName portName, Class<T> type, Mode mode, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + return createDispatch(portName, type, mode); } @Override - public <T> Dispatch<T> createDispatch(EndpointReference endpointReference, Class<T> type, Mode mode, WebServiceFeature... features) + public <T> Dispatch<T> createDispatch(EndpointReference epr, Class<T> type, Mode mode, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + QName portName = null; + if (epr instanceof W3CEndpointReference) + { + W3CEndpointReference w3c = (W3CEndpointReference)epr; + portName = w3c.getEndpointName(); + } + return createDispatch(portName, type, mode); } @Override public Dispatch<Object> createDispatch(QName portName, JAXBContext context, Mode mode, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + return createDispatch(portName, context, mode); } @Override - public Dispatch<Object> createDispatch(EndpointReference endpointReference, JAXBContext context, Mode mode, WebServiceFeature... features) + public Dispatch<Object> createDispatch(EndpointReference epr, JAXBContext context, Mode mode, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + QName portName = null; + if (epr instanceof W3CEndpointReference) + { + W3CEndpointReference w3c = (W3CEndpointReference)epr; + portName = w3c.getEndpointName(); + } + return createDispatch(portName, context, mode); } @Override - public <T> T getPort(QName portName, Class<T> serviceEndpointInterface, WebServiceFeature... features) + public <T> T getPort(QName portName, Class<T> sei, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + return getPort(portName, sei); } @Override - public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features) + public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + return getPort(sei); } @Override - public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) + public <T> T getPort(Class<T> sei, WebServiceFeature... features) { - throw new NotImplementedException(); + log.warn("WebServiceFeature not implemented"); + return getPort(sei); } } Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1,77 @@ +/* + * 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.epr; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.Service21; +import javax.xml.ws.wsaddressing.W3CEndpointReference; +import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1844] Implement Provider.createW3CEndpointReference() + * + * http://jira.jboss.org/jira/browse/JBWS-1844 + * + * @author Thomas.Diesler(a)jboss.com + * @since 25-Feb-2007 + */ +public class EndpointReferenceTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(EndpointReferenceTestCase.class, "jaxws-epr.jar"); + } + + public void _testSimple() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + String retStr = port.echo("hello"); + assertEquals("hello", retStr); + } + + public void testEndpointReference() throws Exception + { + String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointImpl"; + QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService"); + + W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); + builder = builder.address(address); + builder = builder.serviceName(serviceName); + W3CEndpointReference epr = builder.build(); + + Service21 service = Service21.create(serviceName); + TestEndpoint port = service.getPort(epr, TestEndpoint.class); + String retStr = port.echo("hello"); + assertEquals("hello", retStr); + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpoint.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpoint.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1,32 @@ +/* + * 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.epr; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/epr") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint +{ + String echo(String input); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java 2008-02-27 10:39:59 UTC (rev 5817) @@ -0,0 +1,46 @@ +/* + * 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.epr; + +// $Id$ + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/epr") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Stateless +public class TestEndpointImpl implements TestEndpoint +{ + // provide logging + private final static Logger log = Logger.getLogger(TestEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5816 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-26 13:25:04 -0500 (Tue, 26 Feb 2008) New Revision: 5816 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java Log: Improve installer logging Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2008-02-26 18:14:52 UTC (rev 5815) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2008-02-26 18:25:04 UTC (rev 5816) @@ -80,13 +80,13 @@ { depAspects.clear(); depAspects.addAll(aspects); - + // Debug the aspect list StringBuilder builder = new StringBuilder("setDeploymentAspects on " + name); for (DeploymentAspect aspect : aspects) - builder.append("\n " + aspect.getClass().getName()); - - log.debug(builder); + builder.append("\n " + aspect.getClass().getName() + " provides: " + aspect.getProvidesAsSet() + " requires: " + aspect.getRequiresAsSet()); + + log.debug(builder); } /** @@ -105,14 +105,14 @@ // Check that all required aspects are met /* - TODO: This should done by adding all provided conditions to the Deployment - when being executed. Otherwise we will miss the parent provided conditions here - - Set<String> requiredSet = aspect.getRequiresAsSet(); - requiredSet.remove(DeploymentAspect.LAST_DEPLOYMENT_ASPECT); - if (providedConditions.containsAll(requiredSet) == false) - throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect); - */ + TODO: This should done by adding all provided conditions to the Deployment + when being executed. Otherwise we will miss the parent provided conditions here + + Set<String> requiredSet = aspect.getRequiresAsSet(); + requiredSet.remove(DeploymentAspect.LAST_DEPLOYMENT_ASPECT); + if (providedConditions.containsAll(requiredSet) == false) + throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect); + */ logInvocation(aspect, "Create"); aspect.create(dep);

16 years, 2 months

1
0
0 / 0

JBossWS SVN: r5815 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-26 13:14:52 -0500 (Tue, 26 Feb 2008) New Revision: 5815 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java Log: Improve installer logging Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2008-02-26 17:17:06 UTC (rev 5814) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2008-02-26 18:14:52 UTC (rev 5815) @@ -129,10 +129,6 @@ if (allAspects.size() != 0) throwSortException(sortedAspects, allAspects); - - // Log the sorted aspects - for (DeploymentAspect aspect : sortedAspects) - log.debug(manager.getName() + ": " + aspect); } manager.setDeploymentAspects(sortedAspects); }

16 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2008