[openejb-scm] openejb/modules/core/src/java/org/openejb/server Server.java ServiceManager.java

[dblevins]

dblevins    2004/10/25 05:55:05

  Modified:    modules/core/src/java/org/openejb/server Server.java
                        ServiceManager.java
  Log:

  Killed some bad javadoc
  Start of re-enabling openejb.conf/service-jar.xml config support
  
  Revision  Changes    Path
  1.4       +2 -2      openejb/modules/core/src/java/org/openejb/server/Server.java
  
  Index: Server.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/Server.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Server.java       14 Apr 2004 04:19:49 -0000      1.3
  +++ Server.java       25 Oct 2004 09:55:04 -0000      1.4
  @@ -91,7 +91,7 @@
   
           OpenEJB.init(props, new ServerFederation());
   
  -        System.out.println("[init] OpenEJB Remote Server");
  +//        System.out.println("[init] OpenEJB Remote Server");
           ServiceManager manager = ServiceManager.getManager();
           manager.init();
           manager.start();
  
  
  
  1.5       +47 -14    
openejb/modules/core/src/java/org/openejb/server/ServiceManager.java
  
  Index: ServiceManager.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ServiceManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServiceManager.java       9 Apr 2004 19:04:01 -0000       1.4
  +++ ServiceManager.java       25 Oct 2004 09:55:04 -0000      1.5
  @@ -50,8 +50,14 @@
   import java.util.Properties;
   import java.util.Vector;
   
  +import javax.management.ObjectName;
  +
   import org.openejb.util.Logger;
   import org.openejb.util.Messages;
  +import org.openejb.nassembler.NovaAssembler;
  +import org.apache.geronimo.kernel.Kernel;
  +import org.apache.geronimo.kernel.jmx.JMXUtil;
  +import org.apache.geronimo.gbean.jmx.GBeanMBean;
   
   
   /**
  @@ -207,22 +213,32 @@
       }
   
       public synchronized void start() throws ServiceException {
  -        System.out.println("  ** Starting Services **");
  -        printRow("NAME", "IP", "PORT");
   
  -        for (int i = 0; i < daemons.length; i++) {
  -            ServiceDaemon d = daemons[i];
  -            try {
  -                d.doStart();
  -                printRow(d.getServiceName(), d.getInetAddress().toString(), 
d.getPort() + "");
  -            } catch (Exception e) {
  -                logger.error(d.getServiceName() + " " + d.getInetAddress() + " " + 
d.getPort() + ": " + e.getMessage());
  -                printRow(d.getServiceName(), "----", "FAILED");
  -            }
  +//        System.out.println("  ** Starting Services **");
  +//        printRow("NAME", "IP", "PORT");
  +
  +        Kernel kernel = Kernel.getSingleKernel();
  +
  +        try {
  +            ServiceManager.setUpServerService(kernel, "EJB", "127.0.0.1", 4201, 
org.openejb.server.ejbd.EjbServer.class);
  +            ServiceManager.setUpServerService(kernel, "ADMIN", "127.0.0.1", 4200, 
org.openejb.server.admin.AdminDaemon.class);
  +        } catch (Exception e) {
  +            throw new ServiceException(e);
           }
   
  -        System.out.println("-------");
  -        System.out.println("Ready!");
  +//        for (int i = 0; i < daemons.length; i++) {
  +//            ServiceDaemon d = daemons[i];
  +//            try {
  +//                d.doStart();
  +//                printRow(d.getServiceName(), d.getInetAddress().toString(), 
d.getPort() + "");
  +//            } catch (Exception e) {
  +//                logger.error(d.getServiceName() + " " + d.getInetAddress() + " " 
+ d.getPort() + ": " + e.getMessage());
  +//                printRow(d.getServiceName(), "----", "FAILED");
  +//            }
  +//        }
  +//
  +//        System.out.println("-------");
  +//        System.out.println("Ready!");
           /*
            * This will cause the user thread (the thread that keeps the
            *  vm alive) to go into a state of constant waiting.
  @@ -361,5 +377,22 @@
           }
   
           return value;
  +    }
  +
  +    public static void setUpServerService(Kernel kernel, String type, String host, 
int port, Class serviceClass) throws Exception {
  +        ObjectName SOCKETSERVICE_NAME = 
JMXUtil.getObjectName("openejb:type=SocketService,name="+type);
  +        ObjectName SERVICEDAEMON_NAME = 
JMXUtil.getObjectName("openejb:type=ServiceDaemon,name="+type);
  +
  +        GBeanMBean gBeanMBean = new GBeanMBean(SimpleSocketService.GBEAN_INFO);
  +        gBeanMBean.setAttribute("serviceClassName", serviceClass.getName());
  +        gBeanMBean.setAttribute("onlyFrom", new 
InetAddress[]{InetAddress.getByName(host)});
  +        
gBeanMBean.setReferencePattern("ContainerIndex",NovaAssembler.CONTAINERINDEX_NAME);
  +        NovaAssembler.start(kernel, SOCKETSERVICE_NAME, gBeanMBean);
  +
  +        GBeanMBean gBeanMBean1 = new GBeanMBean(ServiceDaemon.GBEAN_INFO);
  +        gBeanMBean1.setAttribute("port", new Integer(port));
  +        gBeanMBean1.setAttribute("inetAddress", InetAddress.getByName(host));
  +        gBeanMBean1.setReferencePattern("SocketService",SOCKETSERVICE_NAME);
  +        NovaAssembler.start(kernel, SERVICEDAEMON_NAME, gBeanMBean1);
       }
   }