[jboss-cvs] JBossAS SVN: r87267 - in branches/Branch_5_x: system/src/main/org/jboss/system/server/profileservice/repository and 1 other directories.

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

Author: emuckenhuber
Date: 2009-04-14 03:52:12 -0400 (Tue, 14 Apr 2009)
New Revision: 87267

Modified:
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
   branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
   branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
   branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
Log:
[JBAS-6709] update profile lastModified.

Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java	2009-04-14 07:48:29 UTC (rev 87266)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/upload/remoting/DeployHandler.java	2009-04-14 07:52:12 UTC (rev 87267)
@@ -135,8 +135,6 @@
          // unlock 
          ProfileDeployment deployment = deploymentRepository.getDeployment(name);
          deploymentRepository.unlockDeploymentContent(deployment.getName());
-         // FIXME update the timestamp
-         deploymentRepository.addDeployment(deployment.getName(), deployment);
          return deployment;
       }
    }
@@ -157,8 +155,6 @@
          // Lock content
          ProfileDeployment deployment = deploymentRepository.getDeployment(name);
          deploymentRepository.lockDeploymentContent(deployment.getName());
-         // FIXME update the timestamp
-         deploymentRepository.addDeployment(deployment.getName(), deployment);
          return deployment;
       }
    }

Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java	2009-04-14 07:48:29 UTC (rev 87266)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java	2009-04-14 07:52:12 UTC (rev 87267)
@@ -188,14 +188,20 @@
    {
       if( log.isTraceEnabled() )
          log.trace("lockDeploymentContent, "+vfsPath);
-      return setDeploymentContentFlags(vfsPath, DeploymentContentFlags.LOCKED);
+      int flag = setDeploymentContentFlags(vfsPath, DeploymentContentFlags.LOCKED);
+      // FIXME update the lastModified for the ManagementView to check the DeploymentStatus
+      updateLastModfied();
+      return flag;
    }
 
    public int unlockDeploymentContent(String vfsPath)
    {
       if( log.isTraceEnabled() )
          log.trace("unlockDeploymentContent, "+vfsPath);
-      return clearDeploymentContentFlags(vfsPath, DeploymentContentFlags.LOCKED);
+      int flag = clearDeploymentContentFlags(vfsPath, DeploymentContentFlags.LOCKED);
+      // FIXME update the lastModified for the ManagementView to check the DeploymentStatus
+      updateLastModfied();
+      return flag;
    }
 
    public int getDeploymentContentFlags(String vfsPath)

Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java	2009-04-14 07:48:29 UTC (rev 87266)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java	2009-04-14 07:52:12 UTC (rev 87267)
@@ -35,6 +35,7 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.zip.ZipInputStream;
 
+import org.jboss.profileservice.spi.DeploymentContentFlags;
 import org.jboss.profileservice.spi.ModificationInfo;
 import org.jboss.profileservice.spi.ProfileDeployment;
 import org.jboss.profileservice.spi.ProfileKey;
@@ -204,7 +205,7 @@
          }
 
          // Lock the content
-         lockDeploymentContent(repositoryName);
+         setDeploymentContentFlags(repositoryName, DeploymentContentFlags.LOCKED);
       }
       finally
       {

Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java	2009-04-14 07:48:29 UTC (rev 87266)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java	2009-04-14 07:52:12 UTC (rev 87267)
@@ -343,7 +343,7 @@
          }
 
          // Lock the content
-         lockDeploymentContent(vfsPath);
+         setDeploymentContentFlags(repositoryName, DeploymentContentFlags.LOCKED);
       }
       finally
       {