geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/service ParentDeployerTest.java
Date Wed, 04 Feb 2004 05:43:31 GMT
adc         2004/02/03 21:43:31

  Modified:    modules/deployment/src/java/org/apache/geronimo/deployment
                        Bootstrap.java
               modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories
                        DeploymentFactoryImpl.java
               modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local
                        LocalServer.java
               modules/deployment/src/test/org/apache/geronimo/deployment/service
                        ParentDeployerTest.java
  Log:
  Added a kernel name to the Kernel and a way of retrieving
  a Kernel by that name
  
  Revision  Changes    Path
  1.5       +2 -2      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Bootstrap.java	23 Jan 2004 19:58:16 -0000	1.4
  +++ Bootstrap.java	4 Feb 2004 05:43:31 -0000	1.5
  @@ -119,7 +119,7 @@
   
           File storeDir = new File(tmpDir, "config");
           storeDir.mkdir();
  -        final Kernel kernel = new Kernel("geronimo", LocalConfigStore.GBEAN_INFO, storeDir);
  +        final Kernel kernel = new Kernel("geronimo.kernel", "geronimo", LocalConfigStore.GBEAN_INFO,
storeDir);
           Runtime.getRuntime().addShutdownHook(new Thread("Shutdown Thread") {
               public void run() {
                   kernel.shutdown();
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
  
  Index: DeploymentFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeploymentFactoryImpl.java	25 Jan 2004 21:07:03 -0000	1.4
  +++ DeploymentFactoryImpl.java	4 Feb 2004 05:43:31 -0000	1.5
  @@ -120,7 +120,7 @@
       }
   
       private DeploymentManager createManager(GBeanMBean server) throws DeploymentManagerCreationException
{
  -        Kernel kernel = new Kernel("geronimo.deployment");
  +        Kernel kernel = new Kernel("geronimo.deployment", "geronimo.deployment");
           try {
               kernel.boot();
           } catch (Exception e) {
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/LocalServer.java
  
  Index: LocalServer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/local/LocalServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalServer.java	26 Jan 2004 05:55:26 -0000	1.3
  +++ LocalServer.java	4 Feb 2004 05:43:31 -0000	1.4
  @@ -97,7 +97,7 @@
       public LocalServer(URI rootConfigID, File configStore) {
           this.rootConfigID = rootConfigID;
           target = new TargetImpl(this.rootConfigID.toString(), null);
  -        kernel = new Kernel("geronimo.localserver", LocalConfigStore.GBEAN_INFO, configStore);
  +        kernel = new Kernel(this.rootConfigID.toString(), "geronimo.localserver", LocalConfigStore.GBEAN_INFO,
configStore);
       }
   
       public boolean isLocal() {
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/service/ParentDeployerTest.java
  
  Index: ParentDeployerTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/service/ParentDeployerTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParentDeployerTest.java	25 Jan 2004 21:07:04 -0000	1.4
  +++ ParentDeployerTest.java	4 Feb 2004 05:43:31 -0000	1.5
  @@ -126,7 +126,7 @@
           workDir = new File(tmpDir, "test.car.work");
           workDir.mkdir();
   
  -        kernel = new Kernel("geronimo");
  +        kernel = new Kernel("test.kernel", "geronimo");
           kernel.boot();
   
           ByteArrayOutputStream baos = new ByteArrayOutputStream();
  
  
  

Mime
View raw message