[jboss-cvs] JBossAS SVN: r57897 - in branches/JEE5_TCK/deployment/src: etc main/org/jboss/deployment/services

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

Author: thomas.diesler at jboss.com
Date: 2006-10-27 10:27:42 -0400 (Fri, 27 Oct 2006)
New Revision: 57897

Modified:
   branches/JEE5_TCK/deployment/src/etc/jsr88-service.xml
   branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java
   branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerServiceMBean.java
Log:
Allow for JSR88 deployments to remain in tmp/jsr88 on undeploy.
This is important for JSR88 deployment debugging (i.e. CTS)

      <attribute name="FailOnCollision">false</attribute>
      <attribute name="DeleteOnUndeploy">false</attribute>


Modified: branches/JEE5_TCK/deployment/src/etc/jsr88-service.xml
===================================================================
--- branches/JEE5_TCK/deployment/src/etc/jsr88-service.xml	2006-10-27 14:10:34 UTC (rev 57896)
+++ branches/JEE5_TCK/deployment/src/etc/jsr88-service.xml	2006-10-27 14:27:42 UTC (rev 57897)
@@ -10,6 +10,10 @@
       <attribute name="WARDeployer">jboss.web:service=WebServer</attribute>
       <attribute name="CARDeployer">jboss.j2ee:service=ClientDeployer</attribute>
       <attribute name="UploadDir">${jboss.server.temp.dir}/jsr88</attribute>
+      <!-- If false, the an existing deployment may exist in the upload dir  -->
+      <attribute name="FailOnCollision">false</attribute>
+      <!-- If false, the deployment is retained in the upload dir -->
+      <attribute name="DeleteOnUndeploy">false</attribute>
       <depends optional-attribute-name="MainDeployer">jboss.system:service=MainDeployer</depends>
    </mbean>
 </server>

Modified: branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java
===================================================================
--- branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java	2006-10-27 14:10:34 UTC (rev 57896)
+++ branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java	2006-10-27 14:27:42 UTC (rev 57897)
@@ -56,15 +56,15 @@
 public class DeploymentManagerService extends ServiceMBeanSupport implements DeploymentManagerServiceMBean
 {
    private Map moduleMap = Collections.synchronizedMap(new HashMap());
-   /**
-    * The name of the MainDeployer
-    */
+
    private ObjectName mainDeployer;
    private ObjectName carDeployer;
    private ObjectName earDeployer;
    private ObjectName ejbDeployer;
    private ObjectName rarDeployer;
    private ObjectName warDeployer;
+   private boolean failOnCollision;
+   private boolean deleteOnUndeploy;
 
    /**
     * The local directory for uploaded content.
@@ -181,6 +181,26 @@
       this.uploadDir = uploadDir;
    }
 
+   public boolean isDeleteOnUndeploy()
+   {
+      return deleteOnUndeploy;
+   }
+
+   public void setDeleteOnUndeploy(boolean deleteOnUndeploy)
+   {
+      this.deleteOnUndeploy = deleteOnUndeploy;
+   }
+
+   public boolean isFailOnCollision()
+   {
+      return failOnCollision;
+   }
+
+   public void setFailOnCollision(boolean failOnCollision)
+   {
+      this.failOnCollision = failOnCollision;
+   }
+
    public Map getModuleMap()
    {
       return Collections.unmodifiableMap(moduleMap);
@@ -200,9 +220,12 @@
       File path = new File(deployURL.getFile());
       String archive = path.getName();
       File deployFile = new File(uploadDir, archive);
-      if (deployFile.exists() == true)
+      if (failOnCollision && deployFile.exists())
          throw new IOException("deployURL(" + deployURL + ") collides with: " + deployFile.getPath());
 
+      if (deployFile.exists())
+         Files.delete(deployFile);
+      
       File parentFile = deployFile.getParentFile();
       if (parentFile.exists() == false)
       {
@@ -285,7 +308,9 @@
       File deployFile = new File(uploadDir, archive);
       if (deployFile.exists() == false)
          throw new IOException("deployURL(" + url + ") has not been distributed");
-      Files.delete(deployFile);
+      
+      if (deleteOnUndeploy)
+         Files.delete(deployFile);
 
       moduleMap.remove(url);
    }

Modified: branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerServiceMBean.java
===================================================================
--- branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerServiceMBean.java	2006-10-27 14:10:34 UTC (rev 57896)
+++ branches/JEE5_TCK/deployment/src/main/org/jboss/deployment/services/DeploymentManagerServiceMBean.java	2006-10-27 14:27:42 UTC (rev 57897)
@@ -34,17 +34,18 @@
  * DeploymentManager implementation.
  * 
  * @author Scott.Stark at jboss.org
+ * @author Thomas.Diesler at jboss.org
  * @version $Revision$
  */
 public interface DeploymentManagerServiceMBean
 {
-   public File getUploadDir();
+   File getUploadDir();
 
-   public void setUploadDir(File uploadDir);
+   void setUploadDir(File uploadDir);
 
-   public ObjectName getMainDeployer();
+   ObjectName getMainDeployer();
 
-   public void setMainDeployer(ObjectName deployer);
+   void setMainDeployer(ObjectName deployer);
 
    ObjectName getEARDeployer();
 
@@ -66,15 +67,23 @@
 
    void setCARDeployer(ObjectName name);
 
-   public Map getModuleMap();
+   boolean isDeleteOnUndeploy();
 
-   public void deploy(SerializableTargetModuleID moduleID) throws Exception;
+   void setDeleteOnUndeploy(boolean deleteOnUndeploy);
 
-   public void start(String url) throws Exception;
+   boolean isFailOnCollision();
 
-   public void stop(String url) throws Exception;
+   void setFailOnCollision(boolean failOnCollision);
 
-   public void undeploy(String url) throws Exception;
+   Map getModuleMap();
 
+   void deploy(SerializableTargetModuleID moduleID) throws Exception;
+
+   void start(String url) throws Exception;
+
+   void stop(String url) throws Exception;
+
+   void undeploy(String url) throws Exception;
+
    SerializableTargetModuleID[] getAvailableModules(int moduleType) throws TargetException;
 }