[seam-commits] Seam SVN: r8857 - trunk/src/main/org/jboss/seam/init.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-08-30 10:00:21 -0400 (Sat, 30 Aug 2008)
New Revision: 8857

Modified:
   trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
JBSEAM-3357

Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java	2008-08-30 12:01:23 UTC (rev 8856)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java	2008-08-30 14:00:21 UTC (rev 8857)
@@ -660,17 +660,16 @@
          Contexts.getApplicationContext().remove(name + COMPONENT_SUFFIX);
       }
       //TODO open the ability to reuse the classloader by looking at the components class classloaders
-      // Rescan
-      hotDeploymentStrategy.scan();
-      // And install
-      installHotDeployableComponents();
+      createHotDeployment(Thread.currentThread().getContextClassLoader(), warRootDirectory);
+      Contexts.getEventContext().set(HotDeploymentStrategy.NAME, hotDeploymentStrategy);
+      // Add the WAR root to the hot deploy path to pick up .page.xml
       Pages.instance().setHotDotPageDotXmlFileNames(DotPageDotXmlDeploymentHandler.hotInstance().getFiles());
       init.setTimestamp( System.currentTimeMillis() );
       init.setHotDeployPaths(hotDeploymentStrategy.getHotDeploymentPaths());
       installComponents(init);
       ServletLifecycle.endInitialization();
       log.info("done redeploying");
-      return this;
+      return this;   
    }
 
    private void installHotDeployableComponents()
@@ -681,7 +680,7 @@
       }
    }
    
-   private void createHotDeployment(ClassLoader classLoader)
+   private void createHotDeployment(ClassLoader classLoader, File ... directories)
    {
       if ( isDebugEnabled() && hotDeployDirectory != null )
       {
@@ -695,12 +694,12 @@
             log.debug("Using Java hot deploy");
             hotDeploymentStrategy = new HotDeploymentStrategy(classLoader, hotDeployDirectory);
          }
+         for (File file : directories)
+         {
+            hotDeploymentStrategy.getFiles().add(file);
+         }
          hotDeploymentStrategy.scan();
          installHotDeployableComponents();
-
-         // Add the WAR root to the hot deploy path to pick up .page.xml
-         // We don't add it for the initial scan as StandardDeploymentStrategy deals with that
-         hotDeploymentStrategy.getFiles().add(warRootDirectory);
       }
    }