[jboss-cvs] JBossAS SVN: r102463 - trunk/deployment/src/main/java/org/jboss/deployment/services.

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

Author: smarlow at redhat.com
Date: 2010-03-16 10:58:23 -0400 (Tue, 16 Mar 2010)
New Revision: 102463

Modified:
   trunk/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java
Log:
JBAS-7815  JSR-88 support fails to undeploy

Modified: trunk/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java
===================================================================
--- trunk/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java	2010-03-16 14:43:47 UTC (rev 102462)
+++ trunk/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java	2010-03-16 14:58:23 UTC (rev 102463)
@@ -128,7 +128,7 @@
          throw new IllegalArgumentException("Null file");
       try
       {
-         URI uri = file.toURI();
+         URI uri = file.asFileURI();   // gets the file path without trailing slash
          return uri.toString();
       }
       catch (Exception e)
@@ -359,7 +359,7 @@
       /* TODO: that is a hack */
       if (deployment == null)
       {
-         deployment = deploymentFactory.createVFSDeployment(root);
+         deployment = deploymentFactory.createVFSDeployment(getDeploymentName(root), root);
          mainDeployer.addDeployment(deployment);
          mainDeployer.process();
          moduleID.setRunning(true);
@@ -406,7 +406,7 @@
          throw new IOException("deployURL(" + url + ") has no local archive");
 
       VirtualFile root = VFS.getChild(deployFile.toURI());
-      Deployment deployment = deploymentFactory.createVFSDeployment(root);
+      Deployment deployment = deploymentFactory.createVFSDeployment(getDeploymentName(root), root);
       mainDeployer.addDeployment(deployment);
       DeploymentContext context = null;
       try