[jboss-cvs] JBossAS SVN: r76131 - in projects/vfs/trunk/src/main/java/org/jboss/virtual: plugins/context and 1 other directories.

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

Author: alesj
Date: 2008-07-23 10:06:33 -0400 (Wed, 23 Jul 2008)
New Revision: 76131

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/AssembledDirectory.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java
Log:
[JBVFS-48]; fixing assembled url.
TODO on addResource optimization.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/AssembledDirectory.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/AssembledDirectory.java	2008-07-23 13:13:33 UTC (rev 76130)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/AssembledDirectory.java	2008-07-23 14:06:33 UTC (rev 76131)
@@ -105,7 +105,7 @@
     *
     * @param clazz the class
     */
-   public void addClass(Class clazz)
+   public void addClass(Class<?> clazz)
    {
       if (clazz == null)
          throw new IllegalArgumentException("Null clazz");
@@ -200,7 +200,7 @@
     * @param includes the includes
     * @param excludes the excludes
     */
-   public void addResources(Class baseResource, String[] includes, String[] excludes)
+   public void addResources(Class<?> baseResource, String[] includes, String[] excludes)
    {
       if (baseResource == null)
          throw new IllegalArgumentException("Null base resource");
@@ -246,6 +246,7 @@
     * @param excludes the excludes
     * @param loader the loader
     */
+   // TODO - optimize this
    public void addResources(String baseResource, final String[] includes, final String[] excludes, ClassLoader loader)
    {
       if (baseResource == null)

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2008-07-23 13:13:33 UTC (rev 76130)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2008-07-23 14:06:33 UTC (rev 76131)
@@ -88,6 +88,19 @@
       return delegate;
    }
 
+   /**
+    * Set the vfs url.
+    *
+    * @param vfsUrl the vfs url
+    */
+   protected void setVfsUrl(URL vfsUrl)
+   {
+      if (delegate instanceof AbstractVirtualFileHandler)
+      {
+         ((AbstractVirtualFileHandler)delegate).setVfsUrl(vfsUrl);
+      }
+   }
+
    public VirtualFileHandler getChild(String path) throws IOException
    {
       VirtualFileHandler child = getDelegate().getChild(path);

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java	2008-07-23 13:13:33 UTC (rev 76130)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledDirectoryHandler.java	2008-07-23 14:06:33 UTC (rev 76131)
@@ -56,6 +56,8 @@
    {
       super(context, parent, name);
       String path = getPathName();
+      if (path.startsWith("/") == false)
+         path = "/" + path;
       if (path.endsWith("/") == false)
          path += "/";
       setVfsUrl(new URL("vfs", context.getName(), -1, path, new AssembledUrlStreamHandler(context)));

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java	2008-07-23 13:13:33 UTC (rev 76130)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/AssembledFileHandler.java	2008-07-23 14:06:33 UTC (rev 76131)
@@ -32,8 +32,8 @@
 /**
  * The assembled file handler.
  *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="bill at jboss.com">Bill Burke</a>
  * @version $Revision: 1.1 $
  */
 @Assembled
@@ -42,7 +42,12 @@
    public AssembledFileHandler(VFSContext context, AssembledDirectoryHandler parent, String name, VirtualFileHandler delegate) throws IOException
    {
       super(context, parent, name, delegate);
-      setVfsUrl(new URL("vfs", context.getName(), -1, getPathName(), new AssembledUrlStreamHandler(context)));
+      String path = getPathName();
+      if (path.startsWith("/") == false)
+         path = "/" + path;
+      if (path.endsWith("/") == false)
+         path += "/";
+      setVfsUrl(new URL("vfs", context.getName(), -1, path, new AssembledUrlStreamHandler(context)));
    }
 
    public List<VirtualFileHandler> getChildren(boolean ignoreErrors) throws IOException

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java	2008-07-23 13:13:33 UTC (rev 76130)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/vfs/ByteArrayHandler.java	2008-07-23 14:06:33 UTC (rev 76131)
@@ -52,7 +52,12 @@
       super(context, parent, name);
       this.bytes = bytes;
       lastModified = System.currentTimeMillis();
-      setVfsUrl(new URL("vfs", context.getName(), -1, getPathName(), new AssembledUrlStreamHandler(context)));
+      String path = getPathName();
+      if (path.startsWith("/") == false)
+         path = "/" + path;
+      if (path.endsWith("/") == false)
+         path += "/";
+      setVfsUrl(new URL("vfs", context.getName(), -1, path, new AssembledUrlStreamHandler(context)));
    }
 
    @Override