You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2003/12/30 22:19:22 UTC

cvs commit: incubator-geronimo/modules/remoting/src/java/org/apache/geronimo/remoting/transport TransportLoader.java

djencks     2003/12/30 13:19:22

  Modified:    modules/remoting/src/java/org/apache/geronimo/remoting/jmx
                        MBeanServerStub.java
               modules/remoting/src/java/org/apache/geronimo/remoting/transport
                        TransportLoader.java
  Log:
  convert remoting to geronimo mbean
  
  Revision  Changes    Path
  1.5       +1 -7      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MBeanServerStub.java	26 Nov 2003 20:54:29 -0000	1.4
  +++ MBeanServerStub.java	30 Dec 2003 21:19:22 -0000	1.5
  @@ -73,9 +73,6 @@
       private DeMarshalingInterceptor demarshaller;
       private GeronimoMBeanContext geronimoMBeanContext;
   
  -    /**
  -     * @see org.apache.geronimo.kernel.service.AbstractManagedObject#doStart()
  -     */
       public void doStart() {
   
           // Setup the server side contianer..
  @@ -84,9 +81,6 @@
           serverContainer = new ProxyContainer(firstInterceptor);
       }
   
  -    /**
  -     * @see org.apache.geronimo.kernel.service.AbstractManagedObject#doStop()
  -     */
       public void doStop() {
           serverContainer = null;
           demarshaller = null;
  
  
  
  1.2       +5 -10     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransportLoader.java	16 Nov 2003 05:27:27 -0000	1.1
  +++ TransportLoader.java	30 Dec 2003 21:19:22 -0000	1.2
  @@ -68,7 +68,6 @@
       URI bindURI;
       TransportServer transportServer;
       Router router;
  -    private GeronimoMBeanContext geronimoMBeanContext;
   
       /**
        * @return
  @@ -92,7 +91,7 @@
       }
   
       /**
  -     * @param dispatchingRouter
  +     * @param router
        */
       public void setRouter(Router router) {
           this.router = router;
  @@ -111,7 +110,6 @@
        * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#setMBeanContext(org.apache.geronimo.kernel.service.GeronimoMBeanContext)
        */
       public void setMBeanContext(GeronimoMBeanContext geronimoMBeanContext) {
  -        this.geronimoMBeanContext = geronimoMBeanContext;
       }
   
       /**
  @@ -119,7 +117,7 @@
       public void doStart() {
   
           try {
  -            
  +
               if (router == null) {
                   throw new IllegalStateException("Target router was not set.");
               }
  @@ -127,16 +125,13 @@
               transportServer = tf.createSever();
               transportServer.bind(bindURI, router);
               transportServer.start();
  -            
  +
           } catch (Exception e) {
               // TODO Auto-generated catch block
               e.printStackTrace();
           }
       }
   
  -    /**
  -     * @see org.apache.geronimo.core.service.AbstractManagedComponent#doStop()
  -     */
       public void doStop() {
           try {
               transportServer.stop();
  @@ -147,7 +142,7 @@
               e.printStackTrace();
           }
       }
  -    
  +
       /**
        * @see org.apache.geronimo.kernel.service.GeronimoMBeanTarget#canStart()
        */