[jBoss-Dev] CVS update: jnp/src/main/org/jnp/server Main.javaMainMBean.java NamingServer.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/12/12 02:57:12

  Modified:    src/main/org/jnp/server Main.java MainMBean.java
                        NamingServer.java
  Log:
  Changed to LGPL license
  Can now set RMI port to be used by server manager
  
  Revision  Changes    Path
  1.2       +14 -7     jnp/src/main/org/jnp/server/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jnp/src/main/org/jnp/server/Main.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Main.java 2000/10/10 12:42:35     1.1
  +++ Main.java 2000/12/12 10:57:11     1.2
  @@ -1,5 +1,5 @@
   /*
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    *
    * Copyright 1999 by dreamBean Software,
  @@ -28,7 +28,7 @@
    *      
    *   @see <related>
    *   @author $Author: oberg $
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public class Main
      implements Runnable, MainMBean
  @@ -41,6 +41,7 @@
      ServerSocket serverSocket;
      
      int port = 1099;
  +   int rmiPort = 0; // Anonymous
      boolean logging = false;
      
      // Static --------------------------------------------------------
  @@ -68,11 +69,14 @@
      }
   
      // Public --------------------------------------------------------
  +   public void setRmiPort(int p) { rmiPort = p; }
  +   public int getRmiPort() { return rmiPort; }
  +   
      public void setPort(int p) { port = p; }
      public int getPort() { return port; }
   
      public void setLogging(boolean l) { logging = l; }
  -   public boolean isLogging() { return logging; }
  +   public boolean getLogging() { return logging; }
   
      public void start()
         throws Exception
  @@ -84,7 +88,7 @@
         NamingContext.setLocal(theServer);
                
         // Export server
  -      serverStub = new MarshalledObject(UnicastRemoteObject.exportObject(theServer, 
5555));
  +      serverStub = new MarshalledObject(UnicastRemoteObject.exportObject(theServer, 
rmiPort));
         
         // Start listener
         try
  @@ -112,7 +116,10 @@
            ServerSocket s = serverSocket;
            serverSocket = null;
            s.close();
  -      } catch (Exception e) {}
  +      } catch (Exception e) 
  +      {
  +         e.printStackTrace();
  +      }
      }
   
      // Runnable implementation ---------------------------------------
  @@ -174,7 +181,7 @@
      // Protected -----------------------------------------------------
      protected void log(String msg)
      {
  -      if (isLogging())
  +      if (getLogging())
            System.err.println("[Naming] "+msg);
      }
      
  
  
  
  1.2       +7 -6      jnp/src/main/org/jnp/server/MainMBean.java
  
  Index: MainMBean.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jnp/src/main/org/jnp/server/MainMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MainMBean.java    2000/10/10 12:42:34     1.1
  +++ MainMBean.java    2000/12/12 10:57:11     1.2
  @@ -1,5 +1,5 @@
   /*
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    *
    * Copyright 1999 by dreamBean Software,
  @@ -12,23 +12,24 @@
    *      
    *   @see <related>
    *   @author $Author: oberg $
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public interface MainMBean
   {
      // Constants -----------------------------------------------------
       
      // Public --------------------------------------------------------
  +   public void setRmiPort(int p);
  +   public int getRmiPort();
  +   
      public void setPort(int p);
      public int getPort();
   
      public void setLogging(boolean l);
  -   public boolean isLogging();
  +   public boolean getLogging();
   
      public void start()
         throws Exception;
      
      public void stop();
  -   
  -//   public String getProviderURL();
   }
  
  
  
  1.4       +2 -2      jnp/src/main/org/jnp/server/NamingServer.java
  
  Index: NamingServer.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jnp/src/main/org/jnp/server/NamingServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamingServer.java 2000/11/02 15:14:07     1.3
  +++ NamingServer.java 2000/12/12 10:57:11     1.4
  @@ -1,5 +1,5 @@
   /*
  - * Distributable under GPL license.
  + * Distributable under LGPL license.
    * See terms of license at gnu.org.
    *
    * Copyright 1999 by dreamBean Software,
  @@ -40,7 +40,7 @@
    *      
    *   @see <related>
    *   @author $Author: oberg $
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public class NamingServer
      implements Naming, java.io.Serializable