[jboss-cvs] JBossAS SVN: r63904 - in trunk: system/src/main/org/jboss/system/server/profileservice/hotdeploy and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-07-07 20:32:22 -0400 (Sat, 07 Jul 2007)
New Revision: 63904

Modified:
   trunk/server/src/etc/conf/default/bootstrap-beans.xml
   trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java
Log:
Drop the Kernel property and directly inject the KernelController

Modified: trunk/server/src/etc/conf/default/bootstrap-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-beans.xml	2007-07-08 00:29:14 UTC (rev 63903)
+++ trunk/server/src/etc/conf/default/bootstrap-beans.xml	2007-07-08 00:32:22 UTC (rev 63904)
@@ -249,7 +249,7 @@
       <property name="mainDeployer"><inject bean="MainDeployer"/></property>
       <!-- Workaround for JBMICROCONT-176
       -->
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
       <!-- Broken due to JBMICROCONT-176
          <property name="controller"><inject bean="jboss.kernel:service=Kernel" property="controller"/></property>
       -->

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java	2007-07-08 00:29:14 UTC (rev 63903)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java	2007-07-08 00:32:22 UTC (rev 63904)
@@ -59,7 +59,6 @@
    // Private Data --------------------------------------------------
    /** The MainDeployer used to deploy modifications */
    private MainDeployer mainDeployer;
-   private Kernel kernel;
    /** The controller */
    private KernelController controller;
 
@@ -91,17 +90,6 @@
       this.mainDeployer = deployer;
    }
 
-   public Kernel getKernel()
-   {
-      return kernel;
-   }
-
-   public void setKernel(Kernel kernel)
-   {
-      this.kernel = kernel;
-      this.controller = kernel.getController();
-   }
-
    public KernelController getController()
    {
       return controller;