[openejb-scm] openejb/modules/core/src/java/org/openejb/server ServiceManager.java SimpleSocketService.java ServerService.java ServiceAccessController.java ServiceDaemon.java ServiceException.java ServiceLogger.java ServicePool.java SocketService.java StandardServiceStack.java StandardServiceStackGBean.java SynchChannelServerDaemon.java

[dblevins]

dblevins    2005/09/06 04:09:44

  Modified:    modules/core/src/java/org/openejb/server ServiceManager.java
                        SimpleSocketService.java
  Removed:     modules/core/src/java/org/openejb/server ServerService.java
                        ServiceAccessController.java ServiceDaemon.java
                        ServiceException.java ServiceLogger.java
                        ServicePool.java SocketService.java
                        StandardServiceStack.java
                        StandardServiceStackGBean.java
                        SynchChannelServerDaemon.java
  Log:

  Now using ActiveIO XNet for the xinetd style functionality
  
  Revision  Changes    Path
  1.9       +7 -3      
openejb/modules/core/src/java/org/openejb/server/ServiceManager.java
  
  Index: ServiceManager.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/server/ServiceManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ServiceManager.java       8 May 2005 19:37:06 -0000       1.8
  +++ ServiceManager.java       6 Sep 2005 08:09:44 -0000       1.9
  @@ -58,6 +58,10 @@
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.openejb.util.Messages;
  +import org.activeio.xnet.ServerService;
  +import org.activeio.xnet.ServiceException;
  +import org.activeio.xnet.ServiceDaemon;
  +import org.activeio.xnet.ServiceDaemonGBean;
   
   
   /**
  @@ -322,7 +326,7 @@
        * @exception ServiceException
        */
       private void checkImplementation(Class clazz) throws ServiceException {
  -        Class intrfce = org.openejb.server.ServerService.class;
  +        Class intrfce = org.activeio.xnet.ServerService.class;
   
           if (!intrfce.isAssignableFrom(clazz)) {
               String msg = messages.format("service.bad.impl", 
clazz.getName(), intrfce.getName());
  @@ -394,7 +398,7 @@
           socketService.setReferencePattern("ContainerIndex", CONTAINER_INDEX);
           kernel.loadGBean(socketService, classLoader);
   
  -        GBeanData serviceDaemon = new GBeanData(SERVICEDAEMON_NAME, 
ServiceDaemon.GBEAN_INFO);
  +        GBeanData serviceDaemon = new GBeanData(SERVICEDAEMON_NAME, 
ServiceDaemonGBean.GBEAN_INFO);
           serviceDaemon.setAttribute("port", new Integer(port));
           serviceDaemon.setAttribute("inetAddress", 
InetAddress.getByName(host));
           
serviceDaemon.setReferencePattern("SocketService",SOCKETSERVICE_NAME);
  
  
  
  1.17      +9 -2      
openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java
  
  Index: SimpleSocketService.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SimpleSocketService.java  31 Mar 2005 10:29:27 -0000      1.16
  +++ SimpleSocketService.java  6 Sep 2005 08:09:44 -0000       1.17
  @@ -61,6 +61,13 @@
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import org.openejb.ContainerIndex;
   import org.openejb.OpenEJB;
  +import org.activeio.xnet.ServerService;
  +import org.activeio.xnet.hba.ServiceAccessController;
  +import org.activeio.xnet.hba.IPAddressPermission;
  +import org.activeio.xnet.ServiceException;
  +import org.activeio.xnet.ServiceLogger;
  +import org.activeio.xnet.ServicePool;
  +import org.activeio.xnet.SocketService;
   
   /**
    * @version $Revision$ $Date$
  @@ -69,7 +76,7 @@
       private static final Log log = 
LogFactory.getLog(SimpleSocketService.class);
       private final ServerService server;
   
  -    public SimpleSocketService(String serviceClassName, 
ServiceAccessController.IPAddressPermission[] onlyFrom, ContainerIndex 
containerIndex, ClassLoader cl) throws Exception {
  +    public SimpleSocketService(String serviceClassName, 
IPAddressPermission[] onlyFrom, ContainerIndex containerIndex, ClassLoader cl) 
throws Exception {
           ServerService service;
   
           Class serviceClass = ClassLoading.loadClass(serviceClassName, cl);