[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...

[Gavin King]

  User: gavin   
  Date: 07/04/23 20:06:40

  Modified:    src/main/org/jboss/seam/init    GroovyHotRedeployable.java
                        JavaHotRedeployable.java RedeployableStrategy.java
  Log:
  minor cleanups
  
  Revision  Changes    Path
  1.2       +5 -6      jboss-seam/src/main/org/jboss/seam/init/GroovyHotRedeployable.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GroovyHotRedeployable.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/GroovyHotRedeployable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- GroovyHotRedeployable.java	18 Apr 2007 06:40:04 -0000	1.1
  +++ GroovyHotRedeployable.java	24 Apr 2007 00:06:40 -0000	1.2
  @@ -1,14 +1,13 @@
  -//$Id: GroovyHotRedeployable.java,v 1.1 2007/04/18 06:40:04 ebernard Exp $
  +//$Id: GroovyHotRedeployable.java,v 1.2 2007/04/24 00:06:40 gavin Exp $
   package org.jboss.seam.init;
   
  +import groovy.lang.GroovyClassLoader;
  +
   import java.net.URL;
   
  -import groovy.lang.GroovyClassLoader;
   import org.codehaus.groovy.control.CompilerConfiguration;
   import org.jboss.seam.deployment.ComponentScanner;
   import org.jboss.seam.deployment.GroovyComponentScanner;
  -import org.jboss.seam.log.LogProvider;
  -import org.jboss.seam.log.Logging;
   
   /**
    * Support Groovy file loading as well as Java class loading
  @@ -19,7 +18,6 @@
   public class GroovyHotRedeployable extends JavaHotRedeployable
   {
      private static final String DEFAULT_SCRIPT_EXTENSION = new CompilerConfiguration().getDefaultScriptExtension();
  -   private static final LogProvider log = Logging.getLogProvider(GroovyHotRedeployable.class);
   
      public GroovyHotRedeployable(URL resource)
      {
  @@ -31,6 +29,7 @@
         if (classLoader != null) classLoader = new GroovyClassLoader(classLoader);
      }
   
  +   @Override
      public ComponentScanner getScanner()
      {
         return classLoader != null ?
  @@ -38,7 +37,7 @@
               null;
      }
   
  -
  +   @Override
      public boolean isFromHotDeployClassLoader(Class componentClass)
      {
         //loaded by groovy or java
  
  
  
  1.2       +1 -4      jboss-seam/src/main/org/jboss/seam/init/JavaHotRedeployable.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JavaHotRedeployable.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/JavaHotRedeployable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- JavaHotRedeployable.java	18 Apr 2007 06:40:04 -0000	1.1
  +++ JavaHotRedeployable.java	24 Apr 2007 00:06:40 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: JavaHotRedeployable.java,v 1.1 2007/04/18 06:40:04 ebernard Exp $
  +//$Id: JavaHotRedeployable.java,v 1.2 2007/04/24 00:06:40 gavin Exp $
   package org.jboss.seam.init;
   
   import java.io.File;
  @@ -7,8 +7,6 @@
   import java.net.URLClassLoader;
   
   import org.jboss.seam.deployment.ComponentScanner;
  -import org.jboss.seam.log.LogProvider;
  -import org.jboss.seam.log.Logging;
   
   /**
    * Hot redeployment of Java classes
  @@ -17,7 +15,6 @@
    */
   public class JavaHotRedeployable implements RedeployableStrategy
   {
  -   private static final LogProvider log = Logging.getLogProvider(JavaHotRedeployable.class);
   
      protected File[] paths;
      protected ClassLoader classLoader;
  
  
  
  1.2       +7 -7      jboss-seam/src/main/org/jboss/seam/init/RedeployableStrategy.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RedeployableStrategy.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/RedeployableStrategy.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- RedeployableStrategy.java	18 Apr 2007 06:40:04 -0000	1.1
  +++ RedeployableStrategy.java	24 Apr 2007 00:06:40 -0000	1.2
  @@ -1,10 +1,9 @@
  -//$Id: RedeployableStrategy.java,v 1.1 2007/04/18 06:40:04 ebernard Exp $
  +//$Id: RedeployableStrategy.java,v 1.2 2007/04/24 00:06:40 gavin Exp $
   package org.jboss.seam.init;
   
   import java.io.File;
   
   import org.jboss.seam.deployment.ComponentScanner;
  -import org.jboss.seam.deployment.Scanner;
   
   /**
    * Abstract the redeployable initialization mechanism
  @@ -15,7 +14,7 @@
    */
   public interface RedeployableStrategy
   {
  -   /**
  +   /*
       * Mandatory constructor
       *
       * @param resource url containing the redeployable files
  @@ -23,11 +22,12 @@
      //RedeployableInitialization(URL resource);
   
   
  -   ClassLoader getClassLoader();
  +   public ClassLoader getClassLoader();
   
  -   File[] getPaths();
  +   public File[] getPaths();
   
  -   ComponentScanner getScanner();
  +   public ComponentScanner getScanner();
  +
  +   public boolean isFromHotDeployClassLoader(Class componentClass);
   
  -   boolean isFromHotDeployClassLoader(Class componentClass);
   }