Author: thomas.diesler(a)jboss.com Date: 2007-05-10 12:12:13 -0400 (Thu, 10 May 2007) New Revision: 3043 Removed: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointHandlerDeployer.java trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointLifecycleDeployer.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml trunk/build/version.properties trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java Log: More sunri Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-10 16:12:13 UTC (rev 3043) @@ -51,7 +51,7 @@ # deploy to jboss # cd $INTDIR -ant $ENVIRONMENT deploy-jboss42 +ant $ENVIRONMENT deploy # # start jbossas Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-10 16:12:13 UTC (rev 3043) @@ -51,7 +51,7 @@ # deploy to jboss # cd $INTDIR -ant $ENVIRONMENT deploy-jboss50 +ant $ENVIRONMENT deploy # # start jbossas Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/build/version.properties 2007-05-10 16:12:13 UTC (rev 3043) @@ -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 implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointHandlerDeployer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointHandlerDeployer.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointHandlerDeployer.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -1,115 +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.deployment; - -//$Id$ - -import java.util.Map; - -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.LifecycleHandler; -import org.jboss.ws.integration.RequestHandler; -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.invocation.InvocationHandler; - -/** - * A deployer that assigns the handlers to the Endpoint - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class EndpointHandlerDeployer extends AbstractDeployer -{ - private String requestHandler; - private String lifecycleHandler; - private Map<String,String> invocationHandler; - - public void setLifecycleHandler(String handler) - { - this.lifecycleHandler = handler; - } - - public void setRequestHandler(String handler) - { - this.requestHandler = handler; - } - - public void setInvocationHandler(Map<String,String> handlers) - { - this.invocationHandler = handlers; - } - - @Override - public void create(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - { - ep.setRequestHandler(getRequestHandler(dep)); - ep.setLifecycleHandler(getLifecycleHandler(dep)); - ep.setInvocationHandler(getInvocationHandler(dep)); - } - } - - private RequestHandler getRequestHandler(Deployment dep) - { - try - { - Class<?> handlerClass = dep.getClassLoader().loadClass(requestHandler); - return (RequestHandler)handlerClass.newInstance(); - } - catch (Exception e) - { - throw new IllegalStateException("Cannot load request handler: " + requestHandler); - } - } - - private LifecycleHandler getLifecycleHandler(Deployment dep) - { - try - { - Class<?> handlerClass = dep.getClassLoader().loadClass(lifecycleHandler); - return (LifecycleHandler)handlerClass.newInstance(); - } - catch (Exception e) - { - throw new IllegalStateException("Cannot load lifecycle handler: " + lifecycleHandler); - } - } - - private InvocationHandler getInvocationHandler(Deployment dep) - { - String className = invocationHandler.get(dep.getType().toString()); - if (className == null) - throw new IllegalStateException("Cannot obtain invocation handler for: " + dep.getType()); - - try - { - Class<?> handlerClass = dep.getClassLoader().loadClass(className); - return (InvocationHandler)handlerClass.newInstance(); - } - catch (Exception e) - { - throw new IllegalStateException("Cannot load invocation handler: " + className); - } - } -} \ No newline at end of file Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointLifecycleDeployer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointLifecycleDeployer.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointLifecycleDeployer.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -1,80 +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.deployment; - -//$Id$ - -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; - -/** - * A deployer that that calls the endpoint lifecycle handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class EndpointLifecycleDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - ep.getLifecycleHandler().create(ep); - } - - @Override - public void start(Deployment dep) - { - for (Endpoint ep : dep.getService().getEndpoints()) - { - ep.getLifecycleHandler().start(ep); - } - } - - @Override - public void stop(Deployment dep) - { - Service service = dep.getService(); - if (service != null) - { - for (Endpoint ep : service.getEndpoints()) - { - ep.getLifecycleHandler().stop(ep); - } - } - } - - @Override - public void destroy(Deployment dep) - { - Service service = dep.getService(); - if (service != null) - { - for (Endpoint ep : service.getEndpoints()) - { - ep.getLifecycleHandler().destroy(ep); - } - } - } -} Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -46,6 +46,11 @@ // provide logging private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + public String getImplementationVersion() { return UnifiedMetaData.getImplementationVersion(); @@ -91,7 +96,8 @@ public void create() throws Exception { - log.info(UnifiedMetaData.getImplementationVersion()); + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); MBeanServer server = getMBeanServer(); if (server != null) { Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistryMBean.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -32,8 +32,7 @@ */ public interface ManagedEndpointRegistryMBean extends EndpointRegistry { - // default object name - static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=EndpointRegistry"); - + String getImplementationTitle(); + String getImplementationVersion(); } Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfig.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -1,76 +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.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; - } -} Deleted: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedServerConfigMBean.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -1,37 +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.management.ServerConfig; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ManagedServerConfigMBean extends ServerConfig -{ - // default object name - static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); -} 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-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.core.server.ManagedServerConfigMBean; +import org.jboss.ws.utils.ObjectNameFactory; /** * Auto discover HTTP(S) port configuration from Tomcat @@ -39,7 +39,7 @@ */ public class JBWS1115TestCase extends JBossWSTest { - private final ObjectName manager = ManagedServerConfigMBean.OBJECT_NAME; + private final ObjectName manager = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); public void testDiscoverWebServicePort() throws Exception { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-10 16:10:45 UTC (rev 3042) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-10 16:12:13 UTC (rev 3043) @@ -35,7 +35,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.CallImpl; -import org.jboss.ws.core.server.ManagedServerConfigMBean; +import org.jboss.ws.utils.ObjectNameFactory; /** * [JBWS-1178] Multiple virtual host and soap:address problem @@ -46,6 +46,8 @@ */ public class JBWS1178TestCase extends JBossWSTest { + private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); + String webServiceHost; public static Test suite() @@ -55,7 +57,6 @@ public void setUp() throws Exception { - ObjectName objectName = ManagedServerConfigMBean.OBJECT_NAME; webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); // Setting the WebServiceHost to an empty string, causes the request host to be used getServer().setAttribute(objectName, new Attribute("WebServiceHost", "")); @@ -63,7 +64,6 @@ public void tearDown() throws Exception { - ObjectName objectName = ManagedServerConfigMBean.OBJECT_NAME; getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); }