[jboss-cvs] JBossAS SVN: r65002 - in trunk/system/src/main/org/jboss/system/server: profileservice/repository and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-08-31 23:14:51 -0400 (Fri, 31 Aug 2007)
New Revision: 65002

Modified:
   trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
Log:
Use the full name for deployment maps to match the name used by the MainDeployer

Modified: trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java	2007-09-01 03:13:29 UTC (rev 65001)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java	2007-09-01 03:14:51 UTC (rev 65002)
@@ -140,13 +140,13 @@
    public void addDeployment(VFSDeployment d, DeploymentPhase phase)
        throws Exception
    {
-      String name = d.getSimpleName();
+      String name = d.getName();
       repository.addDeployment(name, d, phase);
    }
    public void updateDeployment(VFSDeployment d, DeploymentPhase phase)
        throws Exception
    {
-      repository.updateDeployment(d.getSimpleName(), d, phase);
+      repository.updateDeployment(d.getName(), d, phase);
    }
    public VFSDeployment getDeployment(String name, DeploymentPhase phase)
        throws Exception, NoSuchDeploymentException

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2007-09-01 03:13:29 UTC (rev 65001)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2007-09-01 03:14:51 UTC (rev 65002)
@@ -332,12 +332,13 @@
          List<VirtualFile> children = deployDir.getChildren();
          for(VirtualFile vf : children)
          {
-            if( applicationCtxs.containsKey(vf.getPathName()) == false )
+            URI uri = vf.toURI();
+            if( applicationCtxs.containsKey(uri.toString()) == false )
             {
                VFSDeployment ctx = loadDeploymentData(vf);
                ModificationInfo info = new ModificationInfo(ctx, vf.getLastModified(), ModifyStatus.ADDED);
                modified.add(info);
-               applicationCtxs.put(vf.getPathName(), ctx);
+               applicationCtxs.put(vf.getName(), ctx);
             }
          }
       }
@@ -631,7 +632,7 @@
          for(VirtualFile vf : children)
          {
             VFSDeployment vfCtx = loadDeploymentData(vf);
-            bootstrapCtxs.put(vf.getPathName(), vfCtx);       
+            bootstrapCtxs.put(vf.getName(), vfCtx);       
          }
       }
       else
@@ -642,7 +643,7 @@
          VirtualFile confVF = VFS.getRoot(confDir.toURI());
          VirtualFile jbossServiceVF = confVF.findChild("jboss-service.xml");
          VFSDeployment vfCtx = loadDeploymentData(jbossServiceVF);
-         bootstrapCtxs.put(jbossServiceVF.getPathName(), vfCtx);                
+         bootstrapCtxs.put(vfCtx.getName(), vfCtx);                
       }
    }
 
@@ -659,7 +660,7 @@
       for(VirtualFile vf : children)
       {
          VFSDeployment vfCtx = loadDeploymentData(vf);
-         deployerCtxs.put(vf.getPathName(), vfCtx);       
+         deployerCtxs.put(vfCtx.getName(), vfCtx);       
       }
    }
 
@@ -676,7 +677,7 @@
       for(VirtualFile vf : children)
       {
          VFSDeployment vfCtx = loadDeploymentData(vf);
-         applicationCtxs.put(vf.getPathName(), vfCtx);         
+         applicationCtxs.put(vfCtx.getName(), vfCtx);         
       }
    }