[jboss-cvs] JBossAS SVN: r58116 - in trunk: server/src/main/org/jboss/deployment server/src/main/org/jboss/ejb server/src/main/org/jboss/web server/src/main/org/jboss/webservice tomcat/src/main/org/jboss/web/tomcat/tc6/deployers
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 4 06:52:37 EST 2006
Author: thomas.diesler at jboss.com
Date: 2006-11-04 06:52:19 -0500 (Sat, 04 Nov 2006)
New Revision: 58116
Added:
trunk/server/src/main/org/jboss/webservice/ServiceRefHandler.java
trunk/server/src/main/org/jboss/webservice/ServiceRefHandlerFactory.java
Removed:
trunk/server/src/main/org/jboss/webservice/WebServiceRefHandler.java
trunk/server/src/main/org/jboss/webservice/WebServiceRefHandlerFactory.java
Modified:
trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
trunk/server/src/main/org/jboss/ejb/Container.java
trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployerMBean.java
Log:
Expose TomcatDeployer as MBean\nDecouple <service-ref> delegation form deployers
Modified: trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ClientDeployer.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/deployment/ClientDeployer.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -51,8 +51,8 @@
import org.jboss.naming.Util;
import org.jboss.util.xml.DOMUtils;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webservice.WebServiceRefHandler;
-import org.jboss.webservice.WebServiceRefHandlerFactory;
+import org.jboss.webservice.ServiceRefHandler;
+import org.jboss.webservice.ServiceRefHandlerFactory;
import org.w3c.dom.Element;
/**
@@ -240,7 +240,7 @@
// Bind <service-ref> elements
Iterator serviceRefs = metaData.getServiceReferences().values().iterator();
- WebServiceRefHandler refHandler = WebServiceRefHandlerFactory.newInstance();
+ ServiceRefHandler refHandler = ServiceRefHandlerFactory.newInstance();
if (refHandler != null && serviceRefs.hasNext())
refHandler.setupServiceRefEnvironment(envCtx, serviceRefs, unit);
Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/ejb/Container.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -80,8 +80,8 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.NestedError;
import org.jboss.util.NestedRuntimeException;
-import org.jboss.webservice.WebServiceRefHandler;
-import org.jboss.webservice.WebServiceRefHandlerFactory;
+import org.jboss.webservice.ServiceRefHandler;
+import org.jboss.webservice.ServiceRefHandlerFactory;
import org.omg.CORBA.ORB;
/**
@@ -1257,9 +1257,9 @@
// Bind service references
Iterator serviceRefs = metaData.getServiceReferences().values().iterator();
- WebServiceRefHandler refHandler = WebServiceRefHandlerFactory.newInstance();
+ ServiceRefHandler refHandler = ServiceRefHandlerFactory.newInstance();
if (refHandler != null && serviceRefs.hasNext())
- refHandler.setupServiceRefEnvironment(envCtx, serviceRefs, null); // FIXME
+ refHandler.setupServiceRefEnvironment(envCtx, serviceRefs, di);
// Bind resource references
{
Modified: trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/web/AbstractWebDeployer.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -60,8 +60,8 @@
import org.jboss.security.authorization.PolicyRegistration;
import org.jboss.security.plugins.AuthorizationManagerServiceMBean;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
-import org.jboss.webservice.WebServiceRefHandler;
-import org.jboss.webservice.WebServiceRefHandlerFactory;
+import org.jboss.webservice.ServiceRefHandler;
+import org.jboss.webservice.ServiceRefHandlerFactory;
import org.omg.CORBA.ORB;
/** A template pattern class for web deployer integration into JBoss. This class
@@ -559,10 +559,9 @@
linkEjbLocalRefs(ejbLocalRefs, envCtx, di);
Iterator serviceRefs = metaData.getServiceReferences();
log.debug("linkServiceRefs");
- WebServiceRefHandler refHandler = WebServiceRefHandlerFactory.newInstance();
- //FIXME
- //if (refHandler != null && serviceRefs.hasNext())
- // refHandler.setupServiceRefEnvironment(envCtx, serviceRefs, unit);
+ ServiceRefHandler refHandler = ServiceRefHandlerFactory.newInstance();
+ if (refHandler != null && serviceRefs.hasNext())
+ refHandler.setupServiceRefEnvironment(envCtx, serviceRefs, di);
}
protected void addEnvEntries(Iterator envEntries, Context envCtx)
Added: trunk/server/src/main/org/jboss/webservice/ServiceRefHandler.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/ServiceRefHandler.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/webservice/ServiceRefHandler.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -0,0 +1,49 @@
+/*
+* 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.webservice;
+
+// $Id$
+
+import java.util.Iterator;
+
+import javax.naming.Context;
+
+import org.jboss.deployers.spi.DeploymentException;
+
+/**
+ * Implemtent to bind JAXRPC ServiceRefs
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2004
+ */
+public interface ServiceRefHandler
+{
+ /**
+ * Binds a JAXRPC Service into the callers ENC for every service-ref element
+ *
+ * @param envCtx ENC to bind the javax.rpc.xml.Service object to
+ * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
+ * @param deployment The client's deployment unit
+ * @throws DeploymentException if it goes wrong
+ */
+ void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, Object deployment);
+}
Property changes on: trunk/server/src/main/org/jboss/webservice/ServiceRefHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/server/src/main/org/jboss/webservice/ServiceRefHandlerFactory.java (from rev 58115, trunk/server/src/main/org/jboss/webservice/WebServiceRefHandlerFactory.java)
===================================================================
--- trunk/server/src/main/org/jboss/webservice/WebServiceRefHandlerFactory.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/webservice/ServiceRefHandlerFactory.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -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.webservice;
+
+// $Id$
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.ObjectNameFactory;
+
+/**
+ * Factory for ServiceRefHandler
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2004
+ */
+public class ServiceRefHandlerFactory
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ServiceRefHandlerFactory.class);
+
+ /** Get the ServiceRefHandler MBean proxy
+ */
+ public static ServiceRefHandler newInstance()
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler");
+
+ ServiceRefHandler refHandler = null;
+ if (server.isRegistered(objectName))
+ {
+ refHandler = (ServiceRefHandler)MBeanProxyExt.create(ServiceRefHandler.class, objectName, server);
+ }
+ else
+ {
+ log.warn("Not registered: " + objectName);
+ }
+ return refHandler;
+ }
+}
Deleted: trunk/server/src/main/org/jboss/webservice/WebServiceRefHandler.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/WebServiceRefHandler.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/webservice/WebServiceRefHandler.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -1,50 +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.webservice;
-
-// $Id$
-
-import java.util.Iterator;
-
-import javax.naming.Context;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-
-/**
- * Implemtent to bind JAXRPC ServiceRefs
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2004
- */
-public interface WebServiceRefHandler
-{
- /**
- * Binds a JAXRPC Service into the callers ENC for every service-ref element
- *
- * @param envCtx ENC to bind the javax.rpc.xml.Service object to
- * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
- * @param unit The client's deployment unit
- * @throws DeploymentException if it goes wrong
- */
- void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentUnit unit) throws DeploymentException;
-}
Deleted: trunk/server/src/main/org/jboss/webservice/WebServiceRefHandlerFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/WebServiceRefHandlerFactory.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/server/src/main/org/jboss/webservice/WebServiceRefHandlerFactory.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -1,63 +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.webservice;
-
-// $Id$
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.mx.util.ObjectNameFactory;
-
-/**
- * Factory for WebServiceRefHandler
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2004
- */
-public class WebServiceRefHandlerFactory
-{
- // provide logging
- private static final Logger log = Logger.getLogger(WebServiceRefHandlerFactory.class);
-
- /** Get the WebServiceRefHandler MBean proxy
- */
- public static WebServiceRefHandler newInstance()
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler");
-
- WebServiceRefHandler refHandler = null;
- if (server.isRegistered(objectName))
- {
- refHandler = (WebServiceRefHandler)MBeanProxyExt.create(WebServiceRefHandler.class, objectName, server);
- }
- else
- {
- log.warn("Not registered: " + objectName);
- }
- return refHandler;
- }
-}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -41,6 +41,7 @@
import org.apache.tomcat.util.modeler.Registry;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
import org.jboss.system.server.Server;
import org.jboss.system.server.ServerImplMBean;
@@ -741,4 +742,18 @@
*/
return deployment;
}
+
+ public void create() throws Exception
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ if (server != null)
+ server.registerMBean(this, OBJECT_NAME);
+ }
+
+ public void destroy() throws Exception
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ if (server != null)
+ server.unregisterMBean(OBJECT_NAME);
+ }
}
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployerMBean.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployerMBean.java 2006-11-04 08:42:14 UTC (rev 58115)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployerMBean.java 2006-11-04 11:52:19 UTC (rev 58116)
@@ -21,8 +21,12 @@
*/
package org.jboss.web.tomcat.tc6.deployers;
+import javax.management.ObjectName;
+
+import org.jboss.mx.util.ObjectNameFactory;
+import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
+import org.jboss.web.AbstractWebContainerMBean;
import org.jboss.web.deployers.AbstractWarDeployerMBean;
-import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
/**
* An implementation of the AbstractWebContainer for the Jakarta Tomcat5
@@ -38,6 +42,9 @@
*/
public interface TomcatDeployerMBean extends AbstractWarDeployerMBean
{
+ // default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.web:service=WebServer");
+
/** JMX notification type to signal after-start connector event */
public final String TOMCAT_CONNECTORS_STARTED = "jboss.tomcat.connectors.started";
More information about the jboss-cvs-commits
mailing list