[jbossws-commits] JBossWS SVN: r3015 - in trunk: jbossws-tests and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 08:40:01 -0400 (Wed, 09 May 2007) New Revision: 3015 Added: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java Removed: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java trunk/jbossws-tests/.classpath trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java Log: Fix JBWS-1115 Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java 2007-05-09 11:47:50 UTC (rev 3014) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/LifecycleHandlerImpl.java 2007-05-09 12:40:01 UTC (rev 3015) @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class LifecycleHandlerImpl extends org.jboss.ws.integration.LifecycleHandlerImpl +public class LifecycleHandlerImpl extends org.jboss.ws.integration.BasicLifecycleHandler { public void start(Endpoint endpoint) { Copied: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java) =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-09 12:40:01 UTC (rev 3015) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +// $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; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; + +/** + * 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 getImplementationVersion() + { + return UnifiedMetaData.getImplementationVersion(); + } + + public void create() throws Exception + { + log.info(UnifiedMetaData.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; + } +} Copied: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java) =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-09 12:40:01 UTC (rev 3015) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +import javax.management.ObjectName; + +import org.jboss.ws.integration.ObjectNameFactory; +import org.jboss.ws.integration.management.EndpointRegistry; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedEndpointRegistryMBean extends EndpointRegistry +{ + // default object name + static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=EndpointRegistry"); + + String getImplementationVersion(); +} Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java 2007-05-09 11:47:50 UTC (rev 3014) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistry.java 2007-05-09 12:40:01 UTC (rev 3015) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.server; - -// $Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; - -import org.jboss.logging.Logger; -import org.jboss.ws.integration.management.EndpointRegistryImpl; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; - -/** - * A Service Endpoint Registry - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-May-2007 - */ -public class ServiceEndpointRegistry extends EndpointRegistryImpl implements ServiceEndpointRegistryMBean -{ - // provide logging - private static final Logger log = Logger.getLogger(ServiceEndpointRegistry.class); - - public String getImplementationVersion() - { - return UnifiedMetaData.getImplementationVersion(); - } - - public void create() throws Exception - { - log.info(UnifiedMetaData.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; - } -} Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java 2007-05-09 11:47:50 UTC (rev 3014) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointRegistryMBean.java 2007-05-09 12:40:01 UTC (rev 3015) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.server; - -import javax.management.ObjectName; - -import org.jboss.ws.integration.ObjectNameFactory; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ServiceEndpointRegistryMBean -{ - // default object name - static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointRegistry"); - - String getImplementationVersion(); -} Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-05-09 11:47:50 UTC (rev 3014) +++ trunk/jbossws-tests/.classpath 2007-05-09 12:40:01 UTC (rev 3015) @@ -37,6 +37,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jbossws-spi.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-09 11:47:50 UTC (rev 3014) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-09 12:40:01 UTC (rev 3015) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.integration.ObjectNameFactory; +import org.jboss.ws.core.server.ManagedServerConfigMBean; /** * Auto discover HTTP(S) port configuration from Tomcat @@ -39,12 +39,12 @@ */ public class JBWS1115TestCase extends JBossWSTest { - private final ObjectName manager = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager"); + private final ObjectName manager = ManagedServerConfigMBean.OBJECT_NAME; public void testDiscoverWebServicePort() throws Exception { MBeanServerConnection server = getServer(); - + String attrName = "WebServicePort"; Integer orgPort = (Integer)server.getAttribute(manager, attrName); server.setAttribute(manager, new Attribute(attrName, new Integer(0))); @@ -56,7 +56,7 @@ public void testDiscoverWebServiceSecurePort() throws Exception { MBeanServerConnection server = getServer(); - + String attrName = "WebServiceSecurePort"; Integer orgPort = (Integer)server.getAttribute(manager, attrName); server.setAttribute(manager, new Attribute(attrName, new Integer(0)));