[jboss-cvs] JBossAS SVN: r94972 - in projects/jboss-deployers/branches/vfs3: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client and 1 other directories.

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

Author: david.lloyd at jboss.com
Date: 2009-10-15 13:50:01 -0400 (Thu, 15 Oct 2009)
New Revision: 94972

Modified:
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
   projects/jboss-deployers/branches/vfs3/pom.xml
Log:
A few compile cleanups

Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java	2009-10-15 17:35:13 UTC (rev 94971)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/client/AbstractVFSDeployment.java	2009-10-15 17:50:01 UTC (rev 94972)
@@ -56,14 +56,7 @@
       if (root == null)
          throw new IllegalArgumentException("Null root");
 
-      try
-      {
-         return root.toURI().toString();
-      }
-      catch (Exception e)
-      {
-         return root.getName();
-      }
+      return root.getName();
    }
 
    /**

Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java	2009-10-15 17:35:13 UTC (rev 94971)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java	2009-10-15 17:50:01 UTC (rev 94972)
@@ -66,26 +66,6 @@
    private transient VFSDeploymentResourceLoader loader;
 
    /**
-    * Get the vfs file name safely
-    *
-    * @param root the virutal file
-    * @return the name
-    */
-   static final String safeVirtualFileName(VirtualFile root)
-   {
-      if (root == null)
-         throw new IllegalArgumentException("Null root");
-      try
-      {
-         return root.toURI().toString();
-      }
-      catch (Exception e)
-      {
-         return root.getName();
-      }
-   }
-
-   /**
     * For serialization
     */
    public AbstractVFSDeploymentContext()
@@ -114,7 +94,7 @@
     */
    public AbstractVFSDeploymentContext(VirtualFile root, String relativePath)
    {
-      super(safeVirtualFileName(root), root.getName(), relativePath);
+      super(root.getName(), root.getName(), relativePath);
       this.root = root;
    }
 
@@ -167,9 +147,9 @@
       }
    }
 
-   public void setMetaDataLocations(List<VirtualFile> locations)
+   public void setMetaDataLocations(List<VirtualFile> metaDataLocations)
    {
-      this.metaDataLocations = locations;
+      this.metaDataLocations = metaDataLocations;
    }
 
    public VirtualFile getMetaDataFile(String name)
@@ -359,11 +339,11 @@
       }
    }
 
-   public void setClassPath(List<VirtualFile> paths)
+   public void setClassPath(List<VirtualFile> classPath)
    {
-      this.classPath = paths;
-      if (log.isTraceEnabled() && paths != null)
-         log.trace("ClassPath for " + root.getPathName() + " is " + VFSUtils.getPathsString(paths));
+      this.classPath = classPath;
+      if (log.isTraceEnabled() && classPath != null)
+         log.trace("ClassPath for " + root.getPathName() + " is " + VFSUtils.getPathsString(classPath));
    }
 
    public void appendClassPath(List<VirtualFile> files)
@@ -472,19 +452,6 @@
       return new AbstractVFSDeploymentUnit(this);
    }
 
-   @Override
-   public void cleanup()
-   {
-      try
-      {
-         root.cleanup();
-      }
-      finally
-      {
-         super.cleanup();
-      }
-   }
-   
    @SuppressWarnings("unchecked")
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {

Modified: projects/jboss-deployers/branches/vfs3/pom.xml
===================================================================
--- projects/jboss-deployers/branches/vfs3/pom.xml	2009-10-15 17:35:13 UTC (rev 94971)
+++ projects/jboss-deployers/branches/vfs3/pom.xml	2009-10-15 17:50:01 UTC (rev 94972)
@@ -25,7 +25,7 @@
     <version.jboss.man>2.1.1.CR1</version.jboss.man>
     <version.jboss.mdr>2.0.2.GA</version.jboss.mdr>
     <version.jboss.kernel>2.2.0-SNAPSHOT</version.jboss.kernel>
-    <version.jboss.classloader>2.0.7.CR1</version.jboss.classloader>
+    <version.jboss.classloader>2.2.0-SNAPSHOT</version.jboss.classloader>
     <version.jboss.classloading.spi>5.1.0.SP1</version.jboss.classloading.spi>
     <version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>