Author: thomas.diesler(a)jboss.com Date: 2007-05-10 17:55:16 -0400 (Thu, 10 May 2007) New Revision: 3045 Added: projects/wsintegration/jbws-jboss50/trunk/ant-import/ projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt projects/wsintegration/sunri-jboss50/trunk/ant-import/ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java Removed: projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/ Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java projects/wsintegration/jbws-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/.classpath projects/wsintegration/sunri-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml projects/wsintegration/sunri-jboss50/trunk/version.properties Log: SunRI first JSE test passes Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.LifecycleHandler; import org.jboss.ws.integration.Service; /** @@ -38,7 +39,9 @@ public void create(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) - ep.getLifecycleHandler().create(ep); + { + getLifecycleHandler(ep, true).create(ep); + } } @Override @@ -46,7 +49,7 @@ { for (Endpoint ep : dep.getService().getEndpoints()) { - ep.getLifecycleHandler().start(ep); + getLifecycleHandler(ep, true).start(ep); } } @@ -58,7 +61,9 @@ { for (Endpoint ep : service.getEndpoints()) { - ep.getLifecycleHandler().stop(ep); + LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false); + if (lifecycleHandler != null) + lifecycleHandler.stop(ep); } } } @@ -71,8 +76,19 @@ { for (Endpoint ep : service.getEndpoints()) { - ep.getLifecycleHandler().destroy(ep); + LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false); + if (lifecycleHandler != null) + lifecycleHandler.destroy(ep); } } } + + private LifecycleHandler getLifecycleHandler(Endpoint ep, boolean assertHandler) + { + LifecycleHandler lifecycleHandler = ep.getLifecycleHandler(); + if (lifecycleHandler == null && assertHandler) + throw new IllegalStateException("LifecycleHandler not initialised"); + + return lifecycleHandler; + } } Copied: projects/wsintegration/jbws-jboss50/trunk/ant-import (from rev 3041, projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import) Deleted: projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project name="JBossWS-Deploy"> - - <!-- ================================================================== --> - <!-- Deployment JBoss50 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> - - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-resources"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-core"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-spi"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}/jbossws-core"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - - <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbossws-context.war" overwrite="true"/> - </target> - -</project> Copied: projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml (from rev 3042, projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml) =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml (rev 0) +++ projects/wsintegration/jbws-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project name="JBossWS-Deploy"> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss50 --> + <target name="deploy" depends="jboss50-jars,remove-jbossws,remove-jbosswsri" description="Deploy jbossws"> + + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-resources"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-spi"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> + <copy file="${jboss50.output.lib.dir}/jbossws50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + </target> + + <!-- Remove jbossws from jboss50 --> + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + </target> + + <!-- Remove jbossws/sunri from jboss50 --> + <target name="remove-jbosswsri" depends="prepare" description="Remove jbossws/sunri"> + + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + </target> + +</project> Modified: projects/wsintegration/jbws-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -13,9 +13,9 @@ <project default="main" basedir="." name="JBossWS-JBoss50"> - <import file="${basedir}/src/main/etc/ant-import/build-deploy.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-release.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> <!-- ================================================================== --> <!-- Setup --> Modified: projects/wsintegration/sunri-jboss50/trunk/.classpath =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/.classpath 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/.classpath 2007-05-10 21:55:16 UTC (rev 3045) @@ -15,5 +15,20 @@ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/> + <classpathentry kind="lib" path="thirdparty/http.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar" sourcepath="thirdparty/jaxws-ri-src.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/> + <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> + <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> + <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Added: projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,6 @@ +# $Id:$ + +WSServletContextListener is final and loads sun-jaxws.xml from context classloader. +We need to provide sun-jaxws.xml dynamically. + +WSServletException is package protected \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/IntegrationIssues.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project name="JBossWS-Deploy"> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/sunri to jboss50 --> + <target name="deploy" depends="jboss50-jars,remove-jbossws" description="Deploy jbossws"> + + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer" src="${jboss50.output.lib.dir}/jbosswsri50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar" src="${jboss50.output.lib.dir}/jbosswsri50.sar"/> + <copy file="${jboss50.output.lib.dir}/jbosswsri50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + </target> + + <!-- Remove jbossws from jboss50 --> + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project default="release" name="JBossWS Release"> + + <!-- Release to jboss.local.repository --> + <target name="release" depends="jboss50-jars" + description="Release to jboss.local.repository"> + + <!-- jboss/jbossws-jboss50 --> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50.jar"/> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> + <include name="jbossws50-src.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jboss50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-release.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project default="thirdparty" name="JBossWS-Thirdparty"> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + + <target name="thirdparty" depends="prepare,jbossws-spi-get,thirdparty-get,thirdparty-classpath"> + </target> + + <!-- + jbossws-spi-get + --> + <target name="jbossws-spi-get" if="force.thirdparty.get" + description="Gets the jbossws-core libraries"> + <mkdir dir="${thirdparty.dir}/jbossws-spi"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + </target> + + <!-- + thirdpartry-get + --> + <target name="thirdparty-get" if="force.thirdparty.get" + description="Gets the thirdparty libraries"> + + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.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"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar" dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar" dest="${thirdparty.dir}/jsr173_api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr250-api.jar" dest="${thirdparty.dir}/jsr250-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> + <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-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.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"/> + </target> + + <target name="thirdparty-classpath" > + + <!-- The compile classpath for jboss50 integration --> + <path id="jboss50.integration.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> + <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-system.jar"/> + <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> + <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> + <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/http.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + </path> + + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/ant-import/build-thirdparty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/wsintegration/sunri-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -13,9 +13,9 @@ <project default="main" basedir="." name="JBossWS-SunRI-JBoss50"> - <import file="${basedir}/src/main/etc/ant-import/build-deploy.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-release.xml"/> - <import file="${basedir}/src/main/etc/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> <!-- ================================================================== --> <!-- Setup --> @@ -170,6 +170,7 @@ <include name="jsr173_api.jar"/> <include name="jsr181-api.jar"/> <include name="jsr250-api.jar"/> + <include name="resolver.jar"/> <include name="saaj-api.jar"/> <include name="saaj-impl.jar"/> <include name="sjsxp.jar"/> Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -23,14 +23,14 @@ //$Id$ -import java.util.Iterator; - -import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.Listener; import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; import org.jboss.metadata.web.Servlet; -import org.jboss.ws.integration.Endpoint; +import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that modifies the web.xml meta data @@ -59,6 +59,20 @@ WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); if (webMetaData != null) { + Listener listener = new Listener(); + listener.setListenerClass(listenerClass); + webMetaData.addListener(listener); + + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws == null) + throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); + + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(WSServletContextListener.SUN_JAXWS_URL); + ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + for (Servlet servlet : webMetaData.getServlets()) { String orgServletClass = servlet.getServletClass(); @@ -70,17 +84,24 @@ continue; } - // Nothing to do if we have an <init-param> - if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getClassLoader())) + if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) { servlet.setServletClass(servletClass); - NameValuePair initParam = new NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass); - servlet.addInitParam(initParam); } } } } + @Override + public void destroy(Deployment dep) + { + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws != null) + { + ddSunJaxws.destroyFileURL(); + } + } + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) { boolean isServlet = false; @@ -102,16 +123,4 @@ } return isServlet; } - - private boolean isAlreadyModified(Servlet servlet) - { - Iterator itParams = servlet.getInitParams().iterator(); - while (itParams.hasNext()) - { - NameValuePair pair = (NameValuePair)itParams.next(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) - return true; - } - return false; - } } \ No newline at end of file Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -23,9 +23,19 @@ //$Id$ +import java.util.ArrayList; +import java.util.Iterator; + +import javax.jws.WebService; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ServletMapping; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoint; +import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that generates sun-jaxws.xml @@ -38,10 +48,72 @@ @Override public void create(Deployment dep) { + DDEndpoints dd = new DDEndpoints(); for (Endpoint ep : dep.getService().getEndpoints()) { - //ObjectName sepID = ObjectNameFactory; - //ep.setName(sepID); + String name = getName(ep); + String implementation = ep.getEndpointImpl().getName(); + String urlPattern = getUrlPattern(dep, ep); + + DDEndpoint ddep = new DDEndpoint(name, implementation, urlPattern); + log.info("Add " + ddep); + dd.addEndpoint(ddep); } + dep.getContext().addAttachment(DDEndpoints.class, dd); } + + private String getName(Endpoint ep) + { + String name = null; + Class impl = ep.getEndpointImpl(); + if (impl.isAnnotationPresent(WebService.class)) + { + WebService anWebService = (WebService)impl.getAnnotation(WebService.class); + if (anWebService.name().length() > 0) + name = anWebService.name(); + } + // Fall back + if (name == null) + { + name = impl.getName(); + name = name.substring(name.lastIndexOf(".") + 1); + } + + return name; + } + + private String getUrlPattern(Deployment dep, Endpoint ep) + { + String urlPattern = null; + String impl = ep.getEndpointImpl().getName(); + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String name = servlet.getName(); + String servletClass = servlet.getServletClass(); + if (impl.equals(servletClass)) + { + ServletMapping mapping = getServletMapping(webMetaData, name); + ArrayList<String> urlPatterns = mapping.getUrlPatterns(); + if (urlPatterns.size() > 0) + urlPattern = urlPatterns.get(0); + } + } + } + return urlPattern; + } + + private ServletMapping getServletMapping(WebMetaData webMetaData, String name) + { + Iterator it = webMetaData.getServletMappings().iterator(); + while (it.hasNext()) + { + ServletMapping mapping = (ServletMapping)it.next(); + if (name.equals(mapping.getName())) + return mapping; + } + throw new IllegalStateException("Cannot obtian mapping for: " + name); + } } \ No newline at end of file Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,192 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws; + +import java.io.IOException; +import java.io.Writer; + +import javax.xml.namespace.QName; +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; + + 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; + this.binding = SOAPBinding.SOAP11HTTP_BINDING; + } + + 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 (!SOAPBinding.SOAP11HTTP_BINDING.equals(binding) && !SOAPBinding.SOAP12HTTP_BINDING.equals(binding)) + 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: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50.sunri.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.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.integration.management.ServerConfig; +import org.jboss.ws.integration.management.ServerConfigFactory; + +//$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(); + + ServerConfig serverConfig = ServerConfigFactory.getInstance().getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); + try + { + 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 WSDeploymentException(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: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -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.ws.integration.jboss50.sunri.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: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-10 21:55:16 UTC (rev 3045) @@ -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.ws.integration.jboss50.sunri.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: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 21:55:16 UTC (rev 3045) @@ -89,8 +89,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSModifyWebMetaDataDeployer"/> <inject bean="WSSunJaxwsDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> </list> </property> </bean> @@ -117,14 +117,11 @@ Each handles a single aspect of web service deployment --> <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> + <property name="requestHandler">org.jboss.ws.integration.jboss50.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.ws.integration.jboss50.sunri.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss50.common.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss50.common.InvocationHandlerEJB3</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.jboss50.sunri.InvocationHandlerJSE</value></entry> </map> </property> </bean> @@ -132,7 +129,7 @@ <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.jboss50.sunri.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.sunri.ModifyWebMetaDataDeployer"> - <property name="listenerClass">com.sun.xml.ws.transport.http.servlet.WSServletContextListener</property> + <property name="listenerClass">org.jboss.ws.integration.jboss50.sunri.WSServletContextListener</property> <property name="servletClass">com.sun.xml.ws.transport.http.servlet.WSServlet</property> </bean> <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/> Modified: projects/wsintegration/sunri-jboss50/trunk/version.properties =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 21:52:51 UTC (rev 3044) +++ projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 21:55:16 UTC (rev 3045) @@ -24,5 +24,5 @@ jboss-security-spi=2.0.0.Beta sun-jaxb=2.1.3 sun-jaxws=2.1.1 -sun-servlet=2.4 +sun-servlet=2.5