[jboss-cvs] JBossAS SVN: r83868 - in trunk: embedded and 1 other directories.

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

Author: alesj
Date: 2009-02-04 16:09:37 -0500 (Wed, 04 Feb 2009)
New Revision: 83868

Modified:
   trunk/console/pom.xml
   trunk/embedded/pom.xml
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java
Log:
Fix poms, update how we check if we need to dive into deployment for metadata modifications.

Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml	2009-02-04 20:25:57 UTC (rev 83867)
+++ trunk/console/pom.xml	2009-02-04 21:09:37 UTC (rev 83868)
@@ -56,11 +56,11 @@
       <groupId>jfree</groupId>
       <artifactId>jfreechart</artifactId>
     </dependency>
+      <dependency>
+        <groupId>jboss.web</groupId>
+        <artifactId>servlet-api</artifactId>
+      </dependency>
     <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-servlet-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
     </dependency>

Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml	2009-02-04 20:25:57 UTC (rev 83867)
+++ trunk/embedded/pom.xml	2009-02-04 21:09:37 UTC (rev 83868)
@@ -149,8 +149,8 @@
       <artifactId>jboss-jms-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.javaee</groupId>
-      <artifactId>jboss-servlet-api</artifactId>
+      <groupId>jboss.web</groupId>
+      <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java	2009-02-04 20:25:57 UTC (rev 83867)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/MutableDeploymentRepository.java	2009-02-04 21:09:37 UTC (rev 83868)
@@ -42,11 +42,10 @@
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
 import org.jboss.profileservice.spi.DeploymentContentFlags;
 import org.jboss.profileservice.spi.ModificationInfo;
+import org.jboss.profileservice.spi.ModificationInfo.ModifyStatus;
 import org.jboss.profileservice.spi.ProfileDeployment;
 import org.jboss.profileservice.spi.ProfileKey;
-import org.jboss.profileservice.spi.ModificationInfo.ModifyStatus;
 import org.jboss.virtual.VFS;
-import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VirtualFileFilter;
 
@@ -274,11 +273,7 @@
     */
    protected boolean hasBeenModified(VirtualFile root) throws Exception
    {
-      // get file:/ schema
-      URI uri = VFSUtils.getCompatibleURI(root);
-      File file = new File(uri);
-      // if root is file check its modification
-      if (file.isFile())
+      if (root.isArchive() || root.isLeaf())
          return root.hasBeenModified();
 
       // else check metadata