[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbContainerFactory.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/08/21 00:51:38

  Modified:    src/main/org/jboss/ejb ContainerFactory.java
  Log:
  Added tmp dir to /dist
  Added tmp dir usage in ContainerFactory
  Added tmp dir cleanup in ContainerFactory
  
  Revision  Changes    Path
  1.35      +46 -3     jboss/src/main/org/jboss/ejb/ContainerFactory.java
  
  Index: ContainerFactory.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ContainerFactory.java     2000/08/20 20:47:20     1.34
  +++ ContainerFactory.java     2000/08/21 07:51:37     1.35
  @@ -76,7 +76,7 @@
   *   @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
   *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
   *
  -*   @version $Revision: 1.34 $
  +*   @version $Revision: 1.35 $
   */
   public class ContainerFactory
        extends org.jboss.util.ServiceMBeanSupport
  @@ -89,6 +89,9 @@
        public static String DEFAULT_ENTITY_CMP_CONFIGURATION = "Default CMP 
EntityBean";
   
        // Attributes ----------------------------------------------------
  +   // Temp directory where deployed jars are stored
  +     File tmpDir;
  +   
        // The logger of this service
        Log log = new Log(getName());
   
  @@ -129,6 +132,37 @@
        }
   
       /**
  +     * Implements the template method in superclass. This method inits the factory
  +     */
  +   public void initService()
  +   {
  +      URL tmpFile = getClass().getResource("/tmp.properties");
  +      if (tmpFile != null)
  +      {
  +         tmpDir = new File(new File(tmpFile.getFile()).getParent(),"deploy/");    
  +         tmpDir.mkdirs();
  +         
  +         log.log("Temporary directory set to:"+tmpDir);
  +         
  +         // Clear tmp directory of previously deployed files
  +         // This is to clear up if jBoss previously crashed, hence not removing 
files properly
  +         File[] files = tmpDir.listFiles();
  +         for (int i = 0; i < files.length; i++)
  +         {
  +            files[i].delete();
  +         }
  +         
  +         if (files.length > 0)
  +         {
  +            log.log("Previous deployments removed");
  +         }
  +      } else
  +      {
  +         log.log("Using the systems temporary directory");
  +      }
  +   }
  + 
  +    /**
        * Implements the template method in superclass. This method stops all the
        * applications in this server.
        */
  @@ -246,10 +280,19 @@
                        URL origUrl = url;
                        
                        // copy the jar file to prevent locking - redeploy failure
  -                     if (url.getProtocol().startsWith("file") && 
url.getFile().endsWith(".jar")) 
  +                     if (url.getProtocol().startsWith("file") && 
!url.getFile().endsWith("/")) 
            {
  +            System.out.println(tmpDir);
  +         
                                File jarFile = new File(url.getFile());
  -                             File tmp = File.createTempFile("tmpejbjar",".jar");
  +            File tmp;
  +            if (tmpDir == null)
  +            {
  +               tmp = File.createTempFile("tmpejbjar",".jar");
  +            } else
  +            {
  +               tmp = File.createTempFile("tmpejbjar",".jar", tmpDir);
  +            }
                tmp.deleteOnExit();
                FileInputStream fin = new FileInputStream(jarFile);
                byte[] bytes = new byte[(int)jarFile.length()];