cvs commit: incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin DeploymentManagerImpl.java

[jboynes]

jboynes     2004/01/21 21:47:41

  Modified:    modules/deployment/src/java/org/apache/geronimo/deployment/plugin
                        DeploymentManagerImpl.java
  Log:
  Add other module types
  
  Revision  Changes    Path
  1.3       +13 -7     
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentManagerImpl.java
  
  Index: DeploymentManagerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/DeploymentManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeploymentManagerImpl.java        22 Jan 2004 00:51:09 -0000      1.2
  +++ DeploymentManagerImpl.java        22 Jan 2004 05:47:41 -0000      1.3
  @@ -91,15 +91,18 @@
   
       public DeploymentManagerImpl(
               DeploymentConfigurationFactory earFactory,
  -            DeploymentConfigurationFactory warFactory
  +            DeploymentConfigurationFactory warFactory,
  +            DeploymentConfigurationFactory ejbFactory,
  +            DeploymentConfigurationFactory rarFactory,
  +            DeploymentConfigurationFactory carFactory
               ) {
           connected = false;
           configurationFactories = new HashMap(5);
           configurationFactories.put(ModuleType.EAR, earFactory);
           configurationFactories.put(ModuleType.WAR, warFactory);
  -        configurationFactories.put(ModuleType.EJB, null);
  -        configurationFactories.put(ModuleType.RAR, null);
  -        configurationFactories.put(ModuleType.CAR, null);
  +        configurationFactories.put(ModuleType.EJB, ejbFactory);
  +        configurationFactories.put(ModuleType.RAR, rarFactory);
  +        configurationFactories.put(ModuleType.CAR, carFactory);
       }
   
       public DeploymentConfiguration createConfiguration(DeployableObject 
deployable) throws InvalidModuleException {
  @@ -234,9 +237,12 @@
           GBeanInfoFactory infoFactory = new GBeanInfoFactory("JSR88 
Deployment Manager", DeploymentManagerImpl.class.getName());
           infoFactory.addEndpoint(new GEndpointInfo("EARFactory", 
DeploymentConfigurationFactory.class.getName()));
           infoFactory.addEndpoint(new GEndpointInfo("WARFactory", 
DeploymentConfigurationFactory.class.getName()));
  +        infoFactory.addEndpoint(new GEndpointInfo("EJBFactory", 
DeploymentConfigurationFactory.class.getName()));
  +        infoFactory.addEndpoint(new GEndpointInfo("RARFactory", 
DeploymentConfigurationFactory.class.getName()));
  +        infoFactory.addEndpoint(new GEndpointInfo("CARFactory", 
DeploymentConfigurationFactory.class.getName()));
           infoFactory.setConstructor(new GConstructorInfo(
  -                Arrays.asList(new Object[] {"EARFactory", "WARFactory"}),
  -                Arrays.asList(new Object[] 
{DeploymentConfigurationFactory.class, DeploymentConfigurationFactory.class})
  +                Arrays.asList(new Object[] {"EARFactory", "WARFactory", 
"EJBFactory", "RARFactory", "CARFactory"}),
  +                Arrays.asList(new Object[] 
{DeploymentConfigurationFactory.class, DeploymentConfigurationFactory.class, 
DeploymentConfigurationFactory.class, DeploymentConfigurationFactory.class, 
DeploymentConfigurationFactory.class})
           ));
           GBEAN_INFO = infoFactory.getBeanInfo();
       }