February 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5694 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 06:19:56 -0500 (Fri, 15 Feb 2008) New Revision: 5694 Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix undeploy-jboss501 in dist Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-15 11:12:01 UTC (rev 5693) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-15 11:19:56 UTC (rev 5694) @@ -96,10 +96,7 @@ </target> <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> - <macro-undeploy-cxf501/> - <macro-undeploy-sunri501/> <macro-undeploy-native501/> - <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5693 - in stack/metro/trunk: ant-import and 18 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 06:12:01 -0500 (Fri, 15 Feb 2008) New Revision: 5693 Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXRPC.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/JBossResourceInjector.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl stack/metro/trunk/src/main/resources/jbossws-metro-config.xml stack/metro/trunk/src/main/resources/jbossws-metro.jar/ stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/ stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/ stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory Removed: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/ stack/metro/trunk/src/main/resources/jbossws-sunri-client.jar/ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml stack/metro/trunk/src/main/resources/jbossws-sunri.jar/ Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/ant-import/build-release.xml stack/metro/trunk/ant-import/build-testsuite.xml stack/metro/trunk/ant-import/macros-deploy-metro.xml stack/metro/trunk/build.xml stack/metro/trunk/src/main/distro/bin-dist-build.xml stack/metro/trunk/src/main/etc/bin-dist-build.xml stack/metro/trunk/src/main/etc/component-info50.xml stack/metro/trunk/version.properties Log: [JBWS-1994] refactoring Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -98,10 +98,10 @@ </fileset> <fileset dir="${metro.dir}/output/lib"> <include name="jbossws-context.war"/> - <include name="jbossws-sunri.jar"/> - <include name="jbossws-sunri-client.jar"/> - <include name="jbossws-sunri42.sar"/> - <include name="jbossws-sunri50.sar"/> + <include name="jbossws-metro.jar"/> + <include name="jbossws-metro-client.jar"/> + <include name="jbossws-metro42.sar"/> + <include name="jbossws-metro50.sar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="FastInfoset.jar"/> Modified: stack/metro/trunk/ant-import/build-release.xml =================================================================== --- stack/metro/trunk/ant-import/build-release.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/ant-import/build-release.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -16,16 +16,16 @@  <target name="release" depends="jars" description="Release to jboss.local.repository"> -  +  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib" overwrite="true"> + <mkdir dir="${jboss.repository.dir}/jbossws-metro50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-metro50/${repository.id}/lib" overwrite="true"> <fileset dir="${int.metro.dir}/output/lib"> - <include name="jbossws-sunri50.sar"/> - <include name="jbossws-sunri50-deployer.zip"/> + <include name="jbossws-metro50.sar"/> + <include name="jbossws-metro50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/component-info.xml" file="${metro.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-metro50/${repository.id}/component-info.xml" file="${metro.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: stack/metro/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import/build-testsuite.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/ant-import/build-testsuite.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -46,7 +46,7 @@ </path> <path id="tests.extra.classpath"> - <pathelement location="${int.metro.dir}/output/lib/jbossws-sunri-client.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/> <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/> </path> Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -14,7 +14,7 @@ <project> <patternset id="client.stack.patternset"> - <include name="jbossws-sunri-client.jar"/> + <include name="jbossws-metro-client.jar"/> </patternset> <patternset id="client.patternset"> @@ -64,8 +64,8 @@ <patternset refid="lib.patternset"/> </fileset> </copy> - <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro42.sar"/> <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> </sequential> @@ -87,7 +87,7 @@ </fileset> </delete> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> @@ -114,8 +114,8 @@ <patternset refid="lib.patternset"/> </fileset> </copy> - <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro42.sar"/> <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> </sequential> @@ -137,7 +137,7 @@ </fileset> </delete> - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> @@ -176,8 +176,8 @@ </fileset> </copy> - <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro50.sar"/> <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> </sequential> @@ -204,7 +204,7 @@ </fileset> </delete> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> @@ -243,8 +243,8 @@ </fileset> </copy> - <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> + <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> + <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar" src="@{stacklibs}/jbossws-metro50.sar"/> <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> </sequential> @@ -271,7 +271,7 @@ </fileset> </delete> - <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-metro.sar"/> <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -56,7 +56,7 @@ </path> <path id="tests.extra.classpath"> - <pathelement location="${int.metro.dir}/output/lib/jbossws-sunri-client.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/> <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/> </path> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/build.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS-SunRI"> +<project default="main" basedir="." name="JBossWS-Metro"> <property name="int.metro.dir" value="${basedir}"/> @@ -64,12 +64,12 @@ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="compile-classes" depends="compile-classes-sunri"/> - <target name="compile-classes-sunri" depends="init"> + <target name="compile-classes" depends="compile-classes-metro"/> + <target name="compile-classes-metro" depends="init"> <mkdir dir="${metro.output.classes.dir}"/> <javac srcdir="${metro.java.dir}" sourcepath="" destdir="${metro.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsf/stack/sunri/**"/> + <include name="org/jboss/wsf/stack/metro/**"/> <classpath refid="metro.integration.classpath"/> </javac> </target> @@ -104,27 +104,26 @@ <target name="jars-common" depends="build.metro,compile"> -  +  <mkdir dir="${metro.output.lib.dir}"/> - <jar jarfile="${metro.output.lib.dir}/jbossws-sunri.jar" manifest="${metro.output.etc.dir}/default.mf"> + <jar jarfile="${metro.output.lib.dir}/jbossws-metro.jar" manifest="${metro.output.etc.dir}/default.mf"> <fileset dir="${metro.output.classes.dir}"> - <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> - <include name="org/jboss/wsf/stack/sunri/injection/**"/> - <include name="org/jboss/wsf/stack/sunri/client/**"/> - <include name="org/jboss/wsf/stack/sunri/metadata/**"/> - <include name="org/jboss/wsf/stack/sunri/log/**"/> - <include name="org/jboss/wsf/stack/sunri/*"/> + <include name="org/jboss/wsf/stack/metro/injection/**"/> + <include name="org/jboss/wsf/stack/metro/client/**"/> + <include name="org/jboss/wsf/stack/metro/metadata/**"/> + <include name="org/jboss/wsf/stack/metro/log/**"/> + <include name="org/jboss/wsf/stack/metro/*"/> </fileset> - <metainf dir="${metro.resources.dir}/jbossws-sunri.jar/META-INF"/> + <metainf dir="${metro.resources.dir}/jbossws-metro.jar/META-INF"/> </jar> -  - <jar jarfile="${metro.output.lib.dir}/jbossws-sunri-client.jar" manifest="${metro.output.etc.dir}/default.mf"> +  + <jar jarfile="${metro.output.lib.dir}/jbossws-metro-client.jar" manifest="${metro.output.etc.dir}/default.mf"> <fileset dir="${metro.output.classes.dir}"> - <include name="org/jboss/wsf/stack/sunri/client/**"/> - <include name="org/jboss/wsf/stack/sunri/tools/**"/> + <include name="org/jboss/wsf/stack/metro/client/**"/> + <include name="org/jboss/wsf/stack/metro/tools/**"/> </fileset> - <metainf dir="${metro.resources.dir}/jbossws-sunri-client.jar/META-INF"/> + <metainf dir="${metro.resources.dir}/jbossws-metro-client.jar/META-INF"/> </jar>  @@ -141,8 +140,8 @@ </filterset> </copy> -  - <zip zipfile="${metro.output.lib.dir}/jbossws-sunri-src.zip" > +  + <zip zipfile="${metro.output.lib.dir}/jbossws-metro-src.zip" > <fileset dir="${metro.java.dir}"/> </zip> </target> @@ -150,18 +149,18 @@ <target name="jars-jboss50" depends="jars-common">  - <concat destfile="${metro.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> + <concat destfile="${metro.output.lib.dir}/jbossws-metro50/jbossws-beans.xml"> <header trimleading="yes"> <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> - <fileset file="${metro.resources.dir}/jbossws-sunri-config.xml"/> + <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> <footer trimleading="yes"> </deployment> </footer> </concat> -  - <jar jarfile="${metro.output.lib.dir}/jbossws-sunri50.sar" manifest="${metro.output.etc.dir}/default.mf"> +  + <jar jarfile="${metro.output.lib.dir}/jbossws-metro50.sar" manifest="${metro.output.etc.dir}/default.mf"> <fileset dir="${metro.output.lib.dir}"> <include name="jbossws-context.war/**"/> @@ -193,9 +192,9 @@ </fileset> <fileset dir="${metro.output.lib.dir}"> - <include name="jbossws-sunri.jar"/> + <include name="jbossws-metro.jar"/> </fileset> - <metainf dir="${metro.output.lib.dir}/jbossws-sunri50"> + <metainf dir="${metro.output.lib.dir}/jbossws-metro50"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -206,25 +205,25 @@ <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>  - <concat destfile="${metro.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml"> + <concat destfile="${metro.output.lib.dir}/jbossws-metro42/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> </header> - <fileset file="${metro.resources.dir}/jbossws-sunri-config.xml"/> + <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> <fileset file="${metro.output.dir}/resources/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> </concat> -  - <jar jarfile="${metro.output.lib.dir}/jbossws-sunri42.sar" manifest="${metro.output.etc.dir}/default.mf"> +  + <jar jarfile="${metro.output.lib.dir}/jbossws-metro42.sar" manifest="${metro.output.etc.dir}/default.mf"> <fileset dir="${metro.output.lib.dir}"> <include name="jbossws-context.war/**"/> <include name="jbossws-context.war"/> </fileset> <fileset dir="${metro.output.lib.dir}"> - <include name="jbossws-sunri.jar"/> + <include name="jbossws-metro.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="FastInfoset.jar"/> @@ -254,7 +253,7 @@ </fileset> - <fileset dir="${metro.output.lib.dir}/jbossws-sunri42"> + <fileset dir="${metro.output.lib.dir}/jbossws-metro42"> <include name="jbossws.beans/**"/> </fileset> <metainf dir="${metro.output.dir}/resources/jbossws-jboss42.sar/META-INF"> @@ -273,7 +272,7 @@  <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> -  +  <mkdir dir="${metro.output.dir}/thirdparty-sources"/> <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${metro.output.dir}/thirdparty-sources"/> Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS-sunri"> +<project default="main" basedir="." name="JBossWS-Metro">   @@ -138,7 +138,7 @@ </path> <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/> + <pathelement location="${lib.dir}/jbossws-metro-client.jar"/> <pathelement location="${lib.dir}/jbossws-framework.jar"/> <pathelement location="${lib.dir}/jaxws-tools.jar"/> </path> Modified: stack/metro/trunk/src/main/etc/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS-SunRI"> +<project default="main" basedir="." name="JBossWS-Metro">   @@ -119,7 +119,7 @@ </path> <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/> + <pathelement location="${lib.dir}/jbossws-metro-client.jar"/> </path> </target> Modified: stack/metro/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/metro/trunk/src/main/etc/component-info50.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/src/main/etc/component-info50.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -1,12 +1,12 @@ -<project name="jboss/jbossws-sunri50"> +<project name="jboss/jbossws-metro50"> - <component id="jboss/jbossws-sunri50" + <component id="jboss/jbossws-metro50" description="JBossWS an implementation of J2EE Web Services" version="@repository.id@" licenseType="lgpl"> - <artifact id="jbossws-sunri50.sar"/> - <artifact id="jbossws-sunri50-deployer.zip"/> + <artifact id="jbossws-metro50.sar"/> + <artifact id="jbossws-metro50-deployer.zip"/> <import componentref="jboss/microcontainer"> <compatible version="@jboss-microcontainer@"/> Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,633 @@ +/* + * 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.wsf.stack.metro; + +// $Id$ + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.http.HTTPBinding; +import javax.xml.ws.soap.MTOMFeature; +import javax.xml.ws.soap.SOAPBinding; + +import org.xml.sax.EntityResolver; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.BindingID; +import com.sun.xml.ws.api.WSBinding; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.SDDocumentSource; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.streaming.XMLStreamReaderFactory; +import com.sun.xml.ws.binding.WebServiceFeatureList; +import com.sun.xml.ws.handler.HandlerChainsModel; +import com.sun.xml.ws.resources.ServerMessages; +import com.sun.xml.ws.resources.WsservletMessages; +import com.sun.xml.ws.server.EndpointFactory; +import com.sun.xml.ws.server.ServerRtException; +import com.sun.xml.ws.streaming.Attributes; +import com.sun.xml.ws.streaming.TidyXMLStreamReader; +import com.sun.xml.ws.streaming.XMLStreamReaderUtil; +import com.sun.xml.ws.transport.http.HttpAdapter; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; +import com.sun.xml.ws.util.HandlerAnnotationInfo; +import com.sun.xml.ws.util.exception.LocatableWebServiceException; +import com.sun.xml.ws.util.xml.XmlUtil; + +/** + * A copy of DeploymentDescriptorParser + * + * + * @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener + * + * @author WS Development Team + * @author Kohsuke Kawaguchi + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DeploymentDescriptorParserExt<A> +{ + private final Container container; + private final ClassLoader classLoader; + private final ResourceLoader loader; + private final AdapterFactory<A> adapterFactory; + + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class); + + /** + * Endpoint names that are declared. + * Used to catch double definitions. + */ + private final Set<String> names = new HashSet<String>(); + + /** + * WSDL/schema documents collected from /WEB-INF/wsdl. Keyed by the system ID. + */ + private final Map<String, SDDocumentSource> docs = new HashMap<String, SDDocumentSource>(); + + /** + * + * @param cl + * Used to load service implementations. + * @param loader + * Used to locate resources, in particular WSDL. + * @param container + * Optional {@link Container} that {@link WSEndpoint}s receive. + * @param adapterFactory + * Creates {@link HttpAdapter} (or its derived class.) + */ + public DeploymentDescriptorParserExt(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException + { + classLoader = cl; + this.loader = loader; + this.container = container; + this.adapterFactory = adapterFactory; + + // toggle EJB and WEB deployments + String resourcePath = "/META-INF/"; + try + { + URL resource = loader.getResource(resourcePath); + InputStream inputStream = null; + try + { + inputStream = resource.openStream(); + } + finally + { + if(inputStream!=null) + inputStream.close(); + } + + log.warn("bypass collectDocs(), it doesnt work for EJB endpoints"); + } + catch (Exception e) + { + resourcePath = "/WEB-INF/"; + log.debug("Collecting docs from " + resourcePath); + + collectDocs(resourcePath+"wsdl/"); + logger.fine("metadata=" + docs); + } + + } + + /** + * Parses the {@code sun-jaxws.xml} file and configures + * a set of {@link HttpAdapter}s. + */ + public @NotNull + List<A> parse(String systemId, InputStream is) + { + XMLStreamReader reader = null; + try + { + reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(systemId, is, true), is); + XMLStreamReaderUtil.nextElementContent(reader); + return parseAdapters(reader); + } + finally + { + if (reader != null) + { + try + { + reader.close(); + } + catch (XMLStreamException e) + { + throw new ServerRtException("runtime.parser.xmlReader", e); + } + } + try + { + is.close(); + } + catch (IOException e) + { + // ignore + } + } + } + + /** + * Parses the {@code sun-jaxws.xml} file and configures + * a set of {@link HttpAdapter}s. + */ + public @NotNull + List<A> parse(File f) throws IOException + { + FileInputStream in = new FileInputStream(f); + try + { + return parse(f.getPath(), in); + } + finally + { + in.close(); + } + } + + /** + * Get all the WSDL & schema documents recursively. + */ + private void collectDocs(String dirPath) throws MalformedURLException + { + Set<String> paths = loader.getResourcePaths(dirPath); + if (paths != null) + { + for (String path : paths) + { + if (path.endsWith("/")) + { + collectDocs(path); + } + else + { + URL res = loader.getResource(path); + docs.put(res.toString(), SDDocumentSource.create(res)); + } + } + } + } + + private List<A> parseAdapters(XMLStreamReader reader) + { + if (!reader.getName().equals(QNAME_ENDPOINTS)) + { + failWithFullName("runtime.parser.invalidElement", reader); + } + + List<A> adapters = new ArrayList<A>(); + + Attributes attrs = XMLStreamReaderUtil.getAttributes(reader); + String version = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_VERSION); + if (!version.equals(ATTRVALUE_VERSION_1_0)) + { + failWithLocalName("runtime.parser.invalidVersionNumber", reader, version); + } + + while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT) + if (reader.getName().equals(QNAME_ENDPOINT)) + { + + attrs = XMLStreamReaderUtil.getAttributes(reader); + String name = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_NAME); + if (!names.add(name)) + { + logger.warning(WsservletMessages.SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME(/*name*/)); + } + + String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION); + Class<?> implementorClass = getImplementorClass(implementationName, reader); + EndpointFactory.verifyImplementorClass(implementorClass); + + SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass); + + QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE); + if (serviceName == null) + serviceName = EndpointFactory.getDefaultServiceName(implementorClass); + + QName portName = getQNameAttribute(attrs, ATTR_PORT); + if (portName == null) + portName = EndpointFactory.getDefaultPortName(serviceName, implementorClass); + + //get enable-mtom attribute value + String enable_mtom = getAttribute(attrs, ATTR_ENABLE_MTOM); + String mtomThreshold = getAttribute(attrs, ATTR_MTOM_THRESHOLD_VALUE); + String bindingId = getAttribute(attrs, ATTR_BINDING); + if (bindingId != null) + // Convert short-form tokens to API's binding ids + bindingId = getBindingIdForToken(bindingId); + WSBinding binding = createBinding(bindingId, implementorClass, enable_mtom, mtomThreshold); + String urlPattern = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_URL_PATTERN); + + // TODO use 'docs' as the metadata. If wsdl is non-null it's the primary. + + boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName); + + ensureNoContent(reader); + Invoker invoker = createInvoker(implementorClass); + WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker, + serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false); + adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint)); + } + else + { + failWithLocalName("runtime.parser.invalidElement", reader); + } + return adapters; + } + + protected Invoker createInvoker(Class<?> implementorClass) + { + Invoker invoker = InstanceResolver.createDefault(implementorClass).createInvoker(); + return invoker; + } + + /** + * @param ddBindingId + * binding id explicitlyspecified in the DeploymentDescriptor or parameter + * @param implClass + * Endpoint Implementation class + * @param mtomEnabled + * represents mtom-enabled attribute in DD + * @param mtomThreshold + * threshold value specified in DD + * @return + * is returned with only MTOMFeature set resolving the various precendece rules + */ + private static WSBinding createBinding(String ddBindingId, Class implClass, String mtomEnabled, String mtomThreshold) + { + // Features specified through DD + WebServiceFeatureList features; + + MTOMFeature mtomfeature = null; + if (mtomEnabled != null) + { + if (mtomThreshold != null) + mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled), Integer.valueOf(mtomThreshold)); + else mtomfeature = new MTOMFeature(Boolean.valueOf(mtomEnabled)); + } + + BindingID bindingID; + if (ddBindingId != null) + { + bindingID = BindingID.parse(ddBindingId); + features = bindingID.createBuiltinFeatureList(); + + if (checkMtomConflict(features.get(MTOMFeature.class), mtomfeature)) + { + throw new ServerRtException(ServerMessages.DD_MTOM_CONFLICT(ddBindingId, mtomEnabled)); + } + } + else + { + bindingID = BindingID.parse(implClass); + // Since bindingID is coming from implclass, + // mtom through Feature annotation or DD takes precendece + + features = new WebServiceFeatureList(); + if (mtomfeature != null) + features.add(mtomfeature); // this wins over MTOM setting in bindingID + features.addAll(bindingID.createBuiltinFeatureList()); + } + + return bindingID.createBinding(features.toArray()); + } + + private static boolean checkMtomConflict(MTOMFeature lhs, MTOMFeature rhs) + { + if (lhs == null || rhs == null) + return false; + return lhs.isEnabled() ^ rhs.isEnabled(); + } + + /** + * JSR-109 defines short-form tokens for standard binding Ids. These are + * used only in DD. So stand alone deployment descirptor should also honor + * these tokens. This method converts the tokens to API's standard + * binding ids + * + * @param lexical binding attribute value from DD. Always not null + * + * @return returns corresponding API's binding ID or the same lexical + */ + public static @NotNull + String getBindingIdForToken(@NotNull + String lexical) + { + if (lexical.equals("##SOAP11_HTTP")) + { + return SOAPBinding.SOAP11HTTP_BINDING; + } + else if (lexical.equals("##SOAP11_HTTP_MTOM")) + { + return SOAPBinding.SOAP11HTTP_MTOM_BINDING; + } + else if (lexical.equals("##SOAP12_HTTP")) + { + return SOAPBinding.SOAP12HTTP_BINDING; + } + else if (lexical.equals("##SOAP12_HTTP_MTOM")) + { + return SOAPBinding.SOAP12HTTP_MTOM_BINDING; + } + else if (lexical.equals("##XML_HTTP")) + { + return HTTPBinding.HTTP_BINDING; + } + return lexical; + } + + /** + * Checks the deployment descriptor or {@link @WebServiceProvider} annotation + * to see if it points to any WSDL. If so, returns the {@link SDDocumentSource}. + * + * @return + * The pointed WSDL, if any. Otherwise null. + */ + private SDDocumentSource getPrimaryWSDL(XMLStreamReader xsr, Attributes attrs, Class<?> implementorClass) + { + + String wsdlFile = getAttribute(attrs, ATTR_WSDL); + if (wsdlFile == null) + { + wsdlFile = EndpointFactory.getWsdlLocation(implementorClass); + } + + if (wsdlFile != null) + { + /*if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR)) + { + logger.warning("Ignoring wrong wsdl=" + wsdlFile + ". It should start with " + JAXWS_WSDL_DD_DIR + ". Going to generate and publish a new WSDL."); + return null; + }*/ + + URL wsdl; + try + { + wsdl = loader.getResource(wsdlFile); + } + catch (MalformedURLException e) + { + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), e, xsr); + } + if (wsdl == null) + { + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr); + } + + // bypass the docs init + docs.put(wsdl.toExternalForm(), SDDocumentSource.create(wsdl)); + + SDDocumentSource docInfo = docs.get(wsdl.toExternalForm()); + assert docInfo != null; + return docInfo; + } + + return null; + } + + /** + * Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}. + */ + private EntityResolver createEntityResolver() + { + try + { + return XmlUtil.createEntityResolver(loader.getCatalogFile()); + } + catch (MalformedURLException e) + { + throw new WebServiceException(e); + } + } + + protected String getAttribute(Attributes attrs, String name) + { + String value = attrs.getValue(name); + if (value != null) + { + value = value.trim(); + } + return value; + } + + protected QName getQNameAttribute(Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value == null || value.equals("")) + { + return null; + } + else + { + return QName.valueOf(value); + } + } + + protected String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value != null && value.equals("")) + { + failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); + } + return value; + } + + protected String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name) + { + String value = getAttribute(attrs, name); + if (value == null) + { + failWithLocalName("runtime.parser.missing.attribute", reader, name); + } + return value; + } + + protected String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name) + { + String value = getAttribute(attributes, name); + if (value == null) + { + failWithLocalName("runtime.parser.missing.attribute", reader, name); + } + else if (value.equals("")) + { + failWithLocalName("runtime.parser.invalidAttributeValue", reader, name); + } + return value; + } + + /** + * Parses the handler and role information and sets it + * on the {@link WSBinding}. + * @return true if <handler-chains> element present in DD + * false otherwise. + */ + protected boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName) + { + + if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS)) + { + + return false; + } + + HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding); + + binding.setHandlerChain(handlerInfo.getHandlers()); + if (binding instanceof SOAPBinding) + { + ((SOAPBinding)binding).setRoles(handlerInfo.getRoles()); + } + + // move past </handler-chains> + XMLStreamReaderUtil.nextContent(reader); + return true; + } + + protected static void ensureNoContent(XMLStreamReader reader) + { + if (reader.getEventType() != XMLStreamConstants.END_ELEMENT) + { + fail("runtime.parser.unexpectedContent", reader); + } + } + + protected static void fail(String key, XMLStreamReader reader) + { + logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber()); + throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber())); + } + + protected static void failWithFullName(String key, XMLStreamReader reader) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName()); + } + + protected static void failWithLocalName(String key, XMLStreamReader reader) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName()); + } + + protected static void failWithLocalName(String key, XMLStreamReader reader, String arg) + { + throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg); + } + + protected Class loadClass(String name) + { + try + { + return Class.forName(name, true, classLoader); + } + catch (ClassNotFoundException e) + { + logger.log(Level.SEVERE, e.getMessage(), e); + throw new ServerRtException("runtime.parser.classNotFound", name); + } + } + + /** + * Loads the class of the given name. + * + * @param xsr + * Used to report the source location information if there's any error. + */ + private Class getImplementorClass(String name, XMLStreamReader xsr) + { + try + { + return Class.forName(name, true, classLoader); + } + catch (ClassNotFoundException e) + { + logger.log(Level.SEVERE, e.getMessage(), e); + throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, xsr); + } + } + + public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime"; + + public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl"; + + public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints"); + public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint"); + + public static final String ATTR_VERSION = "version"; + public static final String ATTR_NAME = "name"; + public static final String ATTR_IMPLEMENTATION = "implementation"; + public static final String ATTR_WSDL = "wsdl"; + public static final String ATTR_SERVICE = "service"; + public static final String ATTR_PORT = "port"; + public static final String ATTR_URL_PATTERN = "url-pattern"; + public static final String ATTR_ENABLE_MTOM = "enable-mtom"; + public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value"; + public static final String ATTR_BINDING = "binding"; + + public static final String ATTRVALUE_VERSION_1_0 = "2.0"; + private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http"); +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,67 @@ +/* + * 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.wsf.stack.metro; + +// $Id$ + +import java.net.MalformedURLException; + +import javax.ejb.Stateless; + +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser.AdapterFactory; + +/** + * A copy of DeploymentDescriptorParser that externalizes + * + * createInvoker(Class) + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DeploymentDescriptorParserJBWS<A> extends DeploymentDescriptorParserExt<A> +{ + public DeploymentDescriptorParserJBWS(ClassLoader cl, ResourceLoader loader, Container container, AdapterFactory<A> adapterFactory) throws MalformedURLException + { + super(cl, loader, container, adapterFactory); + } + + @Override + protected Invoker createInvoker(Class<?> implClass) + { + Invoker invoker; + InstanceResolver<?> resolver = InstanceResolver.createDefault(implClass); + if (implClass.isAnnotationPresent(Stateless.class)) + { + invoker = new InvokerEJB3(resolver); + } + else + { + invoker = new InvokerJSE(resolver); + } + return invoker; + } + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserJBWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,45 @@ +/* + * 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.wsf.stack.metro; + +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.common.KernelAwareSPIFactory; + +/** + * An EndpointRegistryFactory implementation that retrieves + * the registry from MC kernel. + * + * @see EndpointRegistry.BEAN_NAME + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory +{ + public EndpointRegistry getEndpointRegistry() + { + return new KernelAwareSPIFactory().getKernelProvidedSPI( + EndpointRegistry.BEAN_NAME, EndpointRegistry.class + ); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,103 @@ +/* + * 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.wsf.stack.metro; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.common.ObjectNameFactory; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; +import java.io.IOException; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class EndpointServlet extends HttpServlet +{ + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + if (endpoint == null) + { + String contextPath = req.getContextPath(); + initServiceEndpoint(contextPath); + } + + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** Initialize the service endpoint + */ + protected void initServiceEndpoint(String contextPath) + { + WebAppResolver resolver = new WebAppResolver(contextPath, getServletName()); + this.endpoint = epRegistry.resolve(resolver); + + if (this.endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName() + ); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + + // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader + Deployment dep = endpoint.getService().getDeployment(); + if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) + { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + dep.setRuntimeClassLoader(classLoader); + } + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/EndpointServlet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,164 @@ +package org.jboss.wsf.stack.metro; + +import com.sun.xml.ws.transport.http.ResourceLoader; + +import javax.servlet.ServletContext; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import java.net.URL; +import java.net.MalformedURLException; +import java.util.Set; +import java.util.Enumeration; +import java.io.InputStream; +import java.io.IOException; + +public class FakeServletContext implements ServletContext +{ + private ResourceLoader resourceLoader; + + + public FakeServletContext(ResourceLoader resourceLoader) + { + this.resourceLoader = resourceLoader; + } + + + public ServletContext getContext(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getContextPath() + { + throw new IllegalArgumentException("Not implemented"); + } + + public int getMajorVersion() + { + throw new IllegalArgumentException("Not implemented"); + } + + public int getMinorVersion() + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getMimeType(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Set getResourcePaths(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public URL getResource(String name) + { + try + { + return resourceLoader.getResource(name); + + } catch (Throwable e) + { + return null; + } + } + + public InputStream getResourceAsStream(String string) + { + try + { + return getResource(string).openStream(); + } catch (Throwable e) + { + return null; + } + } + + public RequestDispatcher getRequestDispatcher(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public RequestDispatcher getNamedDispatcher(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Servlet getServlet(String string) throws ServletException + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getServlets() + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getServletNames() + { + throw new IllegalArgumentException("Not implemented"); + } + + public void log(String string) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void log(Exception exception, String string) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void log(String string, Throwable throwable) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public String getRealPath(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getServerInfo() + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getInitParameter(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getInitParameterNames() + { + throw new IllegalArgumentException("Not implemented"); + } + + public Object getAttribute(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public Enumeration getAttributeNames() + { + throw new IllegalArgumentException("Not implemented"); + } + + public void setAttribute(String string, Object object) + { + throw new IllegalArgumentException("Not implemented"); + } + + public void removeAttribute(String string) + { + throw new IllegalArgumentException("Not implemented"); + } + + public String getServletContextName() + { + throw new IllegalArgumentException("Not implemented"); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/FakeServletContext.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,119 @@ +/* + * 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.wsf.stack.metro; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.xml.ws.Provider; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + +/** + * An invoker for EJB3 endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class InvokerEJB3 extends Invoker +{ + private final InstanceResolver resolver; + + private WSWebServiceContext wsc; + + public InvokerEJB3(InstanceResolver resolver) + { + this.resolver = resolver; + } + + @Override + public void start(@NotNull WSWebServiceContext wsc, @NotNull WSEndpoint endpoint) + { + resolver.start(wsc, endpoint); + this.wsc = wsc; + } + + @Override + public void dispose() + { + resolver.dispose(); + } + + @Override + public <T> T invokeProvider(@NotNull Packet p, T arg) + { + Object targetBean = resolver.resolve(p); + return ((Provider<T>)targetBean).invoke(arg); + } + + @Override + public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException + { + Endpoint ep = EndpointAssociation.getEndpoint(); + + InvocationHandler invHandler = ep.getInvocationHandler(); + Invocation inv = invHandler.createInvocation(); + + inv.getInvocationContext().addAttachment(MessageContext.class, wsc.getMessageContext()); + + inv.setJavaMethod(m); + inv.setArgs(args); + + Object retObj = null; + try + { + invHandler.invoke(ep, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException + { + if (ex instanceof InvocationTargetException) + throw (InvocationTargetException)ex; + + if (ex instanceof IllegalAccessException) + throw (IllegalAccessException)ex; + + throw new WebServiceException(ex); + } +} \ No newline at end of file Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,119 @@ +/* + * 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.wsf.stack.metro; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.xml.ws.Provider; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + +/** + * An invoker for JSE endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class InvokerJSE extends Invoker +{ + private final InstanceResolver resolver; + + public InvokerJSE(InstanceResolver resolver) + { + this.resolver = resolver; + } + + @Override + public void start(@NotNull + WSWebServiceContext wsc, @NotNull + WSEndpoint endpoint) + { + resolver.start(wsc, endpoint); + } + + @Override + public void dispose() + { + resolver.dispose(); + } + + @Override + public <T> T invokeProvider(@NotNull + Packet p, T arg) + { + Object targetBean = resolver.resolve(p); + return ((Provider<T>)targetBean).invoke(arg); + } + + @Override + public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException + { + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); + + Invocation inv = invHandler.createInvocation(); + InvocationContext invContext = inv.getInvocationContext(); + inv.setJavaMethod(m); + inv.setArgs(args); + + Object retObj = null; + try + { + Object targetBean = resolver.resolve(p); + invContext.setTargetBean(targetBean); + invHandler.invoke(ep, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + return retObj; + } + + private void handleException(Exception ex) throws InvocationTargetException, IllegalAccessException + { + if (ex instanceof InvocationTargetException) + throw (InvocationTargetException)ex; + + if (ex instanceof IllegalAccessException) + throw (IllegalAccessException)ex; + + throw new WebServiceException(ex); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/InvokerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,55 @@ +/* + * 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.wsf.stack.metro; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.management.AbstractServerConfig; + +/** + * Basic implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class MetroServerConfig extends AbstractServerConfig implements MetroServerConfigMBean +{ + private static final Logger log = Logger.getLogger(MetroServerConfig.class); + + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + + public String getImplementationVersion() + { + return getClass().getPackage().getImplementationVersion(); + } + + public void create() throws Exception + { + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); + super.create(); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,36 @@ +/* + * 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.wsf.stack.metro; + +//$Id$ + +import org.jboss.wsf.common.management.AbstractServerConfigMBean; + +/** + * Basic implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public interface MetroServerConfigMBean extends AbstractServerConfigMBean +{ +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/MetroServerConfigMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,37 @@ +/* + * 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.wsf.stack.metro; + +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class RequestHandlerFactoryImpl extends RequestHandlerFactory +{ + public RequestHandler newRequestHandler() + { + return new RequestHandlerImpl(); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,158 @@ +/* + * 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.wsf.stack.metro; + +//$Id$ + +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; + +/** + * A request handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class RequestHandlerImpl implements RequestHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + + RequestHandlerImpl() + { + } + + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + ServletAdapter target = endpoint.getAttachment(ServletAdapter.class); + if(null == target) + throw new IllegalArgumentException("Cannot obtain ServletAdapter"); + + String method = req.getMethod(); + if (method.equals("POST")) + { + doPost(target, context, req, res); + } + else if(method.equals("GET")) + { + doGet(target, req, context, res); + } + else + { + throw new WebServiceException("Unsupported method: " + method); + } + } + + private void doGet(ServletAdapter target, HttpServletRequest req, ServletContext context, HttpServletResponse res) + throws ServletException + { + try { + + if (target != null) + { + String query = req.getQueryString(); + if (isMetadataQuery(query)) { + // Sends published WSDL and schema documents + target.publishWSDL(context, req, res); + return; + } + else + { + sendResponse(405, "HTTP GET not supported", res); + } + } + else + { + sendResponse(404, "Not found", res); + } + } + catch (Exception e) + { + log.error("Failed to process GET request", e); + throw new ServletException(e.getMessage()); + } + } + + private static void sendResponse(int status, String message, HttpServletResponse res) + throws IOException + { + res.setStatus(status); + res.setContentType("text/plain"); + Writer out = res.getWriter(); + out.write(message); + out.close(); + } + + private void doPost(ServletAdapter target, ServletContext context, HttpServletRequest req, HttpServletResponse res) + { + try + { + target.handle(context, req, res); + } + catch (Throwable e) + { + log.error("Failed to process POST request", e); + res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } + } + + + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { + throw new IllegalArgumentException("JBWS-1869: Not implemented"); + } + + public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) + { + throw new IllegalArgumentException("JBWS-1869: Not implemented"); + } + + /** + * Returns true if the given query string is for metadata request. + * + * @param query + * String like "xsd=1" or "perhaps=some&unrelated=query". + * Can be null. + * @return true for metadata requests + * false for web service requests + */ + private boolean isMetadataQuery(String query) { + // we intentionally return true even if documents don't exist, + // so that they get 404. + return query != null && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd=")); + } + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,65 @@ +/* + * 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.wsf.stack.metro; + +// $Id$ + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Set; + +import javax.servlet.ServletContext; + +import com.sun.xml.ws.transport.http.ResourceLoader; + +/** + * {@link ResourceLoader} backed by {@link ServletContext}. + * + * TDI: A copy of the original that is public + * + * @author WS Development Team + * @author Thomas.Diesler(a)jboss.org + */ +public class ServletResourceLoader implements ResourceLoader +{ + private final ServletContext context; + + public ServletResourceLoader(ServletContext context) + { + this.context = context; + } + + public URL getResource(String path) throws MalformedURLException + { + return context.getResource(path); + } + + public URL getCatalogFile() throws MalformedURLException + { + return getResource("/WEB-INF/jax-ws-catalog.xml"); + } + + public Set<String> getResourcePaths(String path) + { + return context.getResourcePaths(path); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/ServletResourceLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,98 @@ +/* + * 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.wsf.stack.metro; + +//$Id$ + +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint; +import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints; +import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect; + +import javax.xml.ws.BindingType; +import javax.xml.ws.soap.SOAPBinding; +import java.util.HashMap; +import java.util.Map; + +/** + * A deployer that generates sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class SunJaxwsDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep) + { + + DDEndpoints dd = dep.getAttachment(DDEndpoints.class); + if (dd == null) + { + dd = new DDEndpoints(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String epName = ep.getShortName(); + String targetBean = ep.getTargetBeanName(); + String urlPattern = ep.getURLPattern(); + + DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern); + + Class beanClass = ep.getTargetBeanClass(); + BindingType anBindingType = (BindingType)beanClass.getAnnotation(BindingType.class); + if (anBindingType != null && anBindingType.value().length() > 0) + { + String binding = anBindingType.value(); + ddep.setBinding(binding); + if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) + ddep.setEnableMTOM(true); + } + + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } + + dep.addAttachment(DDEndpoints.class, dd); + + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + if (contextParams == null) + { + contextParams = new HashMap<String, String>(); + dep.setProperty(propKey, contextParams); + } + contextParams.put(RuntimeModelDeploymentAspect.PARAM_SUN_JAXWS_URL, dd.createFileURL().toExternalForm()); + } + } + + @Override + public void destroy(Deployment dep) + { + DDEndpoints dd = dep.getAttachment(DDEndpoints.class); + if (dd != null) + { + dd.destroyFileURL(); + } + } +} \ No newline at end of file Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,69 @@ +/* + * 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.wsf.stack.metro; + +import org.jboss.wsf.spi.management.EndpointResolver; +import org.jboss.wsf.spi.deployment.Endpoint; + +import javax.management.ObjectName; +import java.util.Iterator; + +/** + * Resolves Endpoints by Servlet name and web context path. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class WebAppResolver implements EndpointResolver +{ + private String contextPath; + private String servletName; + + public WebAppResolver(String contextPath, String servletName) + { + this.contextPath = contextPath; + this.servletName = servletName; + } + + public Endpoint query(Iterator<Endpoint> endpoints) + { + Endpoint endpoint = null; + + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + while(endpoints.hasNext()) + { + Endpoint auxEndpoint = endpoints.next(); + ObjectName sepId = auxEndpoint.getName(); + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = auxEndpoint; + break; + } + } + + return endpoint; + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/WebAppResolver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXRPC.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXRPC.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXRPC.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,42 @@ +/* + * 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.wsf.stack.metro.client; + +import java.lang.reflect.AnnotatedElement; + +import javax.naming.Context; +import javax.naming.NamingException; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 12, 2007 + */ +public class MetroServiceRefBinderJAXRPC implements ServiceRefBinder +{ + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException + { + throw new IllegalArgumentException("Deployed stack doesnt support JAX-RPC service-ref deployments"); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,221 @@ +/* + * 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.wsf.stack.metro.client; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.jws.HandlerChain; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.Referenceable; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 12, 2007 + */ +public class MetroServiceRefBinderJAXWS implements ServiceRefBinder +{ + // logging support + private static Logger log = Logger.getLogger(MetroServiceRefBinderJAXWS.class); + + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) + throws NamingException + { + WebServiceRef wsref = null; + + if (null == loader) + throw new IllegalArgumentException("There needs to be a classloader available"); + + // Build the list of @WebServiceRef relevant annotations + List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); + + if (anElement != null) + { + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); + + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } + } + } + + // Use the single @WebServiceRef + if (wsrefList.size() == 1) + { + wsref = wsrefList.get(0); + } + else + { + for (WebServiceRef aux : wsrefList) + { + if (encName.endsWith("/" + aux.name())) + { + wsref = aux; + break; + } + } + } + + Class targetClass = null; + if (anElement instanceof Field) + { + targetClass = ((Field)anElement).getType(); + } + else if (anElement instanceof Method) + { + targetClass = ((Method)anElement).getParameterTypes()[0]; + } + else + { + if (wsref != null && (wsref.type() != Object.class)) + targetClass = wsref.type(); + } + + String targetClassName = (targetClass != null ? targetClass.getName() : null); + String externalName = encCtx.getNameInNamespace() + "/" + encName; + log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + + String serviceImplClass = null; + + // #1 Use the explicit @WebServiceRef.value + if (wsref != null && wsref.value() != Object.class) + serviceImplClass = wsref.value().getName(); + + // #2 Use the target ref type + if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) + serviceImplClass = targetClass.getName(); + + // #3 Use <service-interface> + if (serviceImplClass == null && serviceRef.getServiceInterface() != null) + serviceImplClass = serviceRef.getServiceInterface(); + + // #4 Use javax.xml.ws.Service + if (serviceImplClass == null) + serviceImplClass = Service.class.getName(); + + // #1 Use the explicit @WebServiceRef.type + if (wsref != null && wsref.type() != Object.class) + targetClassName = wsref.type().getName(); + + // #2 Use the target ref type + if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) + targetClassName = targetClass.getName(); + + // Set the wsdlLocation if there is no override already + if (serviceRef.getWsdlOverride() == null && wsref != null && wsref.wsdlLocation().length() > 0) + serviceRef.setWsdlOverride(wsref.wsdlLocation()); + + // Set the handlerChain from @HandlerChain on the annotated element + String handlerChain = serviceRef.getHandlerChain(); + if (anElement != null) + { + HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); + if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) + handlerChain = anHandlerChain.file(); + } + + // Resolve path to handler chain + if (handlerChain != null) + { + try + { + new URL(handlerChain); + } + catch (MalformedURLException ex) + { + Class declaringClass = null; + if (anElement instanceof Field) + declaringClass = ((Field)anElement).getDeclaringClass(); + else if (anElement instanceof Method) + declaringClass = ((Method)anElement).getDeclaringClass(); + else if (anElement instanceof Class) + declaringClass = (Class)anElement; + + handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; + } + + serviceRef.setHandlerChain(handlerChain); + } + + // Extract service QName for target service + if (null == serviceRef.getServiceQName()) + { + try + { + Class serviceClass = loader.loadClass(serviceImplClass); + if (serviceClass.getAnnotation(WebServiceClient.class) != null) + { + WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class); + serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name())); + } + } + catch (ClassNotFoundException e) + { + WSFException.rethrow("Cannot extract service QName for target service", e); + } + } + + // Do not use rebind, the binding should be unique + // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind + Referenceable serviceReferenceable = buildServiceReferenceable(serviceImplClass, targetClassName, serviceRef); + Util.bind(encCtx, encName, serviceReferenceable); + + } + + /** + * Create a Sun-RI specific service referenceable. + * Most of the setup is done in {@link org.jboss.wsf.framework.serviceref.ServiceRefBinderJAXWS} + * + * @param serviceImplClass + * @param targetClassName + * @param serviceRef + * @return a Sun-RI specific service referenceable. + */ + protected Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) + { + return new SunRIServiceReferenceable(serviceImplClass, targetClassName, serviceRef); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/MetroServiceRefBinderJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,42 @@ +/* + * 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.wsf.stack.metro.client; + +// $Id$ + +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; +import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; +import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; + +/** + * Binds a JAXWS Service object in the client's ENC + * + * @author Thomas.Diesler(a)jboss.org + * @since 17-Jan-2007 + */ +public class ServiceRefBinderFactoryImpl implements ServiceRefBinderFactory +{ + public ServiceRefBinder newServiceRefBinder(Type type) + { + return (type == Type.JAXRPC ? new MetroServiceRefBinderJAXRPC() : new MetroServiceRefBinderJAXWS()); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/ServiceRefBinderFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,213 @@ +/* + * 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.wsf.stack.metro.client; + +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.*; +import javax.naming.spi.ObjectFactory; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.Hashtable; +import org.jboss.logging.Logger; + +/** + * This ServiceObjectFactory reconstructs a javax.xml.ws.Service + * for a given WSDL when the webservice client does a JNDI lookup + * + * @see SunRIServiceReferenceable + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 12, 2007 + * */ +public class SunRIServiceObjectFactory implements ObjectFactory +{ + protected final Logger log = Logger.getLogger(SunRIServiceObjectFactory.class); + + /** + * Creates an object using the location or reference information specified. + * <p/> + * + * @param obj The possibly null object containing location or reference + * information that can be used in creating an object. + * @param name The name of this object relative to <code>nameCtx</code>, + * or null if no name is specified. + * @param nameCtx The context relative to which the <code>name</code> + * parameter is specified, or null if <code>name</code> is + * relative to the default initial context. + * @param environment The possibly null environment that is used in + * creating the object. + * @return The object created; null if an object cannot be created. + * @throws Exception if this object factory encountered an exception + * while attempting to create an object, and no other object factories are + * to be tried. + * @see javax.naming.spi.NamingManager#getObjectInstance + * @see javax.naming.spi.NamingManager#getURLContext + */ + public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception + { + try + { + Reference ref = (Reference)obj; + + // Get the target class name + String targetClassName = (String)ref.get(SunRIServiceReferenceable.TARGET_CLASS_NAME).getContent(); + + // Unmarshall the UnifiedServiceRef + UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref); + String serviceRefName = serviceRef.getServiceRefName(); + QName serviceQName = serviceRef.getServiceQName(); + + String serviceImplClass = serviceRef.getServiceImplClass(); + if (serviceImplClass == null) + serviceImplClass = (String)ref.get(SunRIServiceReferenceable.SERVICE_IMPL_CLASS).getContent(); + + // If the target defaults to javax.xml.ws.Service, use the service as the target + if (Service.class.getName().equals(targetClassName)) + targetClassName = serviceImplClass; + + log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); + + // Load the service class + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class serviceClass = ctxLoader.loadClass(serviceImplClass); + Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); + + if (Service.class.isAssignableFrom(serviceClass) == false) + throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); + + // Receives either a javax.xml.ws.Service or a dynamic proxy + Object target; + + // Get the URL to the wsdl + URL wsdlURL = serviceRef.getWsdlLocation(); + + // Generic javax.xml.ws.Service + if (serviceClass == Service.class) + { + if (wsdlURL != null) + { + target = Service.create(wsdlURL, serviceQName); + } + else + { + throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); + } + } + // Generated javax.xml.ws.Service subclass + else + { + if (wsdlURL != null) + { + Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); + target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); + } + else + { + target = (Service)serviceClass.newInstance(); + } + } + + // Configure the service + configureService((Service)target, serviceRef); + + if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) + { + try + { + Object port = null; + if (serviceClass != Service.class) + { + for (Method method : serviceClass.getDeclaredMethods()) + { + String methodName = method.getName(); + Class retType = method.getReturnType(); + if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) + { + port = method.invoke(target, new Object[0]); + target = port; + break; + } + } + } + + if (port == null) + { + Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); + port = method.invoke(target, new Object[] { targetClass }); + target = port; + } + } + catch (InvocationTargetException ex) + { + throw ex.getTargetException(); + } + } + + return target; + } + catch (Throwable ex) + { + WSFException.rethrow("Cannot create service", ex); + return null; + } + } + + + private void configureService(Service service, UnifiedServiceRefMetaData serviceRef) + { + log.warn("Service configuration not available in Sun-RI"); + } + + private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException + { + UnifiedServiceRefMetaData sref; + RefAddr refAddr = ref.get(SunRIServiceReferenceable.SERVICE_REF_META_DATA); + ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); + try + { + ObjectInputStream ois = new ObjectInputStream(bais); + sref = (UnifiedServiceRefMetaData)ois.readObject(); + ois.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); + } + + // Verify it. There is some know coinstraints + if(null == sref.getServiceQName()) + throw new IllegalArgumentException("ServiceQName may not be null. " + + "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation."); + + return sref; + } +} + Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,88 @@ +/* + * 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.wsf.stack.metro.client; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.*; +import java.io.ByteArrayOutputStream; +import java.io.ObjectOutputStream; +import java.io.IOException; + +/** + * A JNDI reference to a javax.xml.ws.Service + * + * It holds the information to reconstrut the javax.xml.ws.Service + * when the client does a JNDI lookup. + * + * @author Heiko.Braun(a)jboss.com + */ +public class SunRIServiceReferenceable implements Referenceable +{ + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; + public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; + public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; + + private String serviceImplClass; + private String targetClassName; + private UnifiedServiceRefMetaData serviceRef; + + public SunRIServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) + { + this.serviceImplClass = serviceImplClass; + this.targetClassName = targetClassName; + this.serviceRef = serviceRef; + } + + /** + * Retrieves the Reference of this object. + * + * @return The non-null Reference of this object. + * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. + */ + public Reference getReference() throws NamingException + { + Reference myRef = new Reference(SunRIServiceReferenceable.class.getName(), SunRIServiceObjectFactory.class.getName(), null); + + myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass)); + myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); + myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); + + return myRef; + } + + private byte[] marshall(Object obj) throws NamingException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(512); + try + { + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(obj); + oos.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot marshall object, cause: " + e.toString()); + } + return baos.toByteArray(); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/client/SunRIServiceReferenceable.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/JBossResourceInjector.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/JBossResourceInjector.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/JBossResourceInjector.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,48 @@ +/* + * 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.wsf.stack.metro.injection; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.server.ResourceInjector; +import com.sun.xml.ws.api.server.WSWebServiceContext; +import org.jboss.logging.Logger; + +/** + * Default {@link ResourceInjector}. + * + * @see ResourceInjector#STANDALONE + * @author Kohsuke Kawaguchi + */ +public final class JBossResourceInjector extends ResourceInjector { + + private static final org.jboss.logging.Logger log = Logger.getLogger(JBossResourceInjector.class); + + public void inject(@NotNull WSWebServiceContext context, @NotNull Object instance) { +// AbstractInstanceResolver.buildInjectionPlan( +// instance.getClass(), +// WebServiceContext.class, +// false +// ).inject(instance,context); + + log.warn("Context injection not implemeted, failed to inject " + context+ " into " + instance); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/injection/JBossResourceInjector.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,171 @@ +/* + * 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.wsf.stack.metro.log; + +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.pipe.Pipe; +import com.sun.xml.ws.api.pipe.PipeCloner; +import com.sun.xml.ws.api.pipe.helper.AbstractFilterPipeImpl; +import org.jboss.logging.Logger; + +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.lang.reflect.Constructor; + +/** + * {@link Pipe} that dumps messages that pass through. + * Borrowed from the SUN-RI sources. + * + * @author Kohsuke Kawaguchi + * @author Heiko Braun + */ +public class DumpPipe extends AbstractFilterPipeImpl { + + private static Logger msgLog = Logger.getLogger("org.jboss.wsf.spi.MessageTrace"); + + private final String name; + + private final PrintStream out; + + private final XMLOutputFactory staxOut; + + /** + * @param name + * Specify the name that identifies this {@link DumpPipe} + * instance. This string will be printed when this pipe + * dumps messages, and allows people to distinguish which + * pipe instance is dumping a message when multiple + * {@link DumpPipe}s print messages out. + * @param out + * The output to send dumps to. + * @param next + * The next {@link Pipe} in the pipeline. + */ + public DumpPipe(String name, PrintStream out, Pipe next) { + super(next); + this.name = name; + this.out = out; + this.staxOut = XMLOutputFactory.newInstance(); + //staxOut.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES,true); + } + + /** + * @param out + * The output to send dumps to. + * @param next + * The next {@link Pipe} in the pipeline. + * + * @deprecated + * use {@link #DumpPipe(String, PrintStream, Pipe)} + */ + public DumpPipe(PrintStream out, Pipe next) { + this("DumpPipe",out,next); + } + + /** + * Copy constructor. + */ + private DumpPipe(DumpPipe that, PipeCloner cloner) { + super(that,cloner); + this.name = that.name; + this.out = that.out; + this.staxOut = that.staxOut; + } + + public Packet process(Packet packet) { + dump("request",packet); + Packet reply = next.process(packet); + dump("response",reply); + return reply; + } + + private void dump(String header, Packet packet) { + + if(!msgLog.isTraceEnabled()) + return; + + msgLog.trace("====["+name+":"+header+"]===="); + if(packet.getMessage()==null) + { + msgLog.trace("(none)"); + } + else + { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + + try { + + XMLStreamWriter writer = staxOut.createXMLStreamWriter(new PrintStream(bout) { + public void close() { + // noop + } + }); + writer = createIndenter(writer); + packet.getMessage().copy().writeTo(writer); + writer.close(); + + } catch (XMLStreamException e) { + e.printStackTrace(new PrintStream(bout)); + } + + msgLog.trace(new String(bout.toByteArray())); + } + + msgLog.trace("============"); + } + + /** + * Wraps {@link XMLStreamWriter} by an indentation engine if possible. + * + * <p> + * We can do this only when we have <tt>stax-utils.jar</tt> in the classpath. + */ + private XMLStreamWriter createIndenter(XMLStreamWriter writer) { + try { + Class clazz = getClass().getClassLoader().loadClass("javanet.staxutils.IndentingXMLStreamWriter"); + Constructor c = clazz.getConstructor(XMLStreamWriter.class); + writer = (XMLStreamWriter)c.newInstance(writer); + } catch (Exception e) { + // if stax-utils.jar is not in the classpath, this will fail + // so, we'll just have to do without indentation + if(!warnStaxUtils) { + warnStaxUtils = true; + msgLog.warn("WARNING: put stax-utils.jar to the classpath to indent the dump output"); + } + } + return writer; + } + + + public Pipe copy(PipeCloner cloner) { + return new DumpPipe(this,cloner); + } + + public void preDestroy() { + // noop + } + + private static boolean warnStaxUtils; +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/DumpPipe.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,42 @@ +/* + * 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.wsf.stack.metro.log; + +import com.sun.xml.ws.api.server.ServerPipelineHook; +import com.sun.xml.ws.api.pipe.Pipe; +import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext; +import com.sun.istack.NotNull; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class MessageLogPipelineHook extends ServerPipelineHook +{ + + public + @NotNull + Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, @NotNull Pipe tail) + { + return new DumpPipe("Message Log", System.out, tail); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,96 @@ +/* + * 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.wsf.stack.metro.log; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Filter; +import java.util.logging.LogRecord; + +/** + * A log filter allowing logging of LogRecord depending on the + * namespace of the Logger they have been collected by. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @author Stefano Maestri, <stefano.maestri(a)javalinux.it> + * @since 14-Jun-2007 + * + */ +public class NamespaceFilter implements Filter +{ + + private Set<String> namespaces; + private boolean show; + + public NamespaceFilter(boolean show) + { + this.show = show; + } + + public boolean isLoggable(LogRecord record) + { + String loggerName = record.getLoggerName(); + if (loggerName == null) + { + return true; + } + else + { + for (String ns : namespaces) + { + if (loggerName.startsWith(ns)) + { + return show; + } + } + return !show; + } + } + + public void addNamespace(String ns) + { + if (namespaces == null) + namespaces = new LinkedHashSet<String>(); + namespaces.add(ns); + } + + public Set<String> getNamespaces() + { + return namespaces; + } + + public void setNamespaces(Set<String> namespaces) + { + this.namespaces = namespaces; + } + + public boolean isShow() + { + return show; + } + + public void setShow(boolean show) + { + this.show = show; + } + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/NamespaceFilter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,217 @@ +/* + * 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.wsf.stack.metro.metadata; + +import com.sun.istack.NotNull; +import com.sun.xml.ws.api.server.BoundEndpoint; +import com.sun.xml.ws.api.server.Container; +import com.sun.xml.ws.api.server.Module; +import com.sun.xml.ws.api.server.ResourceInjector; +import com.sun.xml.ws.api.server.ServerPipelineHook; +import com.sun.xml.ws.transport.http.DeploymentDescriptorParser; +import com.sun.xml.ws.transport.http.ResourceLoader; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; +import org.jboss.logging.Logger; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt; +import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS; +import org.jboss.wsf.stack.metro.FakeServletContext; +import org.jboss.wsf.stack.metro.log.MessageLogPipelineHook; + +import javax.xml.ws.WebServiceException; +import javax.servlet.ServletContext; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * Creates a Metro runtime model and associates it with the deployment. + * Doing so requires a valid runtime loader present, that will act as a temporary + * thread local classloader. <p>The <code>spi.Endpoint</code> carries a Metro <code>ServletAdapter</code> + * that is associated with the runtime model:<br> + * <code>(Endpoint.getAttachment(ServletAdapter.class))</code> + * This adapter acts as the main entry point for SOAP/HTTP requests. + * Please note that the current implementation doesnt support the stream based RequestHandler API. + * + * @see org.jboss.wsf.stack.metro.RequestHandlerImpl + * @see org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class RuntimeModelDeploymentAspect extends DeploymentAspect +{ + private static final org.jboss.logging.Logger log = Logger.getLogger(RuntimeModelDeploymentAspect.class); + + protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml"; + + public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url"; + + public void create(Deployment deployment) + { + ClassLoader runtimeLoader = deployment.getRuntimeClassLoader(); + if(null == runtimeLoader) + throw new IllegalArgumentException("Null runtimeLoader"); + + ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); + + try + { + // Metro uses the thread context classloader in several places + Thread.currentThread().setContextClassLoader(runtimeLoader); + + UnifiedVirtualFile vfsRoot = null; + if (deployment instanceof ArchiveDeployment) + { + vfsRoot = ((ArchiveDeployment)deployment).getRootFile(); + } + else + { + vfsRoot = new ResourceLoaderAdapter(runtimeLoader); + } + + ResourceLoader resourceLoader = new VFSResourceLoader(vfsRoot); + JBossWSContainer container = new JBossWSContainer(resourceLoader); + + // TODO: refactor to general HTTPAdapter usage + ServletAdapterList adapterList = new ServletAdapterList(); + + // Parse the descriptor file and build endpoint infos + DeploymentDescriptorParserExt<ServletAdapter> parser = + createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList); + + //URL sunJaxWsXml = getDDUrlFromResourceLoader(resourceLoaderAdapter); + URL sunJaxWsXml = getDDUrlFromContext(deployment); + + List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream()); + + for(ServletAdapter adapter : adapters) + { + for(Endpoint ep : deployment.getService().getEndpoints() ) + { + // TODO matching need to be improved + if(ep.getShortName().equals(adapter.getName())&& + ep.getTargetBeanClass().equals(adapter.getEndpoint().getImplementationClass())) + { + ep.addAttachment(ServletAdapter.class, adapter); + break; + } + } + } + + } + catch (Throwable e) + { + throw new WebServiceException("Failed to build METRO runtime model", e); + } + finally{ + Thread.currentThread().setContextClassLoader(origClassLoader); + } + + } + + private URL getDDUrlFromContext(Deployment deployment) + throws MalformedURLException + { + HashMap<String, String> contextProperties = + (HashMap<String, String>)deployment.getProperty("org.jboss.ws.webapp.ContextParameterMap"); + URL sunJaxWsXml = new URL(contextProperties.get(PARAM_SUN_JAXWS_URL)); + return sunJaxWsXml; + } + + /** + * Externalized for integration + */ + protected DeploymentDescriptorParserExt<ServletAdapter> createDeploymentDescriptorParser( + ClassLoader classLoader, JBossWSContainer container, + ResourceLoader resourceLoader, DeploymentDescriptorParser.AdapterFactory<ServletAdapter> adapterList) + throws MalformedURLException + { + DeploymentDescriptorParserExt<ServletAdapter> parser = + new DeploymentDescriptorParserJBWS<ServletAdapter>(classLoader, resourceLoader, container, adapterList); + return parser; + } + + /** + * Externalized for integration + */ + protected URL getDDUrlFromResourceLoader(UnifiedVirtualFile vfsRoot) throws IOException + { + URL sunJaxWsXml = vfsRoot.findChild(JAXWS_RI_RUNTIME).toURL(); + return sunJaxWsXml; + } + + + /** + * Provides access to {@link javax.servlet.ServletContext} via {@link com.sun.xml.ws.api.server.Container}. + * Pipes can get ServletContext from Container and use it to load some resources. + */ + static class JBossWSContainer extends Container + { + private ResourceLoader resourceLoader; + + private final Module module = new Module() + { + private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>(); + + public @NotNull + List<BoundEndpoint> getBoundEndpoints() + { + return endpoints; + } + }; + + JBossWSContainer(ResourceLoader loader) + { + this.resourceLoader = loader; + } + + public <T> T getSPI(Class<T> spiType) + { + if (spiType == Module.class) + { + return spiType.cast(module); + } + else if(spiType == ResourceInjector.class) + { + return (T)ResourceInjector.STANDALONE; + } + else if (spiType == ServerPipelineHook.class) + { + return (T)new MessageLogPipelineHook(); + } + else if(spiType == ServletContext.class) + { + return (T)new FakeServletContext(resourceLoader); + } + + log.warn("Unable to resolve SPI for type: " + spiType); + return null; + } + } + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,159 @@ +/* + * 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.wsf.stack.metro.metadata; + +import com.sun.xml.ws.transport.http.ResourceLoader; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.logging.Logger; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashSet; +import java.util.Set; +import java.util.List; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.jar.JarFile; +import java.util.jar.JarEntry; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class VFSResourceLoader implements ResourceLoader +{ + + private static final Logger log = Logger.getLogger(VFSResourceLoader.class); + + UnifiedVirtualFile vfs; + + public VFSResourceLoader(UnifiedVirtualFile vfs) + { + this.vfs = vfs; + } + + public URL getResource(String path) throws MalformedURLException + { + try + { + if(path.startsWith("/")) + path = path.substring(1, path.length()); + + return vfs.findChild(path).toURL(); + } + catch (IOException e) + { + throw new MalformedURLException(e.getMessage()); + } + } + + public URL getCatalogFile() throws MalformedURLException + { + URL resource = null; + try + { + resource = getResource("/WEB-INF/jax-ws-catalog.xml"); + } + catch (MalformedURLException e) + { + // ingore + } + return resource; + } + + public Set<String> getResourcePaths(String path) + { + Set<String> resources = new HashSet<String>(); + + try + { + URL rootUrl = getResource(path); + if(rootUrl.getProtocol().equals("jar")) + { + /*String urlString = rootUrl.toExternalForm(); + String jarRoot = urlString.substring(4, urlString.indexOf("jar!")+3); + + File jar = new File(jarRoot); + assert jar.exists(); + JarFile jarFile = new JarFile(jar); + + List<String> jarResources = getJARResources(jarFile, path); + + resources.addAll(jarResources);*/ + log.warn("Cannot collect resourcePaths from EJB jar"); + } + else + { + File root = new File( rootUrl.toURI() ); + List<String> fileResources = getFileResources(root, path); + resources.addAll(fileResources); + } + } + catch (Exception e) + { + log.error("Failed to read resource paths from '"+path+"': ", e); + } + + return resources; + } + + private static List<String> getFileResources(File root, String path) + { + List<String> resources = new ArrayList<String>(); + + if(root.exists()) + { + File[] files = root.listFiles(); + if (files != null) { + for( File f : files) { + if(f.isDirectory()) { + resources.add(path+f.getName()+'/'); + } else { + resources.add(path+f.getName()); + } + } + } + } + return resources; + } + + private static List<String> getJARResources(JarFile jarFile, String path) { + List<String> resources = new ArrayList<String>(); + + Enumeration entries = jarFile.entries(); + while (entries.hasMoreElements()) { + JarEntry entry = (JarEntry) entries.nextElement(); + String entryName = entry.getName(); + + if (entryName.matches(".*?\\.xml$") + || entryName.matches(".*?\\.wsdl$") + || entryName.matches(".*?\\.xsd$")) + { + resources.add(entryName); + } + } + + return resources; + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/VFSResourceLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,205 @@ +/* + * 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.wsf.stack.metro.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.http.HTTPBinding; +import javax.xml.ws.soap.SOAPBinding; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDEndpoint +{ + // Name of the endpoint + private String name; + // Primary wsdl file location in the WAR file. + private String wsdl; + //QName of WSDL service. + private QName service; + //QName of WSDL port. + private QName port; + // Endpoint implementation class name. + private String implementation; + // Should match <url-pattern> in web.xml + private String urlPattern; + // Binding id defined in the JAX-WS API + private String binding; + // Enables MTOM optimization. + private boolean enableMTOM; + // Optional handler chain + private DDHandlerChain handlerChain; + + // The list of valid bindings + static final List<String> validBindings = new ArrayList<String>(); + static + { + validBindings.add(SOAPBinding.SOAP11HTTP_BINDING); + validBindings.add(SOAPBinding.SOAP11HTTP_MTOM_BINDING); + validBindings.add(SOAPBinding.SOAP12HTTP_BINDING); + validBindings.add(SOAPBinding.SOAP12HTTP_MTOM_BINDING); + validBindings.add(HTTPBinding.HTTP_BINDING); + } + + public DDEndpoint(String name, String impl, String urlPattern) + { + if (name == null || name.length() == 0) + throw new IllegalArgumentException("name cannot be null"); + if (impl == null || impl.length() == 0) + throw new IllegalArgumentException("implementation cannot be null"); + if (urlPattern == null || urlPattern.length() == 0) + throw new IllegalArgumentException("urlPattern cannot be null"); + + this.name = name; + this.implementation = impl; + this.urlPattern = urlPattern; + } + + public String getName() + { + return name; + } + + public String getImplementation() + { + return implementation; + } + + public String getUrlPattern() + { + return urlPattern; + } + + public String getBinding() + { + return binding; + } + + public void setBinding(String binding) + { + if (validBindings.contains(binding) == false) + throw new IllegalArgumentException("Invalid binding: " + binding); + + this.binding = binding; + } + + public boolean isEnableMTOM() + { + return enableMTOM; + } + + public void setEnableMTOM(boolean enableMTOM) + { + this.enableMTOM = enableMTOM; + } + + public QName getPort() + { + return port; + } + + public void setPort(QName port) + { + this.port = port; + } + + public QName getService() + { + return service; + } + + public void setService(QName service) + { + this.service = service; + } + + public String getWsdl() + { + return wsdl; + } + + public void setWsdl(String wsdl) + { + this.wsdl = wsdl; + } + + public DDHandlerChain getHandlerChain() + { + return handlerChain; + } + + public void setHandlerChain(DDHandlerChain handlerChain) + { + this.handlerChain = handlerChain; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<endpoint"); + writer.write(" name='" + name + "'"); + writer.write(" implementation='" + implementation + "'"); + writer.write(" url-pattern='" + urlPattern + "'"); + if (service != null) + writer.write(" service='" + service + "'"); + if (port != null) + writer.write(" port='" + port + "'"); + if (wsdl != null) + writer.write(" wsdl='" + wsdl + "'"); + if (binding != null) + writer.write(" binding='" + binding + "'"); + writer.write(" enable-mtom='" + enableMTOM + "'"); + writer.write(">"); + + if (handlerChain != null) + handlerChain.writeTo(writer); + + writer.write("</endpoint>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Endpoint"); + str.append("\n name=" + name); + str.append("\n implementation=" + implementation); + str.append("\n url-pattern=" + urlPattern); + if (service != null) + str.append("\n service=" + service); + if (port != null) + str.append("\n port=" + port); + if (wsdl != null) + str.append("\n wsdl=" + wsdl); + if (binding != null) + str.append("\n binding=" + binding); + str.append("\n enable-mtom=" + enableMTOM); + return str.toString(); + } +} \ No newline at end of file Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,98 @@ +/* + * 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.wsf.stack.metro.metadata.sunjaxws; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.common.IOUtils; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDEndpoints +{ + private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>(); + private File tmpFile; + + public List<DDEndpoint> getEndpoints() + { + return endpoints; + } + + public void addEndpoint(DDEndpoint ep) + { + endpoints.add(ep); + } + + public URL createFileURL() + { + destroyFileURL(); + + try + { + File tmpDir = IOUtils.createTempDirectory(); + tmpFile = File.createTempFile("jbossws-sun-jaxws", ".xml", tmpDir); + Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile)); + writeTo(writer); + writer.close(); + + return tmpFile.toURL(); + } + catch (IOException ex) + { + throw new WSFDeploymentException(ex); + } + } + + public void destroyFileURL() + { + if (tmpFile != null) + { + tmpFile.delete(); + tmpFile = null; + } + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime' version='2.0'>"); + for (DDEndpoint ep : endpoints) + { + ep.writeTo(writer); + } + writer.write("</endpoints>"); + } + +} \ No newline at end of file Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDEndpoints.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,63 @@ +/* + * 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.wsf.stack.metro.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDHandler +{ + private String handlerName; + private String handlerClass; + + public DDHandler(String handlerName, String handlerClass) + { + this.handlerName = handlerName; + this.handlerClass = handlerClass; + } + + public String getHandlerName() + { + return handlerName; + } + + public String getHandlerClass() + { + return handlerClass; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<handler>"); + writer.write("<handler-name>" + handlerName + "</handler-name>"); + writer.write("<handler-class>" + handlerClass + "</handler-class>"); + writer.write("</handler>"); + } +} \ No newline at end of file Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,74 @@ +/* + * 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.wsf.stack.metro.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; + +//$Id$ + +/** + * Metadata model for sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DDHandlerChain +{ + // Name of the endpoint + private String name; + + private List<DDHandler> handlers = new ArrayList<DDHandler>(); + + public DDHandlerChain(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public List<DDHandler> getEndpoints() + { + return handlers; + } + + public void addEndpoint(DDHandler handler) + { + handlers.add(handler); + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<handler-chain>"); + writer.write("<handler-chain-name>" + name + "</handler-chain-name>"); + for (DDHandler handler : handlers) + { + handler.writeTo(writer); + } + writer.write("</handler-chain>"); + } +} \ No newline at end of file Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/sunjaxws/DDHandlerChain.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,209 @@ +/* + * 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.wsf.stack.metro.tools; + +import java.io.PrintStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.Locale; + +class NullPrintStream extends PrintStream +{ + NullPrintStream() + { + // Doesn't actually do anything + super(new ByteArrayOutputStream()); + } + + @Override + public PrintStream append(char c) + { + return this; + } + + @Override + public PrintStream append(CharSequence csq, int start, int end) + { + return this; + } + + @Override + public PrintStream append(CharSequence csq) + { + return this; + } + + @Override + public boolean checkError() + { + return false; + } + + @Override + public void close() + { + } + + @Override + public void flush() + { + } + + @Override + public PrintStream format(Locale l, String format, Object... args) + { + return this; + } + + @Override + public PrintStream format(String format, Object... args) + { + return this; + } + + @Override + public void print(boolean b) + { + } + + @Override + public void print(char c) + { + } + + @Override + public void print(char[] s) + { + } + + @Override + public void print(double d) + { + } + + @Override + public void print(float f) + { + } + + @Override + public void print(int i) + { + } + + @Override + public void print(long l) + { + } + + @Override + public void print(Object obj) + { + } + + @Override + public void print(String s) + { + } + + @Override + public PrintStream printf(Locale l, String format, Object... args) + { + return this; + } + + @Override + public PrintStream printf(String format, Object... args) + { + return this; + } + + @Override + public void println() + { + } + + @Override + public void println(boolean x) + { + } + + @Override + public void println(char x) + { + } + + @Override + public void println(char[] x) + { + } + + @Override + public void println(double x) + { + } + + @Override + public void println(float x) + { + } + + @Override + public void println(int x) + { + } + + @Override + public void println(long x) + { + } + + @Override + public void println(Object x) + { + } + + @Override + public void println(String x) + { + } + + @Override + protected void setError() + { + } + + @Override + public void write(byte[] buf, int off, int len) + { + } + + @Override + public void write(int b) + { + } + + @Override + public void write(byte[] b) throws IOException + { + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/NullPrintStream.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,38 @@ +/* + * 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.wsf.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumerFactory; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +/** + * Creates a WSContractConsumer that delegates to the Sun RI. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision:2311 $ + */ +public class SunRIConsumerFactoryImpl implements WSContractConsumerFactory +{ + public WSContractConsumer createConsumer() { + return new SunRIConsumerImpl(); + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,203 @@ +/* + * 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.wsf.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import java.io.File; +import java.io.PrintStream; +import java.util.List; +import java.util.ArrayList; +import java.net.URL; + +import com.sun.tools.ws.wscompile.WsimportTool; + +/** + * WSContractConsumer that delegates to the Sun CompileTool. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a> + * @version $Revision$ + */ +public class SunRIConsumerImpl extends WSContractConsumer +{ + private List<File> bindingFiles = null; + private File catalog = null; + private boolean generateSource = false; + private File outputDir = new File("output"); + private File sourceDir = null; + private String targetPackage = null; + private PrintStream messageStream = null; + private String wsdlLocation = null; + private List<String> additionalCompilerClassPath = new ArrayList<String>(); + private String target = "2.0"; + + @Override + public void setBindingFiles(List<File> bindingFiles) { + this.bindingFiles = bindingFiles; + } + + @Override + public void setCatalog(File catalog) { + this.catalog = catalog; + } + + @Override + public void setGenerateSource(boolean generateSource) { + this.generateSource = generateSource; + } + + @Override + public void setMessageStream(PrintStream messageStream) { + // TODO Auto-generated method stub + this.messageStream = messageStream; + } + + @Override + public void setOutputDirectory(File directory) { + // TODO Auto-generated method stub + outputDir = directory; + } + + @Override + public void setSourceDirectory(File directory) { + sourceDir = directory; + } + + @Override + public void setTargetPackage(String targetPackage) { + this.targetPackage = targetPackage; + } + + @Override + public void setWsdlLocation(String wsdlLocation) { + this.wsdlLocation = wsdlLocation; + } + + public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) { + this.additionalCompilerClassPath = additionalCompilerClassPath; + } + + @Override + public void setTarget(String target) { + this.target = target; + } + + @Override + public void consume(URL wsdl) { + List<String> args = new ArrayList<String>(); + if (bindingFiles != null) { + for (File file : bindingFiles) { + args.add("-b"); + args.add(file.getAbsolutePath()); + + } + } + + if (catalog != null) { + args.add("-catalog"); + args.add(catalog.getAbsolutePath()); + } + + if (generateSource) { + args.add("-keep"); + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + } + + if (targetPackage != null) { + args.add("-p"); + args.add(targetPackage); + } + + if (wsdlLocation != null) { + args.add("-wsdllocation"); + args.add(wsdlLocation); + } + + PrintStream stream = messageStream; + if (stream != null) { + args.add("-verbose"); + } else { + stream = new NullPrintStream(); + } + + if (!outputDir.exists() && !outputDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + outputDir.getName()); + + // Always add the output directory and the wsdl location + args.add("-d"); + args.add(outputDir.getAbsolutePath()); + + // Always set the target + if(!target.equals("2.0")) + throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0"); + + args.add("-target"); + args.add(target); + + // finally the WSDL file + args.add(wsdl.toString()); + + // See WsimportTool#compileGeneratedClasses() + if(!additionalCompilerClassPath.isEmpty()) + { + StringBuffer javaCP = new StringBuffer(); + for(String s : additionalCompilerClassPath) + { + javaCP.append(s).append(File.pathSeparator); + } + System.setProperty("java.class.path", javaCP.toString()); + } + + try + { + // enforce woodstox + if(null == System.getProperty("javax.xml.stream.XMLInputFactory")) + System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); + + WsimportTool compileTool = new WsimportTool(stream); + boolean success = compileTool.run(args.toArray(new String[0])); + + if(!success) throw new IllegalStateException("WsImport invocation failed"); + } + catch (Throwable t) + { + if (messageStream != null) + { + messageStream.println("Failed to invoke WsImport"); + t.printStackTrace(messageStream); + } + else + { + t.printStackTrace(); + } + } + + } + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIConsumerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,39 @@ +/* + * 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.wsf.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractProviderFactory; +import org.jboss.wsf.spi.tools.WSContractProvider; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class SunRIProviderFactoryImpl implements WSContractProviderFactory +{ + public WSContractProvider createProvider(ClassLoader loader) + { + WSContractProvider sunRIProvider = new SunRIProviderImpl(); + sunRIProvider.setClassLoader(loader); + return sunRIProvider; + } +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java (rev 0) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,193 @@ +/* + * 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.wsf.stack.metro.tools; + +import org.jboss.wsf.spi.tools.WSContractProvider; + +import java.io.File; +import java.io.PrintStream; +import java.util.List; +import java.util.ArrayList; +import java.net.URLClassLoader; +import java.net.URL; + +import com.sun.tools.ws.wscompile.WsgenTool; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class SunRIProviderImpl extends WSContractProvider +{ + + private ClassLoader loader; + private boolean generateWsdl = false; + private boolean generateSource = false; + private File outputDir = new File("output"); + private File resourceDir = null; + private File sourceDir = null; + private PrintStream messageStream = new NullPrintStream(); + + public SunRIProviderImpl() + { + } + + public void setGenerateWsdl(boolean generateWsdl) + { + this.generateWsdl = generateWsdl; + } + + public void setGenerateSource(boolean generateSource) + { + this.generateSource = generateSource; + } + + public void setOutputDirectory(File directory) + { + this.outputDir = directory; + } + + public void setResourceDirectory(File directory) + { + this.resourceDir = directory; + } + + public void setSourceDirectory(File directory) + { + this.sourceDir = directory; + } + + public void setClassLoader(ClassLoader loader) + { + this.loader = loader; + } + + public void setMessageStream(PrintStream messageStream) + { + this.messageStream = messageStream; + } + + public void provide(String endpointClass) + { + try + { + provide(loader.loadClass(endpointClass)); + } + catch (ClassNotFoundException e) + { + throw new IllegalArgumentException("Class not found: " + endpointClass); + } + } + + public void provide(Class<?> endpointClass) + { + // Swap the context classloader + // The '--classpath' switch might provide an URLClassLoader + ClassLoader oldLoader = Thread.currentThread().getContextClassLoader(); + + if(loader!=null) + Thread.currentThread().setContextClassLoader(loader); + + try + { + List<String> args = new ArrayList<String>(); + + // Use the output directory as the default + File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir; + File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir; + + if (generateSource) { + args.add("-keep"); + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + } + + // -d <directory> + if (!outputDir.exists() && !outputDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + outputDir.getName()); + + args.add("-d"); + args.add(outputDir.getAbsolutePath()); + + // -r <directory> + if (resourceDir != null) { + if (!resourceDir.exists() && !resourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + resourceDir.getName()); + args.add("-r"); + args.add(resourceDir.getAbsolutePath()); + } + + // -s <directory> + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + + // -verbose + PrintStream stream = messageStream; + if (stream != null) { + args.add("-verbose"); + } else { + stream = new NullPrintStream(); + } + + // -wsdl[:protocol] + if (generateWsdl) { + args.add("-wsdl"); + } + + // --classpath + if(loader instanceof URLClassLoader) + { + StringBuilder builder = new StringBuilder(); + URLClassLoader urlLoader = (URLClassLoader)loader; + for(URL url : urlLoader.getURLs()) + { + builder.append(url.toExternalForm()); + builder.append(File.pathSeparator); + } + + args.add("-classpath"); + args.add(builder.toString()); + } + + // the SEI + args.add(endpointClass.getCanonicalName()); + + WsgenTool tool = new WsgenTool(messageStream); + tool.run(args.toArray(new String[0])); + + } + finally{ + Thread.currentThread().setContextClassLoader(oldLoader); + } + } + + +} Property changes on: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/SunRIProviderImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1 @@ +org.jboss.wsf.stack.metro.tools.SunRIConsumerFactoryImpl \ No newline at end of file Added: stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-metro-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1 @@ +org.jboss.wsf.stack.metro.tools.SunRIProviderFactoryImpl \ No newline at end of file Added: stack/metro/trunk/src/main/resources/jbossws-metro-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-config.xml (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1,130 @@ + +  + <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> + +  + <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </property> + </bean> + +  + <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> + <property name="recording">false</property> + </bean> + <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> + <property name="recording">false</property> + </bean> + +  + <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties</property> + <property name="contextProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry> + </map> + </property> + </bean> + + <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler</property> + <property name="provides">StackEndpointHandler</property> + </bean> + + <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + <property name="requires">RegisteredEndpoint</property> + <property name="provides">EndpointRecordProcessors</property> + <property name="processors"> + <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> + <inject bean="WSMemoryBufferRecorder"/> + <inject bean="WSLogRecorder"/> + </list> + </property> + </bean> + + <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">StackDescriptor</property> + </bean> + + <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect"> + <property name="requires">RuntimeLoader, StackDescriptor</property> + <property name="provides">RuntimeModel</property> + </bean> +  + +  + <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroContextPropertiesDeploymentAspect"/> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + +  + <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSRuntimeModelDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + + <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroContextPropertiesDeploymentAspect"/> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + <inject bean="WSRuntimeModelDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerEJB</depends> + </bean> Property changes on: stack/metro/trunk/src/main/resources/jbossws-metro-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1 @@ +org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl \ No newline at end of file Added: stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1 @@ +org.jboss.wsf.stack.metro.EndpointRegistryFactoryImpl \ No newline at end of file Added: stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-metro.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-02-15 11:12:01 UTC (rev 5693) @@ -0,0 +1 @@ +org.jboss.wsf.stack.metro.client.ServiceRefBinderFactoryImpl \ No newline at end of file Deleted: stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/src/main/resources/jbossws-sunri-config.xml 2008-02-15 11:12:01 UTC (rev 5693) @@ -1,130 +0,0 @@ - -  - <bean name="WSServerConfig" class="org.jboss.wsf.stack.sunri.MetroServerConfig"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - -  - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - -  - </bean> - -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - -  - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>javax.enterprise.resource.webservices.jaxws</value> - <value>com.sun</value> - </list> - </property> - </bean> - -  - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - -  - <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry> - </map> - </property> - </bean> - - <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - </bean> - - <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect"> - <property name="requires">URLPattern</property> - <property name="provides">StackDescriptor</property> - </bean> - - <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.sunri.metadata.RuntimeModelDeploymentAspect"> - <property name="requires">RuntimeLoader, StackDescriptor</property> - <property name="provides">RuntimeModel</property> - </bean> -  - -  - <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - -  - <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> - </bean> - - <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-02-15 11:11:56 UTC (rev 5692) +++ stack/metro/trunk/version.properties 2008-02-15 11:12:01 UTC (rev 5693) @@ -16,7 +16,7 @@ # Thirdparty library versions jbossws-spi=1.0.1.GA jbossws-common=1.0.3.GA -jbossws-framework=3.0.0.GA +jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA junit=3.8.1

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5692 - in framework/trunk/hudson/hudson-home/jobs: Metro-Core-AS-4.2.3 and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 06:11:56 -0500 (Fri, 15 Feb 2008) New Revision: 5692 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml Log: CVS_USER=`whoami` Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Core-AS-4.2.2 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Core-AS-4.2.3 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Core-AS-5.0.0 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Core-AS-5.0.1 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Distro-AS-4.2.2 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Distro-AS-4.2.3 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Distro-AS-5.0.0 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Distro-AS-5.0.1 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Integration-AS-4.2.2 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Integration-AS-4.2.3 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Integration-AS-5.0.0 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-15 11:01:35 UTC (rev 5691) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-15 11:11:56 UTC (rev 5692) @@ -9,13 +9,14 @@ MODULE=Metro-Integration-AS-5.0.1 WORKSPACE=`pwd` +CVS_USER=`whoami` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER" # # stop jbossas

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5691 - framework/trunk/hudson/hudson-home.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 06:01:35 -0500 (Fri, 15 Feb 2008) New Revision: 5691 Modified: framework/trunk/hudson/hudson-home/config.xml Log: Define Native TCK view Modified: framework/trunk/hudson/hudson-home/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/config.xml 2008-02-15 10:59:38 UTC (rev 5690) +++ framework/trunk/hudson/hudson-home/config.xml 2008-02-15 11:01:35 UTC (rev 5691) @@ -46,7 +46,7 @@ <![CDATA[ Run the JBossAS webservice testsuite. <p/> - Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> and TCK 14 + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> ]]> </description> </view> @@ -76,17 +76,33 @@ <string>Native-Integration-AS-4.2.3</string> <string>Native-Integration-AS-5.0.0</string> <string>Native-Integration-AS-5.0.1</string> + </jobNames> + <name>Native Tests</name> + <description> +<![CDATA[ + Run the JBossWS testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> <string>Native-Tck14-Jaxr-AS-4.2.3</string> <string>Native-Tck14-Jaxrpc-AS-4.2.3</string> <string>Native-Tck14-Saaj-AS-4.2.3</string> <string>Native-Tck14-Webservices-AS-4.2.3</string> </jobNames> - <name>Native Tests</name> + <name>Native TCK Tests</name> <description> <![CDATA[ - Run the JBossWS testsuite. + Run the WebService TCK. <p/> - Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> and <a href="/hudson/job/TCK-1.4">TCK-1.4</a> ]]> </description> </view>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5690 - framework/trunk/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 05:59:38 -0500 (Fri, 15 Feb 2008) New Revision: 5690 Modified: framework/trunk/src/main/etc/wsconsume.sh framework/trunk/src/main/etc/wsprovide.sh Log: [JBWS-1994] refactoring Modified: framework/trunk/src/main/etc/wsconsume.sh =================================================================== --- framework/trunk/src/main/etc/wsconsume.sh 2008-02-15 10:43:42 UTC (rev 5689) +++ framework/trunk/src/main/etc/wsconsume.sh 2008-02-15 10:59:38 UTC (rev 5690) @@ -65,7 +65,7 @@ LIBDIR=$PARENT/lib fi -# Is it a JBossWS-native or SunRI installation? +# Is it a JBossWS-native or Metro installation? if [ -f $LIBDIR/jbossws-client.jar ]; then JBOSSWS_NATIVE="true" fi @@ -98,8 +98,8 @@ # stack specific dependencies if [ "x$JBOSSWS_NATIVE" = "x" ]; then - echo "JBossWS-SunRI stack deployed" - WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" + echo "JBossWS-Metro stack deployed" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" else echo "JBossWS-Native stack deployed" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar" Modified: framework/trunk/src/main/etc/wsprovide.sh =================================================================== --- framework/trunk/src/main/etc/wsprovide.sh 2008-02-15 10:43:42 UTC (rev 5689) +++ framework/trunk/src/main/etc/wsprovide.sh 2008-02-15 10:59:38 UTC (rev 5690) @@ -65,7 +65,7 @@ LIBDIR=$PARENT/lib fi -# is it a JBossWS-native or SunRI installation? +# is it a JBossWS-native or Metro installation? if [ -f $LIBDIR/jbossws-client.jar ]; then JBOSSWS_NATIVE="true" fi @@ -98,8 +98,8 @@ # stack specific dependencies if [ "x$JBOSSWS_NATIVE" = "x" ]; then - echo "JBossWS-SunRI stack deployed" - WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar" + echo "JBossWS-Metro stack deployed" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5689 - framework/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 05:43:42 -0500 (Fri, 15 Feb 2008) New Revision: 5689 Modified: framework/trunk/ant.properties.example Log: Remove redundant jdk16 def Modified: framework/trunk/ant.properties.example =================================================================== --- framework/trunk/ant.properties.example 2008-02-15 10:35:20 UTC (rev 5688) +++ framework/trunk/ant.properties.example 2008-02-15 10:43:42 UTC (rev 5689) @@ -3,9 +3,6 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ -# JDK settings -#java.home.jdk16=/usr/java/jdk1.6 - # The JBoss settings jboss.server.instance=default jboss.bind.address=localhost

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5688 - in framework/trunk/hudson/hudson-home/jobs: Metro-Core-AS-4.2.3 and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 05:35:20 -0500 (Fri, 15 Feb 2008) New Revision: 5688 Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml Log: Use defined cvs.user=tdiesler Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -14,10 +14,8 @@ STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -JBOSS_INSTANCE=$JBOSS500_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE" +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -14,10 +14,8 @@ STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS500_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -JBOSS422_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -JBOSS_INSTANCE=$JBOSS500_INSTANCE -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS500_INSTANCE -Djboss422.home=$JBOSS422_INSTANCE" +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-15 09:24:49 UTC (rev 5687) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-02-15 10:35:20 UTC (rev 5688) @@ -15,7 +15,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=tdiesler" # # stop jbossas

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5687 - in stack/metro/trunk: ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-02-15 04:24:49 -0500 (Fri, 15 Feb 2008) New Revision: 5687 Added: stack/metro/trunk/ant-import/macros-deploy-metro.xml Removed: stack/metro/trunk/ant-import/macros-deploy-sunri.xml Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/build-metro.xml stack/metro/trunk/ant-import/build-release.xml stack/metro/trunk/ant-import/build-testsuite.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/build.xml stack/metro/trunk/src/main/distro/bin-dist-build.xml stack/metro/trunk/src/main/distro/bin-dist-deploy.xml stack/metro/trunk/src/main/etc/bin-dist-build.xml stack/metro/trunk/src/main/etc/bin-dist-deploy.xml Log: [JBWS-1994] refactored macro names and properties Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -22,7 +22,7 @@  <property name="dist.name" value="${specification.version}-metro-${version.id}"/> - <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-dist"/> + <property name="bindist.dir" value="${metro.output.dir}/jbossws-metro-dist"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> @@ -38,27 +38,27 @@ <mkdir dir="${bindist.tools.dir}"/>  - <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties" file="${metro.distro.dir}/ant.properties.example"> <filterset> - <filtersfile file="${sunri.dir}/ant.properties"/> + <filtersfile file="${metro.dir}/ant.properties"/> </filterset> </copy> - <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/> + <copy tofile="${bindist.dir}/version.properties" file="${metro.dir}/version.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${metro.distro.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${metro.distro.dir}/bin-dist-deploy.xml"/>  <copy todir="${bindist.build.dir}"> - <fileset dir="${sunri.dir}/ant-import"> + <fileset dir="${metro.dir}/ant-import"> <include name="macros-deploy-framework.xml"/> - <include name="macros-deploy-sunri.xml"/> + <include name="macros-deploy-metro.xml"/> </fileset> </copy> <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> <copy todir="${bindist.bin.dir}"> - <fileset dir="${sunri.dir}/src/main/etc"> + <fileset dir="${metro.dir}/src/main/etc"> <include name="*.sh"/> <include name="*.bat"/> </fileset> @@ -68,22 +68,22 @@  <copy todir="${bindist.docs.dir}"> - <fileset dir="${sunri.output.dir}"> + <fileset dir="${metro.output.dir}"> <include name="apidocs/**"/> </fileset> </copy> <copy todir="${bindist.docs.dir}" filtering="yes"> - <fileset dir="${sunri.distro.dir}"> + <fileset dir="${metro.distro.dir}"> <include name="Install.txt"/> <include name="ReleaseNotes.txt"/> </fileset> <filterset> - <filtersfile file="${sunri.dir}/version.properties"/> + <filtersfile file="${metro.dir}/version.properties"/> </filterset> </copy> <copy todir="${bindist.docs.dir}"> - <fileset dir="${sunri.etc.dir}"> + <fileset dir="${metro.etc.dir}"> <include name="JBossORG-EULA.txt"/> </fileset> </copy> @@ -96,7 +96,7 @@ <include name="jbossws-framework-scripts.zip"/> <include name="jbossws-spi.jar"/> </fileset> - <fileset dir="${sunri.dir}/output/lib"> + <fileset dir="${metro.dir}/output/lib"> <include name="jbossws-context.war"/> <include name="jbossws-sunri.jar"/> <include name="jbossws-sunri-client.jar"/> @@ -131,26 +131,26 @@  <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${sunri.dir}/src/test-framework"/> - <fileset dir="${sunri.dir}/src/test"> + <fileset dir="${metro.dir}/src/test-framework"/> + <fileset dir="${metro.dir}/src/test"> <include name="resources/test-excludes-*.txt"/> </fileset> </copy>  <copy todir="${bindist.tools.dir}" overwrite="true"> - <fileset dir="${sunri.dir}/tools/ant"/> + <fileset dir="${metro.dir}/tools/ant"/> </copy> <copy todir="${bindist.dir}" overwrite="true"> - <fileset dir="${sunri.dir}"> + <fileset dir="${metro.dir}"> <include name="build.bat"/> <include name="build.sh"/> </fileset> </copy> <chmod file="${bindist.dir}/build.sh" perm="+x"/> - <zip destfile="${sunri.output.dir}/${dist.name}.zip"> - <fileset dir="${sunri.output.dir}" includes="jbossws-metro-dist/**"/> + <zip destfile="${metro.output.dir}/${dist.name}.zip"> + <fileset dir="${metro.output.dir}" includes="jbossws-metro-dist/**"/> </zip> </target> Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -13,25 +13,25 @@ <project> - <import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml"/> - <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> + <import file="${int.metro.dir}/ant-import/macros-deploy-framework.xml"/> + <import file="${int.metro.dir}/ant-import/macros-deploy-metro.xml"/>    - <target name="deploy-jboss422" depends="jars-jboss422,undeploy-jboss422" description="Deploy jbossws/sunri to jboss42"> - <macro-deploy-sunri422 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <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.sunri.dir}/thirdparty" + thirdpartylibs="${int.metro.dir}/thirdparty" jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri422/> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/metro from jboss42"> + <macro-undeploy-metro422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> @@ -39,18 +39,18 @@   - <target name="deploy-jboss423" depends="jars-jboss423, undeploy-jboss423" description="Deploy jbossws/sunri to jboss42"> - <macro-deploy-sunri423 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <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.sunri.dir}/thirdparty" + thirdpartylibs="${int.metro.dir}/thirdparty" jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri423/> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/metro from jboss42"> + <macro-undeploy-metro423/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> @@ -58,18 +58,18 @@   - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/sunri to jboss50"> - <macro-deploy-sunri500 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <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.sunri.dir}/thirdparty" + thirdpartylibs="${int.metro.dir}/thirdparty" jbosshome="${jboss500.home}"/> </target> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri500/> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss50"> + <macro-undeploy-metro500/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> @@ -77,18 +77,18 @@   - <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/sunri to jboss50"> - <macro-deploy-sunri501 - stacklibs="${int.sunri.dir}/output/lib" - thirdpartylibs="${int.sunri.dir}/thirdparty"/> + <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.sunri.dir}/thirdparty" + thirdpartylibs="${int.metro.dir}/thirdparty" jbosshome="${jboss501.home}"/> </target> - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri501/> + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss50"> + <macro-undeploy-metro501/> <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> Modified: stack/metro/trunk/ant-import/build-metro.xml =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -14,13 +14,13 @@ <project basedir="." name="Build-Metro"> <property name="cvs.dir" value="cvs"/> - <property name="metro.dir" value="${cvs.dir}/wsit/wsit"/> + <property name="metro.repository.dir" value="${cvs.dir}/wsit/wsit"/> <macrodef name="antbridge"> <attribute name="target" default="main"/> <attribute name="file" default="build.xml"/> <sequential> - <exec dir="${metro.dir}" executable="ant" failonerror="true"> + <exec dir="${metro.repository.dir}" executable="ant" failonerror="true"> <arg value="@{target}"/> <arg value="-f"/> <arg value="@{file}"/> @@ -61,7 +61,7 @@ </target> <target name="-install.adapter" depends="init"> - <copy todir="${metro.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/> + <copy todir="${metro.repository.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/> </target> <target name="clean.metro" description="Cleanup the metro native build"> Modified: stack/metro/trunk/ant-import/build-release.xml =================================================================== --- stack/metro/trunk/ant-import/build-release.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/build-release.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -20,12 +20,12 @@ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.sunri.dir}/output/lib"> + <fileset dir="${int.metro.dir}/output/lib"> <include name="jbossws-sunri50.sar"/> <include name="jbossws-sunri50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/component-info.xml" file="${sunri.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/component-info.xml" file="${metro.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: stack/metro/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import/build-testsuite.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/build-testsuite.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -10,12 +10,12 @@ <project> - <property name="tests.output.dir" value="${int.sunri.dir}/output/tests"/> + <property name="tests.output.dir" value="${int.metro.dir}/output/tests"/> - <import file="${int.sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${int.metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>  - <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${int.metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>   @@ -24,30 +24,30 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxrpc-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/http.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxrpc-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jsr173_api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jsr250-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jbossws-sunri-client.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/> </path> </target> @@ -57,8 +57,8 @@  <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${int.sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.sunri.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.metro.dir}/src/test/java" excludesfile="${excludesfile}"/> </target>  @@ -67,12 +67,12 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.sunri.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${int.sunri.dir}/src/test"/> + <macro-copy-resources srcdir="${int.metro.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${int.metro.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -13,7 +13,7 @@ <project> - <property file="${int.sunri.dir}/version.properties"/> + <property file="${int.metro.dir}/version.properties"/>   @@ -23,8 +23,8 @@ </target> <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${int.sunri.dir}/thirdparty"/> - <checksum file="${int.sunri.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <property name="thirdparty.dir" value="${int.metro.dir}/thirdparty"/> + <checksum file="${int.metro.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> <or> <not> @@ -78,13 +78,13 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/> + <checksum file="${int.metro.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get">  - <path id="sunri.integration.classpath"> + <path id="metro.integration.classpath">  <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> @@ -104,8 +104,8 @@ </path>  - <path id="sunri50.integration.classpath"> - <path refid="sunri.integration.classpath"/> + <path id="metro50.integration.classpath"> + <path refid="metro.integration.classpath"/> <pathelement location="${jboss500.server.lib}/jboss.jar"/> </path> Added: stack/metro/trunk/ant-import/macros-deploy-metro.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-metro.xml (rev 0) +++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -0,0 +1,279 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <patternset id="client.stack.patternset"> + <include name="jbossws-sunri-client.jar"/> + </patternset> + + <patternset id="client.patternset"> + <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="jaxws-api.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> + <include name="jsr181-api.jar"/> + <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"> + <include name="jaxws-api.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + </patternset> + +  +  +  + + <macrodef name="macro-deploy-metro422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <patternset refid="client.stack.patternset"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + </fileset> + </copy> + <copy todir="${jboss422.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="lib.patternset"/> + </fileset> + </copy> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-metro422"> + <sequential> + <delete> +  + <fileset dir="${jboss422.home}/client"> + <patternset refid="client.stack.patternset"/> + <patternset refid="client.patternset"/> + </fileset> + +  + <fileset dir="${jboss422.home}/lib"> + <patternset refid="lib.patternset"/> + </fileset> + </delete> + + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-metro423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <patternset refid="client.stack.patternset"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + </fileset> + </copy> + <copy todir="${jboss423.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="lib.patternset"/> + </fileset> + </copy> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-metro423"> + <sequential> + <delete> +  + <fileset dir="${jboss423.home}/client"> + <patternset refid="client.stack.patternset"/> + <patternset refid="client.patternset"/> + </fileset> + +  + <fileset dir="${jboss423.home}/lib"> + <patternset refid="lib.patternset"/> + </fileset> + </delete> + + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-metro500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + +  + <copy todir="${jboss500.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <patternset refid="client.stack.patternset"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + </fileset> + </copy> + +  + <copy todir="${jboss500.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="lib.patternset"/> + </fileset> + </copy> + +  + <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="serverlib.patternset"/> + </fileset> + </copy> + + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-metro500"> + <sequential> + <delete> +  + <fileset dir="${jboss500.home}/client"> + <patternset refid="client.stack.patternset"/> + <patternset refid="client.patternset"/> + </fileset> + +  + <fileset dir="${jboss500.home}/lib"> + <patternset refid="lib.patternset"/> + </fileset> + +  + <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> + <patternset refid="serverlib.patternset"/> + </fileset> + </delete> + + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-metro501"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + +  + <copy todir="${jboss501.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <patternset refid="client.stack.patternset"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="client.patternset"/> + </fileset> + </copy> + +  + <copy todir="${jboss501.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="lib.patternset"/> + </fileset> + </copy> + +  + <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="serverlib.patternset"/> + </fileset> + </copy> + + <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> + <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-metro501"> + <sequential> + <delete> +  + <fileset dir="${jboss501.home}/client"> + <patternset refid="client.stack.patternset"/> + <patternset refid="client.patternset"/> + </fileset> + +  + <fileset dir="${jboss501.home}/lib"> + <patternset refid="lib.patternset"/> + </fileset> + +  + <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib"> + <patternset refid="serverlib.patternset"/> + </fileset> + </delete> + + <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> Property changes on: stack/metro/trunk/ant-import/macros-deploy-metro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: stack/metro/trunk/ant-import/macros-deploy-sunri.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import/macros-deploy-sunri.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -1,279 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <patternset id="client.stack.patternset"> - <include name="jbossws-sunri-client.jar"/> - </patternset> - - <patternset id="client.patternset"> - <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="jaxws-api.jar"/> - <include name="streambuffer.jar"/> - <include name="stax-ex.jar"/> - <include name="jsr181-api.jar"/> - <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"> - <include name="jaxws-api.jar"/> - <include name="jsr181-api.jar"/> - <include name="saaj-api.jar"/> - </patternset> - -  -  -  - - <macrodef name="macro-deploy-sunri422"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <copy todir="${jboss422.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - <copy todir="${jboss422.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/> - <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - -  - <macrodef name="macro-undeploy-sunri422"> - <sequential> - <delete> -  - <fileset dir="${jboss422.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - </fileset> - -  - <fileset dir="${jboss422.home}/lib"> - <patternset refid="lib.patternset"/> - </fileset> - </delete> - - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-sunri423"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <copy todir="${jboss423.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - <copy todir="${jboss423.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri42.sar"/> - <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - -  - <macrodef name="macro-undeploy-sunri423"> - <sequential> - <delete> -  - <fileset dir="${jboss423.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - </fileset> - -  - <fileset dir="${jboss423.home}/lib"> - <patternset refid="lib.patternset"/> - </fileset> - </delete> - - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-sunri500"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - -  - <copy todir="${jboss500.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - -  - <copy todir="${jboss500.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - -  - <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="serverlib.patternset"/> - </fileset> - </copy> - - <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> - <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - -  - <macrodef name="macro-undeploy-sunri500"> - <sequential> - <delete> -  - <fileset dir="${jboss500.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - </fileset> - -  - <fileset dir="${jboss500.home}/lib"> - <patternset refid="lib.patternset"/> - </fileset> - -  - <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> - <patternset refid="serverlib.patternset"/> - </fileset> - </delete> - - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-sunri501"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - -  - <copy todir="${jboss501.home}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.stack.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - -  - <copy todir="${jboss501.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - -  - <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="serverlib.patternset"/> - </fileset> - </copy> - - <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> - <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> - </sequential> - </macrodef> - -  - <macrodef name="macro-undeploy-sunri501"> - <sequential> - <delete> -  - <fileset dir="${jboss501.home}/client"> - <patternset refid="client.stack.patternset"/> - <patternset refid="client.patternset"/> - </fileset> - -  - <fileset dir="${jboss501.home}/lib"> - <patternset refid="lib.patternset"/> - </fileset> - -  - <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib"> - <patternset refid="serverlib.patternset"/> - </fileset> - </delete> - - <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -</project> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -10,15 +10,15 @@ <project> - <property name="tests.output.dir" value="${sunri.dir}/output/tests"/> + <property name="tests.output.dir" value="${metro.dir}/output/tests"/> - <import file="${sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>  <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - <property name="tests.dir" value="${sunri.dir}/src/test"/> + <property name="tests.dir" value="${metro.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> <property name="tests.resources.dir" value="${tests.dir}/resources"/> @@ -28,36 +28,36 @@ <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/http.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty-gen/jboss-wsit-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/mimepull.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.metro.dir}/thirdparty-gen/jboss-wsit-tools.jar"/> + <pathelement location="${int.metro.dir}/thirdparty-gen/jboss-wsit-rt.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/> -  - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> +  + <pathelement location="${int.metro.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty-gen/xws-security.jar"/> + <pathelement location="${int.metro.dir}/thirdparty-gen/xws-security.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jbossws-sunri-client.jar"/> + <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/> </path> <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> @@ -104,8 +104,8 @@ <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources"> <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${sunri.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/> </target>  @@ -114,13 +114,13 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${sunri.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${sunri.dir}/src/test"/> + <macro-copy-resources srcdir="${metro.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${metro.dir}/src/test"/> </target> <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> - <ant antfile="${sunri.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/build.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -13,7 +13,7 @@ <project default="main" basedir="." name="JBossWS-SunRI"> - <property name="int.sunri.dir" value="${basedir}"/> + <property name="int.metro.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> @@ -25,17 +25,17 @@   - <property name="sunri.dir" value="${int.sunri.dir}"/> - <property name="sunri.src.dir" value="${sunri.dir}/src/main"/> - <property name="sunri.distro.dir" value="${sunri.src.dir}/distro"/> - <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/> - <property name="sunri.java.dir" value="${sunri.src.dir}/java"/> - <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/> - <property name="sunri.output.dir" value="${sunri.dir}/output"/> - <property name="sunri.output.apidocs.dir" value="${sunri.output.dir}/apidocs"/> - <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/> - <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/> - <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/> + <property name="metro.dir" value="${int.metro.dir}"/> + <property name="metro.src.dir" value="${metro.dir}/src/main"/> + <property name="metro.distro.dir" value="${metro.src.dir}/distro"/> + <property name="metro.etc.dir" value="${metro.src.dir}/etc"/> + <property name="metro.java.dir" value="${metro.src.dir}/java"/> + <property name="metro.resources.dir" value="${metro.src.dir}/resources"/> + <property name="metro.output.dir" value="${metro.dir}/output"/> + <property name="metro.output.apidocs.dir" value="${metro.output.dir}/apidocs"/> + <property name="metro.output.classes.dir" value="${metro.output.dir}/classes"/> + <property name="metro.output.etc.dir" value="${metro.output.dir}/etc"/> + <property name="metro.output.lib.dir" value="${metro.output.dir}/lib"/> <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> @@ -46,7 +46,7 @@  <target name="init" depends="prepare,thirdparty"> - <mkdir dir="${sunri.output.apidocs.dir}"/> + <mkdir dir="${metro.output.apidocs.dir}"/> </target>  @@ -66,19 +66,19 @@  <target name="compile-classes" depends="compile-classes-sunri"/> <target name="compile-classes-sunri" depends="init"> - <mkdir dir="${sunri.output.classes.dir}"/> - <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <mkdir dir="${metro.output.classes.dir}"/> + <javac srcdir="${metro.java.dir}" sourcepath="" destdir="${metro.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/wsf/stack/sunri/**"/> - <classpath refid="sunri.integration.classpath"/> + <classpath refid="metro.integration.classpath"/> </javac> </target>  <target name="compile-etc" depends="init"> - <mkdir dir="${sunri.output.etc.dir}"/> - <copy todir="${sunri.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${sunri.etc.dir}"> + <mkdir dir="${metro.output.etc.dir}"/> + <copy todir="${metro.output.etc.dir}" filtering="yes" overwrite="true"> + <fileset dir="${metro.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -87,7 +87,7 @@ <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="${specification.version}-metro-${version.id}"/> - <filtersfile file="${int.sunri.dir}/version.properties"/> + <filtersfile file="${int.metro.dir}/version.properties"/> </filterset> </copy> </target> @@ -105,9 +105,9 @@ <target name="jars-common" depends="build.metro,compile">  - <mkdir dir="${sunri.output.lib.dir}"/> - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.classes.dir}"> + <mkdir dir="${metro.output.lib.dir}"/> + <jar jarfile="${metro.output.lib.dir}/jbossws-sunri.jar" manifest="${metro.output.etc.dir}/default.mf"> + <fileset dir="${metro.output.classes.dir}"> <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> <include name="org/jboss/wsf/stack/sunri/injection/**"/> <include name="org/jboss/wsf/stack/sunri/client/**"/> @@ -115,21 +115,21 @@ <include name="org/jboss/wsf/stack/sunri/log/**"/> <include name="org/jboss/wsf/stack/sunri/*"/> </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/> + <metainf dir="${metro.resources.dir}/jbossws-sunri.jar/META-INF"/> </jar>  - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri-client.jar" manifest="${sunri.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.classes.dir}"> + <jar jarfile="${metro.output.lib.dir}/jbossws-sunri-client.jar" manifest="${metro.output.etc.dir}/default.mf"> + <fileset dir="${metro.output.classes.dir}"> <include name="org/jboss/wsf/stack/sunri/client/**"/> <include name="org/jboss/wsf/stack/sunri/tools/**"/> </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-sunri-client.jar/META-INF"/> + <metainf dir="${metro.resources.dir}/jbossws-sunri-client.jar/META-INF"/> </jar>  - <copy todir="${sunri.output.lib.dir}/jbossws-context.war" filtering="true"> - <fileset dir="${sunri.resources.dir}/jbossws-context.war"> + <copy todir="${metro.output.lib.dir}/jbossws-context.war" filtering="true"> + <fileset dir="${metro.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> <include name="WEB-INF/**"/> @@ -137,33 +137,33 @@ <filterset> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="${specification.version}-metro-${version.id}"/> - <filtersfile file="${sunri.dir}/version.properties"/> + <filtersfile file="${metro.dir}/version.properties"/> </filterset> </copy>  - <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" > - <fileset dir="${sunri.java.dir}"/> + <zip zipfile="${metro.output.lib.dir}/jbossws-sunri-src.zip" > + <fileset dir="${metro.java.dir}"/> </zip> </target> <target name="jars-jboss50" depends="jars-common">  - <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> + <concat destfile="${metro.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> <header trimleading="yes"> <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> - <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> + <fileset file="${metro.resources.dir}/jbossws-sunri-config.xml"/> <footer trimleading="yes"> </deployment> </footer> </concat>  - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> + <jar jarfile="${metro.output.lib.dir}/jbossws-sunri50.sar" manifest="${metro.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.lib.dir}"> + <fileset dir="${metro.output.lib.dir}"> <include name="jbossws-context.war/**"/> <include name="jbossws-context.war"/> </fileset> @@ -192,10 +192,10 @@ <include name="*.jar"/> </fileset> - <fileset dir="${sunri.output.lib.dir}"> + <fileset dir="${metro.output.lib.dir}"> <include name="jbossws-sunri.jar"/> </fileset> - <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50"> + <metainf dir="${metro.output.lib.dir}/jbossws-sunri50"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -203,27 +203,27 @@ <target name="jars-jboss422" depends="jars-common" if="jboss422.home"> - <unzip dest="${sunri.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>  - <concat destfile="${sunri.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml"> + <concat destfile="${metro.output.lib.dir}/jbossws-sunri42/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> </header> - <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> - <fileset file="${sunri.output.dir}/resources/jbossws-jboss42-config.xml"/> + <fileset file="${metro.resources.dir}/jbossws-sunri-config.xml"/> + <fileset file="${metro.output.dir}/resources/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> </concat>  - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf"> - <fileset dir="${sunri.output.lib.dir}"> + <jar jarfile="${metro.output.lib.dir}/jbossws-sunri42.sar" manifest="${metro.output.etc.dir}/default.mf"> + <fileset dir="${metro.output.lib.dir}"> <include name="jbossws-context.war/**"/> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${sunri.output.lib.dir}"> + <fileset dir="${metro.output.lib.dir}"> <include name="jbossws-sunri.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> @@ -254,10 +254,10 @@ </fileset> - <fileset dir="${sunri.output.lib.dir}/jbossws-sunri42"> + <fileset dir="${metro.output.lib.dir}/jbossws-sunri42"> <include name="jbossws.beans/**"/> </fileset> - <metainf dir="${sunri.output.dir}/resources/jbossws-jboss42.sar/META-INF"> + <metainf dir="${metro.output.dir}/resources/jbossws-jboss42.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -274,19 +274,19 @@ <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">  - <mkdir dir="${sunri.output.dir}/thirdparty-sources"/> - <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/> + <mkdir dir="${metro.output.dir}/thirdparty-sources"/> + <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${metro.output.dir}/thirdparty-sources"/> - <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <javadoc destdir="${metro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> <classpath> - <pathelement path="${sunri50.integration.classpath}"/> - <pathelement path="${sunri.integration.classpath}"/> + <pathelement path="${metro50.integration.classpath}"/> + <pathelement path="${metro.integration.classpath}"/> </classpath> - <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> + <packageset dir="${metro.java.dir}" defaultexcludes="yes"> <include name="org/jboss/wsf/**"/> </packageset> - <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes"> + <packageset dir="${metro.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="com/sun/**"/> </packageset> @@ -305,12 +305,12 @@  <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${sunri.output.dir}"/> + <delete dir="${metro.output.dir}"/> <delete dir="thirdparty.gen"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.sunri.dir}/thirdparty"/> + <delete dir="${int.metro.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -87,7 +87,7 @@ <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/macros-deploy-framework.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-metro.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>  Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -17,18 +17,18 @@   -  - <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/sunri to jboss422"> - <macro-deploy-sunri422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> +  + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/metro to jboss422"> + <macro-deploy-metro422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/> </target> -  - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/sunri from jboss422"> - <macro-undeploy-sunri422/> +  + <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/metro from jboss422"> + <macro-undeploy-metro422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -39,18 +39,18 @@   -  - <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/sunri to jboss423"> - <macro-deploy-sunri423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> +  + <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/metro to jboss423"> + <macro-deploy-metro423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/> </target> -  - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/sunri from jboss423"> - <macro-undeploy-sunri423/> +  + <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/metro from jboss423"> + <macro-undeploy-metro423/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -61,18 +61,18 @@   -  - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/sunri to jboss500"> - <macro-deploy-sunri500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> +  + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/metro to jboss500"> + <macro-deploy-metro500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> </target> -  - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500"> - <macro-undeploy-sunri500/> +  + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss500"> + <macro-undeploy-metro500/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> @@ -80,18 +80,18 @@   -  - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/sunri to jboss501"> - <macro-deploy-sunri501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> +  + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/metro to jboss501"> + <macro-deploy-metro501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/> </target> -  - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/sunri from jboss501"> - <macro-undeploy-sunri501/> +  + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss501"> + <macro-undeploy-metro501/> <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> Modified: stack/metro/trunk/src/main/etc/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/src/main/etc/bin-dist-build.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -70,7 +70,7 @@ <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-spi.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-metro.xml"/> <import file="${basedir}/build/macros-deploy-xfire.xml"/>  Modified: stack/metro/trunk/src/main/etc/bin-dist-deploy.xml =================================================================== --- stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2008-02-14 18:24:48 UTC (rev 5686) +++ stack/metro/trunk/src/main/etc/bin-dist-deploy.xml 2008-02-15 09:24:49 UTC (rev 5687) @@ -17,11 +17,11 @@   -  - <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/sunri to jboss422"> +  + <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/metro to jboss422"> <macro-undeploy-native422/> <macro-undeploy-xfire422/> - <macro-deploy-sunri422 + <macro-deploy-metro422 spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" @@ -33,9 +33,9 @@ jbosshome="${jboss422.home}"/> </target> -  - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/sunri from jboss422"> - <macro-undeploy-sunri422/> +  + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/metro from jboss422"> + <macro-undeploy-metro422/> <macro-undeploy-spi jbosshome="${jboss422.home}"/> </target> @@ -43,11 +43,11 @@   -  - <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/sunri to jboss500"> +  + <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/metro to jboss500"> <macro-undeploy-native500/> <macro-undeploy-xfire500/> - <macro-deploy-sunri500 + <macro-deploy-metro500 spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" @@ -59,9 +59,9 @@ jbosshome="${jboss500.home}"/> </target> -  - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/sunri from jboss500"> - <macro-undeploy-sunri500/> +  + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss500"> + <macro-undeploy-metro500/> <macro-undeploy-spi jbosshome="${jboss500.home}"/> </target> @@ -69,11 +69,11 @@   -  - <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws/sunri to jboss501"> +  + <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws/metro to jboss501"> <macro-undeploy-native501/> <macro-undeploy-xfire501/> - <macro-deploy-sunri501 + <macro-deploy-metro501 spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" @@ -85,9 +85,9 @@ jbosshome="${jboss501.home}"/> </target> -  - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/sunri from jboss501"> - <macro-undeploy-sunri501/> +  + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss501"> + <macro-undeploy-metro501/> <macro-undeploy-spi jbosshome="${jboss501.home}"/> </target>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5686 - in stack/native/trunk: ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-14 13:24:48 -0500 (Thu, 14 Feb 2008) New Revision: 5686 Removed: stack/native/trunk/src/main/etc/component-info40.xml Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-release.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/build.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/version.properties Log: Remove support for AS-4.0 Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -101,7 +101,6 @@ <include name="jbossws-framework.jar"/> <include name="jbossws-framework-scripts.zip"/> <include name="jbossws-spi.jar"/> - <include name="jbossws-jboss40.jar"/> <include name="jbossws-jboss421.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/ant-import/build-release.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -89,19 +89,6 @@ </filterset> </copy> -  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-native40/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-native40/${repository.id}/lib" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-native40.sar"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info40.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${core.dir}/version.properties"/> - </filterset> - </copy> </target> <target name="check-svn-externals" depends="init"> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -53,9 +53,6 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> @@ -85,8 +82,8 @@ <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss40}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss40}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxbintros/${jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/build.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -14,12 +14,12 @@  - <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target>  - <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.dir}/resources/jbossws-jboss40-config.xml"/> - <footer trimleading="yes"> - </deployment> - </footer> - </concat> - -  - <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> - <header trimleading="yes"> - <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.dir}/resources/jbossws-jboss40-config-no-ejb3.xml"/> - <footer trimleading="yes"> - </deployment> - </footer> - </concat> - -  - <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war/**"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - <include name="wstx.jar"/> - <include name="jboss-jaxb-intros.jar"/> - </fileset> - <fileset dir="${core.output.lib.dir}/jbossws-native40"> - <include name="jbossws.beans/**"/> - </fileset> - <metainf dir="${core.output.dir}/resources/jbossws-jboss40.sar/META-INF"> - <include name="jboss-service.xml"/> - <include name="jboss-service-no-ejb3.xml"/> - </metainf> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - </jar> - </target> -    Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -168,7 +168,6 @@  <target name="jars-jboss50" depends="prepare"/> <target name="jars-jboss42" depends="prepare"/> - <target name="jars-jboss40" depends="prepare"/>   Deleted: stack/native/trunk/src/main/etc/component-info40.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info40.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/src/main/etc/component-info40.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -1,25 +0,0 @@ -<project name="jboss/jbossws-native40"> - - <component id="jboss/jbossws-native40" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-native40.sar"/> - - <import componentref="jboss/jbossws"> - <compatible version="@repository.id@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss40@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting-jboss40@"/> - </import> - - <export> - </export> - - </component> - -</project> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/version.properties 2008-02-14 18:24:48 UTC (rev 5686) @@ -38,10 +38,6 @@ jboss-jbossxb-jboss42=1.0.0.SP1 jboss-remoting-jboss42=2.2.2.SP4-brew -# JBossAS-4.0 -jboss-jbossxb-jboss40=1.0.0.CR11 -jboss-remoting-jboss40=1.4.3.GA - # Thirdparty library versions apache-ant=1.6.5 apache-collections=3.1

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5685 - stack/cxf/tags/jbossws-3.0-cxf-1.0.0.GA/src.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-14 12:53:00 -0500 (Thu, 14 Feb 2008) New Revision: 5685 Modified: stack/cxf/tags/jbossws-3.0-cxf-1.0.0.GA/src/ Log: Fix svn:externals to reference jbossws-framework-3.0.0.GA Property changes on: stack/cxf/tags/jbossws-3.0-cxf-1.0.0.GA/src ___________________________________________________________________ Name: svn:externals - test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/src/test + test-framework http://anonsvn.jboss.org/repos/jbossws/framework/tags/jbossws-framework-3...

16 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2008