dain 2004/01/21 19:53:32
Modified: modules/remoting/src/java/org/apache/geronimo/remoting/jmx MBeanServerStub.java modules/remoting/src/java/org/apache/geronimo/remoting/router AbstractInterceptorRouter.java AbstractRouterRouter.java JMXRouter.java SubsystemRouter.java modules/remoting/src/java/org/apache/geronimo/remoting/transport TransportLoader.java modules/web/src/java/org/apache/geronimo/webdav/jetty JettyConnectorImpl.java Log: Converted to GBean Revision Changes Path 1.6 +18 -40 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java Index: MBeanServerStub.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MBeanServerStub.java 30 Dec 2003 21:19:22 -0000 1.5 +++ MBeanServerStub.java 22 Jan 2004 03:53:32 -0000 1.6 @@ -56,8 +56,9 @@ package org.apache.geronimo.remoting.jmx; import org.apache.geronimo.core.service.Interceptor; -import org.apache.geronimo.kernel.service.GeronimoMBeanContext; -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget; +import org.apache.geronimo.gbean.GBean; +import org.apache.geronimo.gbean.GBeanContext; +import org.apache.geronimo.gbean.jmx.GBeanMBeanContext; import org.apache.geronimo.proxy.ProxyContainer; import org.apache.geronimo.proxy.ReflexiveInterceptor; import org.apache.geronimo.remoting.DeMarshalingInterceptor; @@ -66,57 +67,34 @@ /** * @version $Revision$ $Date$ */ -public class MBeanServerStub - implements GeronimoMBeanTarget, JMXTarget { - +public class MBeanServerStub implements GBean, JMXTarget { private ProxyContainer serverContainer; private DeMarshalingInterceptor demarshaller; - private GeronimoMBeanContext geronimoMBeanContext; + private GBeanMBeanContext context; - public void doStart() { - // Setup the server side contianer.. - Interceptor firstInterceptor = new ReflexiveInterceptor(geronimoMBeanContext.getServer()); - firstInterceptor = new DeMarshalingInterceptor(firstInterceptor, getClass().getClassLoader()); - serverContainer = new ProxyContainer(firstInterceptor); - } - - public void doStop() { - serverContainer = null; - demarshaller = null; - } - - /** - * @see org.apache.geronimo.remoting.router.JMXTarget#getRemotingEndpointInterceptor() - */ public Interceptor getRemotingEndpointInterceptor() { return demarshaller; } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#setMBeanContext(org.apache.geronimo.kernel.service.GeronimoMBeanContext) - */ - public void setMBeanContext(GeronimoMBeanContext geronimoMBeanContext) { - this.geronimoMBeanContext = geronimoMBeanContext; + public void setGBeanContext(GBeanContext context) { + this.context = (GBeanMBeanContext) context; } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStart() - */ - public boolean canStart() { - return true; + public void doStart() { + // Setup the server side contianer.. + Interceptor firstInterceptor = new ReflexiveInterceptor(context.getServer()); + firstInterceptor = new DeMarshalingInterceptor(firstInterceptor, getClass().getClassLoader()); + serverContainer = new ProxyContainer(firstInterceptor); } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStop() - */ - public boolean canStop() { - return true; + public void doStop() { + serverContainer = null; + demarshaller = null; } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#doFail() - */ public void doFail() { + serverContainer = null; + demarshaller = null; } } 1.3 +20 -74 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java Index: AbstractInterceptorRouter.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractInterceptorRouter.java 19 Nov 2003 11:15:03 -0000 1.2 +++ AbstractInterceptorRouter.java 22 Jan 2004 03:53:32 -0000 1.3 @@ -60,8 +60,9 @@ import org.apache.geronimo.core.service.Interceptor; import org.apache.geronimo.core.service.InvocationResult; import org.apache.geronimo.core.service.SimpleInvocation; -import org.apache.geronimo.kernel.service.GeronimoMBeanContext; -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget; +import org.apache.geronimo.gbean.GBean; +import org.apache.geronimo.gbean.GBeanContext; +import org.apache.geronimo.gbean.jmx.GBeanMBeanContext; import org.apache.geronimo.remoting.InvocationSupport; import org.apache.geronimo.remoting.MarshalledObject; import org.apache.geronimo.remoting.transport.Msg; @@ -74,56 +75,35 @@ /** * @version $Revision$ $Date$ */ -abstract public class AbstractInterceptorRouter - implements GeronimoMBeanTarget, Router -{ - private long stoppedRoutingTimeout = 1000*60; // 1 min. - - /** +public abstract class AbstractInterceptorRouter implements GBean, Router { + private long stoppedRoutingTimeout = 1000 * 60; // 1 min. + + /** * Allows us to pause invocations when in the stopped state. */ private Sync routerLock = createNewRouterLock(); - public GeronimoMBeanContext geronimoMBeanContext; - - /** - * - * @jmx:managed-attribute - * - * @return - */ + protected GBeanMBeanContext context; + public long getStoppedRoutingTimeout() { return stoppedRoutingTimeout; } - /** - * - * @jmx:managed-attribute - * - * @param stoppedRoutingTimeout - */ public void setStoppedRoutingTimeout(long stoppedRoutingTimeout) { this.stoppedRoutingTimeout = stoppedRoutingTimeout; } - /** - * @return - */ private Sync createNewRouterLock() { Latch lock = new Latch(); return new TimeoutSync(lock, stoppedRoutingTimeout); } - - /** - * - * @see org.apache.geronimo.remoting.transport.Router#sendRequest(java.net.URI, org.apache.geronimo.remoting.transport.Msg) - */ + public Msg sendRequest(URI to, Msg msg) throws TransportException { try { routerLock.acquire(); Interceptor interceptor = lookupInterceptorFrom(to); - + SimpleInvocation invocation = new SimpleInvocation(); InvocationSupport.putMarshaledValue(invocation, msg.popMarshaledObject()); InvocationSupport.putRemoteURI(invocation, to); @@ -132,7 +112,7 @@ msg = msg.createMsg(); Object rc = result.getResult(); - msg.pushMarshaledObject((MarshalledObject)rc); + msg.pushMarshaledObject((MarshalledObject) rc); return msg; } catch (Throwable e) { @@ -141,70 +121,36 @@ } } - /** - * - * @see org.apache.geronimo.remoting.transport.Router#sendDatagram(java.net.URI, org.apache.geronimo.remoting.transport.Msg) - */ public void sendDatagram(URI to, Msg msg) throws TransportException { try { routerLock.acquire(); Interceptor interceptor = lookupInterceptorFrom(to); - + SimpleInvocation invocation = new SimpleInvocation(); InvocationSupport.putMarshaledValue(invocation, msg.popMarshaledObject()); InvocationSupport.putRemoteURI(invocation, to); - InvocationResult result = interceptor.invoke(invocation); - + interceptor.invoke(invocation); } catch (Throwable e) { throw new TransportException(e.getMessage()); } } - /** - * @param to - * @return - */ abstract protected Interceptor lookupInterceptorFrom(URI to) throws Throwable; - /** - * @see org.apache.geronimo.core.service.AbstractManagedObject#doStart() - */ + public void setGBeanContext(GBeanContext context) { + this.context = (GBeanMBeanContext) context; + } + public void doStart() { routerLock.release(); } - /** - * @see org.apache.geronimo.core.service.AbstractManagedObject#doStop() - */ public void doStop() { routerLock = createNewRouterLock(); } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#setMBeanContext(org.apache.geronimo.kernel.service.GeronimoMBeanContext) - */ - public void setMBeanContext(GeronimoMBeanContext geronimoMBeanContext) { - this.geronimoMBeanContext = geronimoMBeanContext; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStart() - */ - public boolean canStart() { - return true; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStop() - */ - public boolean canStop() { - return true; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#doFail() - */ public void doFail() { + // @todo do your best to clean up after a failure } } 1.3 +11 -67 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java Index: AbstractRouterRouter.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractRouterRouter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractRouterRouter.java 19 Nov 2003 11:15:03 -0000 1.2 +++ AbstractRouterRouter.java 22 Jan 2004 03:53:32 -0000 1.3 @@ -57,8 +57,8 @@ import java.net.URI; -import org.apache.geronimo.kernel.service.GeronimoMBeanContext; -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget; +import org.apache.geronimo.gbean.GBean; +import org.apache.geronimo.gbean.GBeanContext; import org.apache.geronimo.remoting.transport.Msg; import org.apache.geronimo.remoting.transport.TransportException; @@ -70,57 +70,34 @@ * * @version $Revision$ $Date$ */ -abstract public class AbstractRouterRouter - implements GeronimoMBeanTarget, Router -{ - +public abstract class AbstractRouterRouter implements GBean, Router { private long stoppedRoutingTimeout = 1000 * 60; // 1 min. - /** + /** * Allows us to pause invocations when in the stopped state. */ private Sync routerLock = createNewRouterLock(); - /** - * - * @jmx:managed-attribute - * - * @return - */ public long getStoppedRoutingTimeout() { return stoppedRoutingTimeout; } - /** - * - * @jmx:managed-attribute - * - * @param stoppedRoutingTimeout - */ public void setStoppedRoutingTimeout(long stoppedRoutingTimeout) { this.stoppedRoutingTimeout = stoppedRoutingTimeout; } - /** - * @return - */ private Sync createNewRouterLock() { Latch lock = new Latch(); return new TimeoutSync(lock, stoppedRoutingTimeout); } - /** - * - * - * @see org.apache.geronimo.remoting.transport.Router#sendRequest(java.net.URI, org.apache.geronimo.remoting.transport.Msg) - */ public Msg sendRequest(URI to, Msg msg) throws TransportException { try { routerLock.acquire(); Router next = lookupRouterFrom(to); - if( next == null ) - throw new TransportException("No route is available to: "+to); - + if (next == null) + throw new TransportException("No route is available to: " + to); + return next.sendRequest(to, msg); } catch (Throwable e) { @@ -129,9 +106,6 @@ } } - /** - * @see org.apache.geronimo.remoting.transport.Router#sendDatagram(java.net.URI, org.apache.geronimo.remoting.transport.Msg) - */ public void sendDatagram(URI to, Msg msg) throws TransportException { try { routerLock.acquire(); @@ -142,51 +116,21 @@ } } - /** - * @param to - * @return - */ abstract protected Router lookupRouterFrom(URI to); - - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#setMBeanContext(org.apache.geronimo.kernel.service.GeronimoMBeanContext) - */ - public void setMBeanContext(GeronimoMBeanContext context) { + + public void setGBeanContext(GBeanContext context) { } - /** - * @see org.apache.geronimo.core.service.AbstractManagedObject#doStart() - */ public void doStart() { routerLock.release(); } - /** - * @see org.apache.geronimo.core.service.AbstractManagedObject#doStop() - */ public void doStop() { routerLock = createNewRouterLock(); } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStart() - */ - public boolean canStart() { - return true; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStop() - */ - public boolean canStop() { - return true; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#doFail() - */ public void doFail() { + // @todo do your best to clean up after a failure } } 1.4 +3 -19 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java Index: JMXRouter.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JMXRouter.java 19 Nov 2003 11:15:03 -0000 1.3 +++ JMXRouter.java 22 Jan 2004 03:53:32 -0000 1.4 @@ -75,43 +75,27 @@ * @version $Revision$ $Date$ */ public class JMXRouter extends AbstractInterceptorRouter { + private SubsystemRouter subsystemRouter; - SubsystemRouter subsystemRouter; - - /** - * @return Returns the subsystemRouter. - */ public SubsystemRouter getSubsystemRouter() { return subsystemRouter; } - /** - * @param subsystemRouter The subsystemRouter to set. - */ public void setSubsystemRouter(SubsystemRouter subsystemRouter) { this.subsystemRouter = subsystemRouter; } - /** - * @see org.apache.geronimo.remoting.router.AbstractInterceptorRouter#lookupInterceptorFrom(java.net.URI) - */ protected Interceptor lookupInterceptorFrom(URI to) throws MalformedObjectNameException { ObjectName on = new ObjectName(to.getFragment()); - JMXTarget bean = (JMXTarget) MBeanProxyFactory.getProxy(JMXTarget.class, geronimoMBeanContext.getServer(), on); + JMXTarget bean = (JMXTarget) MBeanProxyFactory.getProxy(JMXTarget.class, context.getServer(), on); return bean.getRemotingEndpointInterceptor(); } - /** - * @see org.apache.geronimo.remoting.router.AbstractInterceptorRouter#doStart() - */ public void doStart() { subsystemRouter.addRoute("/JMX", this); super.doStart(); } - /** - * @see org.apache.geronimo.remoting.router.AbstractInterceptorRouter#doStop() - */ public void doStop() { super.doStop(); subsystemRouter.removeRoute("/JMX"); 1.2 +1 -11 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java Index: SubsystemRouter.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SubsystemRouter.java 16 Nov 2003 05:27:27 -0000 1.1 +++ SubsystemRouter.java 22 Jan 2004 03:53:32 -0000 1.2 @@ -71,33 +71,23 @@ Map currentRoutingMap = new HashMap(); Collection childRouters; - /** - * @see org.apache.geronimo.remoting.router.AbstractRouterRouter#lookupRouterFrom(java.net.URI) - */ protected Router lookupRouterFrom(URI to) { String subsystem = to.getPath(); return (Router) currentRoutingMap.get(subsystem); } - /** - */ synchronized public void addRoute(String path, Router router) { Map temp = new HashMap(currentRoutingMap); temp.put(path, router); currentRoutingMap = temp; } - /** - */ synchronized public void removeRoute(String path) { Map temp = new HashMap(currentRoutingMap); temp.remove(path); currentRoutingMap = temp; } - /** - * @see org.apache.geronimo.remoting.router.RouterTargetMBean#getRouter() - */ public Router getRouter() { return this; } 1.3 +23 -72 incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java Index: TransportLoader.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TransportLoader.java 30 Dec 2003 21:19:22 -0000 1.2 +++ TransportLoader.java 22 Jan 2004 03:53:32 -0000 1.3 @@ -57,109 +57,60 @@ import java.net.URI; -import org.apache.geronimo.kernel.service.GeronimoMBeanContext; -import org.apache.geronimo.kernel.service.GeronimoMBeanTarget; +import org.apache.geronimo.gbean.GBean; +import org.apache.geronimo.gbean.GBeanContext; import org.apache.geronimo.remoting.router.Router; /** * @version $Revision$ $Date$ */ -public class TransportLoader implements GeronimoMBeanTarget { - URI bindURI; - TransportServer transportServer; - Router router; - - /** - * @return - */ +public class TransportLoader implements GBean { + private URI bindURI; + private TransportServer transportServer; + private Router router; + public URI getBindURI() { return bindURI; } - /** - * @param bindURI - */ public void setBindURI(URI bindURI) { this.bindURI = bindURI; } - /** - * @return - */ public Router getRouter() { return router; } - /** - * @param router - */ public void setRouter(Router router) { this.router = router; } - /** - * @return - */ public URI getClientConnectURI() { if (transportServer == null) return null; return transportServer.getClientConnectURI(); } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#setMBeanContext(org.apache.geronimo.kernel.service.GeronimoMBeanContext) - */ - public void setMBeanContext(GeronimoMBeanContext geronimoMBeanContext) { - } - - /** - */ - public void doStart() { - - try { - - if (router == null) { - throw new IllegalStateException("Target router was not set."); - } - TransportFactory tf = TransportFactory.getTransportFactory(bindURI); - transportServer = tf.createSever(); - transportServer.bind(bindURI, router); - transportServer.start(); - - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + public void setGBeanContext(GBeanContext context) { } - public void doStop() { - try { - transportServer.stop(); - transportServer.dispose(); - transportServer = null; - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + public void doStart() throws Exception { + if (router == null) { + throw new IllegalStateException("Target router was not set."); } + TransportFactory tf = TransportFactory.getTransportFactory(bindURI); + transportServer = tf.createSever(); + transportServer.bind(bindURI, router); + transportServer.start(); + } + + public void doStop() throws Exception { + transportServer.stop(); + transportServer.dispose(); + transportServer = null; } - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStart() - */ - public boolean canStart() { - return true; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStop() - */ - public boolean canStop() { - return true; - } - - /** - * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#doFail() - */ public void doFail() { + // @todo do your best to clean up after a failure } } 1.3 +7 -7 incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty/JettyConnectorImpl.java Index: JettyConnectorImpl.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/webdav/jetty/JettyConnectorImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JettyConnectorImpl.java 22 Jan 2004 02:46:28 -0000 1.2 +++ JettyConnectorImpl.java 22 Jan 2004 03:53:32 -0000 1.3 @@ -73,7 +73,7 @@ /** * Connector using under the cover a Jetty HttpListener. - * + * * @version $Revision$ $Date$ */ public class JettyConnectorImpl @@ -112,7 +112,7 @@ definedListenerState = new DefinedListenerState(); setListener(null); } - + public HttpListener getListener() { return listener; } @@ -134,7 +134,7 @@ lifeCycleState.doStart(); } - public void doStop() throws WaitingException { + public void doStop() throws WaitingException, Exception { log.info("Stopping Jetty Connector"); lifeCycleState.doStop(); } @@ -163,7 +163,7 @@ public void doStart() throws WaitingException, Exception { if ( listener.isStarted() ) { - return; + return; } listener.start(); } @@ -187,7 +187,7 @@ } setListener(null); } - + } private class UndefinedListenerState implements GBean { @@ -237,6 +237,6 @@ public void doFail() { } - + } }