[jbossws-commits] JBossWS SVN: r5817 - in stack: metro/trunk and 10 other directories.

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"/> - + <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.2 --> + <!-- Deployment JBoss422 --> <!-- ================================================================== --> - - <!-- Deploy to jboss422 --> - <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> - - <!-- Remove from jboss422 --> - <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> - + <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.3 --> + <!-- Deployment JBoss423 --> <!-- ================================================================== --> - - <!-- Deploy to jboss423 --> - <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> - - <!-- Remove from jboss423 --> - <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> - + <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.0 --> + <!-- Deployment JBoss500 --> <!-- ================================================================== --> - - <!-- Deploy to jboss500 --> - <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> - - <!-- Remove from jboss500 --> - <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> - + <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.1 --> + <!-- Deployment JBoss501 --> <!-- ================================================================== --> - - <!-- Deploy to jboss501 --> - <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> - - <!-- Remove from jboss501 --> - <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> + <!-- + These patterns should be common for all supported containers + Exceptions must be defined in the individual deploy macros. + --> + <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> + <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.2 --> + <!-- Deploy Framework --> <!-- ================================================================== --> - <!-- Deploy jbossws/cxf to jboss422 --> - <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}"/> + <!-- BIN SCRIPTS --> + <unzip dest="${cxf.output.deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <chmod dir="${cxf.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> - <!-- CLIENT JARS --> - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <!-- CLIENT JARS--> + <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> - <!-- BOOTSTRAP JARS --> - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <!-- SERVER LIB JARS--> + <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> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws"> + <attribute name="jbosshome"/> + <attribute name="sarname"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> - <!--SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + <!-- Deploy the sars --> + <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <unjar dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; src="@{stacklibs}/@{sarname}"/> + <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; + <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss422.home}" overwrite="true"> + <!-- Deploy the jars --> + <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> + <!-- Write jbossws.deployed.files --> <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${cxf.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + </sequential> </macrodef> - <!-- Undeploy jbossws/cxf from jboss422 --> - <macrodef name="macro-undeploy-cxf422"> + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files&quot; failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; <delete> - <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/> + <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/> </delete> </sequential> </macrodef> <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.3 --> + <!-- Deployment JBoss-4.2.x --> <!-- ================================================================== --> - <!-- Deploy jbossws/cxf to jboss423 --> - <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}"/> - <!-- CLIENT JARS --> <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> - <!-- BOOTSTRAP JARS --> + <!-- LIB JARS --> <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> - <!--SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> - <!-- Undeploy jbossws/cxf from jboss423 --> + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.2 --> + <!-- ================================================================== --> + + <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> + + <!-- Remove jbossws/cxf from jboss422 --> + <macrodef name="macro-undeploy-cxf422"> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws jbosshome="${jboss422.home}"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.3 --> + <!-- ================================================================== --> + + <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> + + <!-- Remove jbossws/cxf from jboss423 --> <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> <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.0 --> + <!-- Deployment JBoss-5.0.x --> <!-- ================================================================== --> - <!-- Deploy jbossws/cxf to jboss500 --> - <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}"/> - <!-- CLIENT JARS --> <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> - <!-- BOOTSTRAP JARS --> + <!-- LIB JARS --> <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> - <!--SERVER JARS --> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"/> + <!-- SERVER JARS --> <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=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> - <!-- Undeploy jbossws/cxf from jboss500 --> + <!-- ================================================================== --> + <!-- Deployment JBoss-5.0.0 --> + <!-- ================================================================== --> + + <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> + + <!-- Remove jbossws/cxf from jboss500 --> <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> <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.1 --> + <!-- Deployment JBoss-5.0.1 --> <!-- ================================================================== --> - <!-- Deploy jbossws/cxf to jboss501 --> <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}"/> - - <!-- CLIENT JARS --> - <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> - - <!-- BOOTSTRAP JARS --> - <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> - - <!--SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> - <!-- Undeploy jbossws/cxf from jboss501 --> + <!-- Remove jbossws/cxf from jboss501 --> <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> - -<project> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - - <!-- BIN SCRIPTS --> - <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS--> - <copy todir="@{jbosshome}/client"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - - <!-- SERVER JARS--> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <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> - <!-- BIN SCRIPTS --> - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - - <!-- CLIENT JARS--> - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - - <!-- SERVER JARS--> - <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <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"/> <!-- ================================================================== --> <!-- Deployment JBoss422 --> <!-- ================================================================== --> - <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> <!-- ================================================================== --> <!-- Deployment JBoss423 --> <!-- ================================================================== --> - <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> - -<project> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - - <!-- BIN SCRIPTS --> - <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS--> - <copy todir="@{jbosshome}/client"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - - <!-- SERVER JARS--> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <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> - <!-- BIN SCRIPTS --> - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - - <!-- CLIENT JARS--> - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - - <!-- SERVER JARS--> - <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <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 @@ <!-- $Id$ --> <project> - - <!-- - TODO: This assumes that the same set of files is deployed to all containers, - in which case it would be suffient to have a single deploy/undeploy macro def. - --> - <patternset id="client.stack.patternset"> - <include name="jbossws-metro-client.jar"/> - </patternset> - + <!-- + These patterns should be common for all supported containers + Exceptions must be defined in the individual deploy macros. + --> <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> - + <!-- ================================================================== --> - <!-- Deployment JBoss422 --> + <!-- Deploy Framework --> <!-- ================================================================== --> - - <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}"/> + <!-- BIN SCRIPTS --> + <unzip dest="${metro.output.deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <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> + <!-- CLIENT JARS--> + <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"> + <!-- SERVER LIB JARS--> + <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> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <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=&quot;(a){stacklibs}/jbossws-metro42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + <!-- Deploy the sars --> + <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <unjar dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; src="@{stacklibs}/@{sarname}"/> + <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; + <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deploy.files.txt"/> - <copy todir="${jboss422.home}" overwrite="true"> + <!-- Deploy the jars --> + <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> + <!-- Write jbossws.deployed.files --> <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${metro.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + </sequential> </macrodef> - - <!-- Remove jbossws/metro from jboss422 --> - <macrodef name="macro-undeploy-metro422"> + + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files&quot; 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=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; <delete> - <fileset dir="${jboss422.home}" includes="${jbossws.undeploy.files}"/> + <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/> </delete> </sequential> </macrodef> - + <!-- ================================================================== --> - <!-- Deployment JBoss423 --> + <!-- Deployment JBoss-4.2.x --> <!-- ================================================================== --> - - <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}"/> - + <!-- CLIENT JARS --> <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> + <!-- LIB JARS --> <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=&quot;(a){stacklibs}/jbossws-metro42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> - + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.2 --> + <!-- ================================================================== --> + + <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> + + <!-- Remove jbossws/metro from jboss422 --> + <macrodef name="macro-undeploy-metro422"> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws jbosshome="${jboss422.home}"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.3 --> + <!-- ================================================================== --> + + <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> + <!-- Remove jbossws/metro from jboss423 --> <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> - + <!-- ================================================================== --> - <!-- Deployment JBoss500 --> + <!-- Deployment JBoss-5.0.x --> <!-- ================================================================== --> - - <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}"/> <!-- CLIENT JARS --> <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> - - <!-- BOOTSTRAP JARS --> + + <!-- LIB JARS --> <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> - - <!--SERVER JARS --> - <mkdir dir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"/> + + <!-- SERVER JARS --> <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=&quot;(a){stacklibs}/jbossws-metro50.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - <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> - + + <!-- ================================================================== --> + <!-- Deployment JBoss-5.0.0 --> + <!-- ================================================================== --> + + <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> + <!-- Remove jbossws/metro from jboss500 --> <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> - + <!-- ================================================================== --> - <!-- Deployment JBoss501 --> + <!-- Deployment JBoss-5.0.1 --> <!-- ================================================================== --> - + <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}"/> - - <!-- CLIENT JARS --> - <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> - - <!-- BOOTSTRAP JARS --> - <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> - - <!--SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-metro50.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> - + <!-- Remove jbossws/metro from jboss501 --> <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 @@ <!-- | Build all jar files. --> - <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"> - - <!-- override the property, it's the same build operations --> - <property name="jboss422.home" value="${jboss423.home}"/> - <antcall target="jars-jboss422"/> - </target> - <!-- Generate the JavaDoc --> <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 @@ <!-- Deploy jbossws to jboss421 --> <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> <!-- Remove jbossws from jboss421 --> - <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> <!-- Deploy jbossws to jboss422 --> <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> <!-- Remove jbossws from jboss422 --> - <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> <!-- Deploy jbossws to jboss423 --> <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> <!-- Remove jbossws from jboss423 --> - <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> <!-- Deploy jbossws to jboss500 --> <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> <!-- Remove jbossws from jboss500 --> - <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> - <!-- ================================================================== --> <!-- Deployment JBoss501 --> <!-- ================================================================== --> <!-- Deploy jbossws to jboss501 --> <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 @@ <!-- Remove jbossws from jboss501 --> <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> - -<project> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - - <!-- BIN SCRIPTS --> - <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS--> - <copy todir="@{jbosshome}/client"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - - <!-- SERVER JARS--> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <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> - <!-- BIN SCRIPTS --> - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - - <!-- CLIENT JARS--> - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - - <!-- SERVER JARS--> - <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <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> + <!-- + These patterns should be common for all supported containers + Exceptions must be defined in the individual deploy macros. + --> + <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> + <!-- ================================================================== --> <!-- Deploy Endorsed --> <!-- ================================================================== --> <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 --> <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> - <!-- Undeploy API jars from lib/endorsed --> - <macrodef name="macro-undeploy-endorsed"> + <!-- ================================================================== --> + <!-- Deploy Framework --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS--> + <copy todir="${core.output.deploy.dir}/client"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + </fileset> + </copy> + + <!-- SERVER LIB JARS--> + <copy todir="${core.output.deploy.dir}/server/${jboss.server.instance}/lib"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws"> <attribute name="jbosshome"/> + <attribute name="sarname"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> <sequential> + + <!-- Deploy the sars --> + <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <unjar dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; src="@{stacklibs}/@{sarname}"/> + <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; + <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + + <!-- Deploy the jars --> + <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> + + <!-- Write jbossws.deployed.files --> + <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=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${core.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="jbosshome"/> + <sequential> + + <delete dir="${core.output.deploy.dir}"/> + + <loadfile property="jbossws.undeploy.files" srcfile=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files&quot; failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${core.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; <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}"/> - <!-- BIN SCRIPTS --> <mkdir dir="${core.output.deploy.dir}/bin"/> <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; @@ -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> - <!-- SERVER JARS --> + <!-- SERVER LIB JARS --> <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=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + <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> <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.2 --> + <!-- Deployment JBoss-4.2.x --> <!-- ================================================================== --> - <macrodef name="macro-deploy-native422"> + <macrodef name="macro-deploy-native42x"> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> - <delete dir="${core.output.deploy.dir}"/> - <!-- BIN SCRIPTS --> <mkdir dir="${core.output.deploy.dir}/bin"/> <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; @@ -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> - <!-- SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.2 --> + <!-- ================================================================== --> + + <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}"/> - - <!-- BIN SCRIPTS --> - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS --> - <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> - - <!-- SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.0 --> + <!-- Deployment JBoss-5.0.x --> <!-- ================================================================== --> - <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}"/> - <!-- BIN SCRIPTS --> <mkdir dir="${core.output.deploy.dir}/bin"/> <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; @@ -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> <!-- SERVER JARS --> <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=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> + <!-- ================================================================== --> + <!-- Deployment JBoss-5.0.0 --> + <!-- ================================================================== --> + + <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 @@ <!-- Deployment JBoss-5.0.1 --> <!-- ================================================================== --> - <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}"/> - - <!-- BIN SCRIPTS --> - <mkdir dir="${core.output.deploy.dir}/bin"/> - <unzip dest="${core.output.deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - <chmod dir="${core.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS --> - <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> - - <!-- LIB JARS --> - <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> - - <!-- SERVER JARS --> - <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=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; - <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=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <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> + <!-- jaxws-epr --> + <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> + <!-- jaxws-handlerlifecycle --> <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 @@ <!-- Generating sources --> <!-- ================================================================== --> - <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> + <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts"> <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> 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 @@ <!-- Compile etc files (manifests and such) --> <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