[Jboss-cvs] JBossAS SVN: r56728 - in projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers: plugins/deployer plugins/structure spi/deployer spi/structure

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

Author: adrian at jboss.org
Date: 2006-09-11 08:24:59 -0400 (Mon, 11 Sep 2006)
New Revision: 56728

Modified:
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployer/DeploymentUnit.java
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java
Log:
[JBMICROCONT-5] - Use the URI as the deployment name.
Simplify the context/unit api to just return a virtual file for metadata files.

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java	2006-09-11 12:15:54 UTC (rev 56727)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployer/AbstractDeploymentUnit.java	2006-09-11 12:24:59 UTC (rev 56728)
@@ -21,11 +21,9 @@
 */
 package org.jboss.deployers.plugins.deployer;
 
-import java.io.InputStream;
-import java.net.URL;
-
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
 import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.virtual.VirtualFile;
 
 /**
  * AbstractDeploymentUnit.<p>
@@ -66,13 +64,8 @@
       return cl;
    }
 
-   public URL getMetaData(String name)
+   public VirtualFile getMetaDataFile(String name)
    {
-      return deploymentContext.getMetaData(name);
+      return deploymentContext.getMetaDataFile(name);
    }
-
-   public InputStream getMetaDataAsStream(String name)
-   {
-      return deploymentContext.getMetaDataAsStream(name);
-   }
 }

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2006-09-11 12:15:54 UTC (rev 56727)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/AbstractDeploymentContext.java	2006-09-11 12:24:59 UTC (rev 56728)
@@ -22,8 +22,7 @@
 package org.jboss.deployers.plugins.structure;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
+import java.net.URI;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -95,13 +94,13 @@
          throw new IllegalArgumentException("Null file");
       try
       {
-         URL url = file.toURL();
-         String name = url.toString();
+         URI uri = file.toURI();
+         String name = uri.toString();
          return name;
       }
       catch (Exception e)
       {
-         throw new IllegalArgumentException("File does not have a valid url: " + file, e);
+         throw new IllegalArgumentException("File does not have a valid uri: " + file, e);
       }
    }
 
@@ -353,16 +352,13 @@
       this.problem = problem;
    }
 
-   public URL getMetaData(String name)
+   public VirtualFile getMetaDataFile(String name)
    {
       if (metaDataLocation == null)
          return null;
       try
       {
-         VirtualFile child = metaDataLocation.findChild(name);
-         if (child == null)
-            return null;
-         return child.toURL();
+         return metaDataLocation.findChild(name);
       }
       catch (Exception e)
       {
@@ -370,22 +366,6 @@
          return null;
       }
    }
-
-   public InputStream getMetaDataAsStream(String name)
-   {
-      URL url = getMetaData(name);
-      if (url == null)
-         return null;
-      try
-      {
-         return url.openStream();
-      }
-      catch (Exception e)
-      {
-         log.debug("Error retrieving meta data: " + name + " from " + url, e);
-         return null;
-      }
-   }
    
    public void reset()
    {

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployer/DeploymentUnit.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployer/DeploymentUnit.java	2006-09-11 12:15:54 UTC (rev 56727)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployer/DeploymentUnit.java	2006-09-11 12:24:59 UTC (rev 56728)
@@ -21,8 +21,7 @@
 */
 package org.jboss.deployers.spi.deployer;
 
-import java.io.InputStream;
-import java.net.URL;
+import org.jboss.virtual.VirtualFile;
 
 /**
  * DeploymentUnit.<p>
@@ -50,17 +49,9 @@
     * @param name the resource name
     * @return the url of the metadata or null if not found
     */
-   URL getMetaData(String name);
+   VirtualFile getMetaDataFile(String name);
    
    /**
-    * Gets some metadata as a stream
-    * 
-    * @param name the resource name
-    * @return the stream or null if not found
-    */
-   InputStream getMetaDataAsStream(String name);
-   
-   /**
     * Gets the classloader for this deployment unit
     * 
     * @return the classloader

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java	2006-09-11 12:15:54 UTC (rev 56727)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/structure/DeploymentContext.java	2006-09-11 12:24:59 UTC (rev 56728)
@@ -21,8 +21,6 @@
 */
 package org.jboss.deployers.spi.structure;
 
-import java.io.InputStream;
-import java.net.URL;
 import java.util.List;
 import java.util.Set;
 
@@ -122,20 +120,12 @@
    void setMetaDataLocation(VirtualFile location);
    
    /**
-    * Gets some metadata for this deployment unit
+    * Gets a metadata file for this deployment unit
     * 
     * @param name the resource name
     * @return the url of the metadata or null if not found
     */
-   URL getMetaData(String name);
-   
-   /**
-    * Gets some metadata as a stream
-    * 
-    * @param name the resource name
-    * @return the stream or null if not found
-    */
-   InputStream getMetaDataAsStream(String name);
+   VirtualFile getMetaDataFile(String name);
 
    /**
     * Gets the classloader for this deployment unit