[jboss-cvs] JBossAS SVN: r111820 - in projects/jboss-deployers/trunk: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency and 2 other directories.

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

Author: alesj
Date: 2011-07-24 08:22:52 -0400 (Sun, 24 Jul 2011)
New Revision: 111820

Modified:
   projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java
Log:
[JBDEPLOY-276, JBDEPLOY-277]; fix empty aliases, declarative .war handling.


Modified: projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java	2011-07-22 16:20:42 UTC (rev 111819)
+++ projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java	2011-07-24 12:22:52 UTC (rev 111820)
@@ -313,6 +313,9 @@
       boolean isNullComparator = in.readBoolean();
       if (isNullComparator == false)
          setComparatorClassName(in.readUTF());
+      boolean isNullMT = in.readBoolean();
+      if (isNullMT == false)
+         setModificationType(ModificationType.values()[in.readInt()]);
    }
 
    /**
@@ -338,5 +341,9 @@
       out.writeBoolean(isNullComparator);
       if (isNullComparator == false)
          out.writeUTF(comparator);
+      boolean isNullMT = (getModificationType() == null);
+      out.writeBoolean(isNullMT);
+      if (isNullMT == false)
+         out.writeInt(getModificationType().ordinal());
    }
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java	2011-07-22 16:20:42 UTC (rev 111819)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java	2011-07-24 12:22:52 UTC (rev 111820)
@@ -21,9 +21,9 @@
  */
 package org.jboss.deployers.vfs.plugins.dependency;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
-import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 import java.util.Set;
@@ -56,7 +56,9 @@
          String line;
          while ((line = br.readLine()) != null)
          {
-            alises.add(line);
+            line = line.trim();
+            if (line.length() > 0)
+               alises.add(line);
          }
       }
       finally

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java	2011-07-22 16:20:42 UTC (rev 111819)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java	2011-07-24 12:22:52 UTC (rev 111820)
@@ -21,6 +21,8 @@
  */
 package org.jboss.deployers.vfs.plugins.structure;
 
+import java.io.IOException;
+
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.spi.structure.StructureContext;
 import org.jboss.deployers.vfs.spi.structure.StructureDeployer;
@@ -28,8 +30,6 @@
 import org.jboss.vfs.util.automount.Automounter;
 import org.jboss.vfs.util.automount.MountOption;
 
-import java.io.IOException;
-
 /**
  * Abstract {@link StructureDeployer} used to help mount VFS archive based {@link StructureDeployer}s.
  *
@@ -144,4 +144,26 @@
    {
       Automounter.mount(file, MountOption.COPY);
    }
+
+   /**
+    * Perform expanded mount.
+    *
+    * @param file the file to mount
+    * @throws IOException for any IO error
+    */
+   protected void performExpandedMount(VirtualFile file) throws IOException
+   {
+      Automounter.mount(file, MountOption.EXPANDED, MountOption.COPY);
+   }
+
+   /**
+    * Is the file web archive.
+    *
+    * @param file the file
+    * @return true if file is web archive, false otherwise
+    */
+   protected boolean isWAR(VirtualFile file)
+   {
+      return file.getName().endsWith(".war");
+   }
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java	2011-07-22 16:20:42 UTC (rev 111819)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java	2011-07-24 12:22:52 UTC (rev 111820)
@@ -27,6 +27,7 @@
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.spi.structure.ModificationType;
 import org.jboss.deployers.spi.structure.StructureMetaData;
 import org.jboss.deployers.vfs.plugins.structure.AbstractVFSArchiveStructureDeployer;
 import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
@@ -157,7 +158,10 @@
             final VirtualFile child = structureRoot.getChild(contextPath);
             if(child.exists() && child.isFile()) 
             {
-               performMount(child);
+               if ((contextInfo.getModificationType() == ModificationType.EXPLODE) || isWAR(child))
+                  performExpandedMount(child);
+               else
+                  performMount(child);
             }
          }
       }