Author: thomas.diesler(a)jboss.com Date: 2007-05-10 11:45:12 -0400 (Thu, 10 May 2007) New Revision: 3041 Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistry.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistryMBean.java 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/jbosswsri-context.war/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar/ Removed: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/ Modified: projects/wsintegration/sunri-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar/META-INF/jbossws-beans.xml projects/wsintegration/sunri-jboss50/trunk/version.properties Log: More on sunri Modified: projects/wsintegration/sunri-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 13:57:13 UTC (rev 3040) +++ projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 15:45:12 UTC (rev 3041) @@ -114,7 +114,7 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> + <filter token="implementation.version" value="jbossws-sunri-${version.id}"/> <filtersfile file="${basedir}/version.properties"/> </filterset> </copy> @@ -135,40 +135,53 @@ --> <target name="jboss50-module-jars" depends="jboss50-init"> - <!-- Build jbosswsri50.jar --> + <!-- Build jbosswsri.jar --> <mkdir dir="${jboss50.output.lib.dir}"/> - <jar jarfile="${jboss50.output.lib.dir}/jbosswsri50.jar" manifest="${jboss50.etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbosswsri50.jar" manifest="${jboss50.output.etc.dir}/default.mf"> <fileset dir="${jboss50.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> </jar> - <!-- Build jbosswsri50-context.war --> - <war warfile="${jboss50.output.lib.dir}/jbosswsri50-context.war" webxml="${jboss50.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <!-- Build jbosswsri-context.war --> + <war warfile="${jboss50.output.lib.dir}/jbosswsri50-context.war" webxml="${jboss50.resources.dir}/jbosswsri-context.war/WEB-INF/web.xml"> <fileset dir="${jboss50.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss50.resources.dir}/jbossws.war/WEB-INF"> + <webinf dir="${jboss50.resources.dir}/jbosswsri-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <!-- Build jbosswsri50.sar --> - <jar jarfile="${jboss50.output.lib.dir}/jbosswsri50.sar" manifest="${jboss50.etc.dir}/default.mf"> + <!-- Build jbosswsri.sar --> + <jar jarfile="${jboss50.output.lib.dir}/jbosswsri50.sar" manifest="${jboss50.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service <fileset dir="${jboss50.output.lib.dir}"> - <include name="jbossws-context.war"/> + <include name="jbossws-context.war"/> </fileset> --> <fileset dir="${thirdparty.dir}"> + <include name="FastInfoset.jar"/> + <include name="http.jar"/> + <include name="jaxws-api.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jsr173_api.jar"/> + <include name="jsr181-api.jar"/> + <include name="jsr250-api.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> </fileset> - <metainf dir="${jboss50.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jboss50.resources.dir}/jbosswsri.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> - <!-- Build jbosswsri50-deployer --> + <!-- Build jbosswsri-deployer --> <zip zipfile="${jboss50.output.lib.dir}/jbosswsri50-deployer.zip"> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbosswsri50.jar"/> Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 13:57:13 UTC (rev 3040) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 15:45:12 UTC (rev 3041) @@ -17,45 +17,53 @@ <!-- Deployment JBoss50 --> <!-- ================================================================== --> - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> + <!-- Deploy jbossws/sunri to jboss50 --> + <target name="deploy" depends="jboss50-jars,remove-jbossws" 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"/> + <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}/client" overwrite="true"> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.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 todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbosswsri50-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="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}"> + <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> - </copy> + </delete> <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"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> </target> - + </project> Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml 2007-05-10 13:57:13 UTC (rev 3040) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml 2007-05-10 15:45:12 UTC (rev 3041) @@ -1,14 +1,14 @@ -<project name="jboss/jbossws-jboss50"> +<project name="jboss/jbossws-sunri50"> - <component id="jboss/jbossws-jboss50" + <component id="jboss/jbossws-sunri50" description="JBossWS an implementation of J2EE Web Services" version=&quot;@repository.id(a)&quot; licenseType="lgpl"> - <artifact id="jbossws-jboss50.jar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - <artifact id="jbossws50-src.zip"/> + <artifact id="jbosswsri50.jar"/> + <artifact id="jbosswsri50.sar"/> + <artifact id="jbosswsri50-deployer.zip"/> + <artifact id="jbosswsri50-src.zip"/> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb@"/> @@ -16,12 +16,12 @@ <import componentref="jboss/microcontainer"> <compatible version="@jboss-microcontainer@"/> </import> - <import componentref="jboss/jbossws"> - <compatible version="@jboss-jbossws@"/> - </import> <import componentref="jboss/jbossws-spi"> <compatible version="@jboss-jbossws-spi@"/> </import> + <import componentref="sun-jaxws"> + <compatible version="@sun-jaxws@"/> + </import> <export> </export> Copied: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java (from rev 3022, trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java) =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,76 @@ +/* + * 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.common; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.ws.integration.management.BasicServerConfig; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedServerConfig.class); + + public void create() throws Exception + { + log.debug("WebServiceHost: " + getWebServiceHost()); + log.debug("WebServicePort: " + getWebServicePort()); + log.debug("WebServiceSecurePort: " + getWebServiceSecurePort()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Copied: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java (from rev 3037, trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java) =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50.common; + +import org.jboss.ws.integration.management.ServerConfig; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedServerConfigMBean extends ServerConfig +{ +} Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,47 @@ +/* + * 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; + +//$Id$ + +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; + +/** + * A deployer that assigns the complete name to the Endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class EndpointNameDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + //ObjectName sepID = ObjectNameFactory; + //ep.setName(sepID); + } + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.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/ManagedEndpointRegistry.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistry.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistry.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,86 @@ +/* + * 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; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.ws.integration.management.BasicEndpointRegistry; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.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()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + log.debug("Destroy service endpoint manager"); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistry.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/ManagedEndpointRegistryMBean.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistryMBean.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistryMBean.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,35 @@ +/* + * 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; + +import org.jboss.ws.integration.management.EndpointRegistry; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedEndpointRegistryMBean extends EndpointRegistry +{ + String getImplementationTitle(); + + String getImplementationVersion(); +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistryMBean.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/ModifyWebMetaDataDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,117 @@ +/* + * 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; + +//$Id$ + +import java.util.Iterator; + +import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeployer extends AbstractDeployer +{ + private String listenerClass; + private String servletClass; + + public void setListenerClass(String listenerClass) + { + this.listenerClass = listenerClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + @Override + public void create(Deployment dep) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String orgServletClass = servlet.getServletClass(); + + // JSP + if (orgServletClass == null || orgServletClass.length() == 0) + { + log.debug("Innore servlet class: " + orgServletClass); + continue; + } + + // Nothing to do if we have an <init-param> + if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getClassLoader())) + { + servlet.setServletClass(servletClass); + NameValuePair initParam = new NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass); + servlet.addInitParam(initParam); + } + } + } + } + + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) + { + boolean isServlet = false; + if (loader != null) + { + try + { + Class servletClass = loader.loadClass(orgServletClass); + isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); + if (isServlet == true) + { + log.info("Ignore servlet: " + orgServletClass); + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load servlet class: " + orgServletClass); + } + } + 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 Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.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/SunJaxwsDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-10 15:45:12 UTC (rev 3041) @@ -0,0 +1,47 @@ +/* + * 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; + +//$Id$ + +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; + +/** + * A deployer that generates sun-jaxws.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class SunJaxwsDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + //ObjectName sepID = ObjectNameFactory; + //ep.setName(sepID); + } + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-10 13:57:13 UTC (rev 3040) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-10 15:45:12 UTC (rev 3041) @@ -5,7 +5,7 @@ <!-- A web service deployer that hooks in after the EJB deployers --> - <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB"> + <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerEJB"> <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> @@ -25,7 +25,7 @@ <!-- A web service deployer that hooks in before the WAR deployer --> - <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE"> + <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> <parameter> @@ -43,7 +43,7 @@ <!-- A web service deployer that hooks in after the web service WAR/EJB deployers --> - <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.WebServiceMainDeployer"> + <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.common.WebServiceMainDeployer"> <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> Copied: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri-context.war (from rev 3034, projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war) Copied: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar (from rev 3034, projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar) Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar/META-INF/jbossws-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 07:12:44 UTC (rev 3034) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar/META-INF/jbossws-beans.xml 2007-05-10 15:45:12 UTC (rev 3041) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.ws.core.server.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss50.common.ManagedServerConfig"> <!-- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. @@ -26,14 +26,11 @@ </bean> <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> + <bean name="WSEndpointRegistry" class="org.jboss.ws.integration.jboss50.sunri.ManagedEndpointRegistry"/> - <!-- A subscription manager for WS-Eventing --> - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> - <!-- Bind Service objects in client environment context --> <!-- The bean name is compiled into the server. Changeit with the next release. --> - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + <!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/--> <!-- Locate the single instance of the kernel --> <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> @@ -92,9 +89,8 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSUnifiedMetaDataDeployer"/> - <inject bean="WSUnifiedMetaDataAssociationDeployer"/> <inject bean="WSModifyWebMetaDataDeployer"/> + <inject bean="WSSunJaxwsDeployer"/> </list> </property> </bean> @@ -102,10 +98,6 @@ <property name="deployers"> <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSUnifiedMetaDataDeployer"/> - <inject bean="WSUnifiedMetaDataAssociationDeployer"/> - <inject bean="WSWebAppGeneratorDeployer"/> - <inject bean="WSWebAppDeployerDeployer"/> </list> </property> </bean> @@ -114,10 +106,6 @@ <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> <inject bean="WSEndpointNameDeployer"/> <inject bean="WSEndpointHandlerDeployer"/> - <inject bean="WSPublishContractDeployer"/> - <inject bean="WSClassLoaderInjectionDeployer"/> - <inject bean="WSEagerInitializeDeployer"/> - <inject bean="WSEventingDeployer"/> <inject bean="WSEndpointRegistryDeployer"/> <inject bean="WSEndpointLifecycleDeployer"/> </list> @@ -128,46 +116,32 @@ The Deployers Each handles a single aspect of web service deployment --> - <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss50.jbossws.ClassLoaderInjectionDeployer"/> - <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.core.deployment.EndpointHandlerDeployer"> + <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="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.jbossws.InvocationHandlerEJB21</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.jbossws.InvocationHandlerEJB3</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss50.common.InvocationHandlerEJB3</value></entry> </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.jboss50.sunri.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> - <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.jbossws.ModifyWebMetaDataDeployer"> - <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + <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="servletClass">com.sun.xml.ws.transport.http.servlet.WSServlet</property> </bean> - <bean name="WSPublishContractDeployer" class="org.jboss.ws.core.deployment.PublishContractDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss50.jbossws.UnifiedDeploymentInfoDeployer"/> - <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataAssociationDeployer"/> - <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataDeployer"/> - <bean name="WSWebAppGeneratorDeployer" class="org.jboss.ws.integration.jboss50.jbossws.WebAppGeneratorDeployer"/> - <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss50.jbossws.WebAppDeployerDeployer"> - <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - </bean> + <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss50.common.UnifiedDeploymentInfoDeployer"/> - <!-- Deployer helper beans --> - <bean name="WSServiceEndpointPublisher" class="org.jboss.ws.core.deployment.ServiceEndpointPublisher"> - <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> - </bean> - <!-- Register DeployerHooks with JBoss deployers --> - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.jbossws.JAXRPCDeployerHookJSE"> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookJSE"> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -181,7 +155,7 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.jbossws.JAXRPCDeployerHookEJB21"> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookEJB21"> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -195,7 +169,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.jbossws.JAXWSDeployerHookJSE"> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookJSE"> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -209,7 +183,7 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.jbossws.JAXWSDeployerHookEJB3"> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookEJB3"> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -223,7 +197,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.jbossws.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.common.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <install bean="WebServiceMainDeployer" method="addDeployerHook"> <parameter> Modified: projects/wsintegration/sunri-jboss50/trunk/version.properties =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 13:57:13 UTC (rev 3040) +++ projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 15:45:12 UTC (rev 3041) @@ -8,7 +8,7 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT -implementation.title=JBoss Web Services (JBossWS) +implementation.title=JBoss Web Services - JBossWS/SunRI implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org