[jboss-cvs] JBossAS SVN: r98943 - in projects/jboss-deployers/trunk: deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit and 5 other directories.

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

Author: alesj
Date: 2009-12-29 05:57:08 -0500 (Tue, 29 Dec 2009)
New Revision: 98943

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/META-INF/jboss-structure.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/config/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/config/empty.txt
Modified:
   projects/jboss-deployers/trunk/deployers-core-spi/src/main/java/org/jboss/deployers/spi/structure/MetaDataType.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/explicit/test/DeclaredStructureUnitTestCase.java
Log:
[JBDEPLOY-232]; add type to xml/parsing.

Modified: projects/jboss-deployers/trunk/deployers-core-spi/src/main/java/org/jboss/deployers/spi/structure/MetaDataType.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-core-spi/src/main/java/org/jboss/deployers/spi/structure/MetaDataType.java	2009-12-29 06:30:41 UTC (rev 98942)
+++ projects/jboss-deployers/trunk/deployers-core-spi/src/main/java/org/jboss/deployers/spi/structure/MetaDataType.java	2009-12-29 10:57:08 UTC (rev 98943)
@@ -29,5 +29,22 @@
 public enum MetaDataType
 {
    DEFAULT,
-   ALTERNATIVE
+   ALTERNATIVE;
+
+   /**
+    * Get type.
+    *
+    * We accept "alternative" or "alt",
+    * anything else matches default.
+    *
+    * @param string the type string
+    * @return metadata type
+    */
+   public static final MetaDataType getMetaDataType(String string)
+   {
+      if (ALTERNATIVE.name().equalsIgnoreCase(string) || "alt".equalsIgnoreCase(string))
+         return ALTERNATIVE;
+      else
+         return DEFAULT;
+   }
 }
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java	2009-12-29 06:30:41 UTC (rev 98942)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java	2009-12-29 10:57:08 UTC (rev 98943)
@@ -30,6 +30,7 @@
 import org.jboss.deployers.plugins.structure.StructureMetaDataImpl;
 import org.jboss.deployers.spi.structure.ClassPathEntry;
 import org.jboss.deployers.spi.structure.MetaDataEntry;
+import org.jboss.deployers.spi.structure.MetaDataType;
 import org.jboss.deployers.spi.structure.ModificationType;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
@@ -98,7 +99,8 @@
       if("path".equals(localName))
       {
          String path = attrs.getValue("name");
-         MetaDataEntry entry = new MetaDataEntryImpl(path);
+         String type = attrs.getValue("type");
+         MetaDataEntry entry = new MetaDataEntryImpl(path, MetaDataType.getMetaDataType(type));
          parent.add(entry);
       }
       return child;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/explicit/test/DeclaredStructureUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/explicit/test/DeclaredStructureUnitTestCase.java	2009-12-29 06:30:41 UTC (rev 98942)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/explicit/test/DeclaredStructureUnitTestCase.java	2009-12-29 10:57:08 UTC (rev 98943)
@@ -33,6 +33,7 @@
  * DeclaredStructure deployer unit tests.
  * 
  * @author Scott.Stark at jboss.org
+ * @author Ales.Justin at jboss.org
  * @version $Revision: 1.1 $
  */
 public class DeclaredStructureUnitTestCase extends AbstractStructureTest
@@ -78,4 +79,12 @@
       assertMetaData(xwar, "WEB-INF");
       assertClassPath(xwar, "WEB-INF/classes", "WEB-INF/lib/w0.jar");
    }
+
+   public void testAlternative() throws Throwable
+   {
+      VFSDeploymentContext root = assertDeploy("/structure/explicit", "alt.jar");
+      // Validate the root context info
+      assertMetaDatas(root, "META-INF", "config");
+      // TODO -- check alt usage
+   }
 }

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/META-INF/jboss-structure.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/META-INF/jboss-structure.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/META-INF/jboss-structure.xml	2009-12-29 10:57:08 UTC (rev 98943)
@@ -0,0 +1,9 @@
+<structure>
+  <context>
+    <path name=""/>
+    <metaDataPath>
+      <path name="META-INF" type="Default"/>
+      <path name="config" type="Alt"/>
+    </metaDataPath>
+  </context>
+</structure>

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/alt.jar/config/empty.txt
===================================================================