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

[Gavin King]

  User: gavin   
  Date: 07/06/08 00:55:21

  Modified:    src/main/org/jboss/seam/init   Initialization.java
                        NoHotRedeployable.java
  Log:
  JBSEAM-1420
  
  Revision  Changes    Path
  1.174     +18 -17    jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.173
  retrieving revision 1.174
  diff -u -b -r1.173 -r1.174
  --- Initialization.java	8 Jun 2007 04:14:16 -0000	1.173
  +++ Initialization.java	8 Jun 2007 04:55:21 -0000	1.174
  @@ -56,7 +56,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.173 $
  + * @version $Revision: 1.174 $
    */
   public class Initialization
   {
  @@ -533,15 +533,15 @@
   
      private RedeployableStrategy getRedeployableInitialization() 
      {
  -      String dirName = servletContext.getRealPath("/WEB-INF/dev");
  -       
  -      if (dirName == null) {
  +      String path = servletContext.getRealPath("/WEB-INF/dev");
  +      if (path==null) //WebLogic!
  +      {
             log.debug("Could not find path for /WEB-INF/dev");
  -          return new NoHotRedeployable(null);           
  +         return new NoHotRedeployable();
         }
  -             
  -      File hotDeployDir = new File(dirName);
  -      
  +      else
  +      {
  +         File hotDeployDir = new File(path);
         String strategy = getRedeployableStrategyName(hotDeployDir);
         try
         {
  @@ -554,6 +554,7 @@
            throw new RuntimeException( "Unable to instantiate redeployable strategy: " + strategy );
         }
      }
  +   }
   
      private String getRedeployableStrategyName(File hotDeployDir)
      {
  
  
  
  1.3       +3 -1      jboss-seam/src/main/org/jboss/seam/init/NoHotRedeployable.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NoHotRedeployable.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/NoHotRedeployable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- NoHotRedeployable.java	18 May 2007 06:44:03 -0000	1.2
  +++ NoHotRedeployable.java	8 Jun 2007 04:55:21 -0000	1.3
  @@ -1,4 +1,4 @@
  -//$Id: NoHotRedeployable.java,v 1.2 2007/05/18 06:44:03 gavin Exp $
  +//$Id: NoHotRedeployable.java,v 1.3 2007/06/08 04:55:21 gavin Exp $
   package org.jboss.seam.init;
   
   import java.io.File;
  @@ -14,6 +14,8 @@
   {
      public NoHotRedeployable(File resource) {}
   
  +   public NoHotRedeployable() {}
  +
      public ClassLoader getClassLoader()
      {
         return null;