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

[dain]

dain        2006/02/01 06:50:08

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

  Major refactor
  Split container into an object to represent a deployed ejb and a set of 
shared containers which process invocations
  Introduced interface between CMP container and CMP engine
  
  Revision  Changes    Path
  1.19      +7 -6      
openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java
  
  Index: SimpleSocketService.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- SimpleSocketService.java  1 Dec 2005 08:34:52 -0000       1.18
  +++ SimpleSocketService.java  1 Feb 2006 11:50:08 -0000       1.19
  @@ -59,7 +59,8 @@
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.kernel.ClassLoading;
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
  -import org.openejb.ContainerIndex;
  +import org.apache.geronimo.kernel.ClassLoading;
  +import org.openejb.DeploymentIndex;
   import org.openejb.OpenEJB;
   import org.activeio.xnet.ServerService;
   import org.activeio.xnet.hba.ServiceAccessController;
  @@ -76,7 +77,7 @@
       private static final Log log = 
LogFactory.getLog(SimpleSocketService.class);
       private final ServerService server;
   
  -    public SimpleSocketService(String serviceClassName, 
IPAddressPermission[] onlyFrom, ContainerIndex containerIndex, ClassLoader cl) 
throws Exception {
  +    public SimpleSocketService(String serviceClassName, 
IPAddressPermission[] onlyFrom, DeploymentIndex deploymentIndex, ClassLoader 
cl) throws Exception {
           ServerService service;
   
           Class serviceClass = ClassLoading.loadClass(serviceClassName, cl);
  @@ -84,8 +85,8 @@
               throw new ServiceException("Server service class does not 
implement " + ServerService.class.getName() + ": " + serviceClassName);
           }
           try {
  -            Constructor constructor = serviceClass.getConstructor(new 
Class[]{ContainerIndex.class});
  -            service = (ServerService) constructor.newInstance(new 
Object[]{containerIndex});
  +            Constructor constructor = serviceClass.getConstructor(new 
Class[]{DeploymentIndex.class});
  +            service = (ServerService) constructor.newInstance(new 
Object[]{deploymentIndex});
           } catch (Exception e) {
               throw new ServiceException("Error constructing server service 
class", e);
           }
  @@ -141,7 +142,7 @@
           infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addAttribute("name", String.class, false);
   
  -        infoFactory.addReference("ContainerIndex", ContainerIndex.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoFactory.addReference("ContainerIndex", DeploymentIndex.class, 
NameFactory.GERONIMO_SERVICE);
   
           infoFactory.addInterface(SocketService.class);