[jboss-cvs] JBossAS SVN: r80372 - in projects/jboss-deployers/trunk/deployers-vfs/src: test/java/org/jboss/test/deployers/vfs/deployer/validate/test and 3 other directories.

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

Author: alesj
Date: 2008-11-03 06:45:06 -0500 (Mon, 03 Nov 2008)
New Revision: 80372

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/META-INF/jboss-structure.xml
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/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java
Log:
[JBDEPLOY-120]; add comparator attribute to context element.

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	2008-11-03 11:15:27 UTC (rev 80371)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java	2008-11-03 11:45:06 UTC (rev 80372)
@@ -66,6 +66,9 @@
          String modificationType = attrs.getValue("modification");
          if (modificationType != null)
             child.setModificationType(ModificationType.getModificationType(modificationType));
+         String comparator = attrs.getValue("comparator");
+         if (comparator != null)
+            child.setComparatorClassName(comparator);
          return child;
       }
       return null;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java	2008-11-03 11:15:27 UTC (rev 80371)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java	2008-11-03 11:45:06 UTC (rev 80372)
@@ -25,6 +25,7 @@
 
 import junit.framework.Test;
 import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.deployers.spi.structure.ContextInfo;
 import org.jboss.deployers.spi.structure.StructureMetaData;
 import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentContext;
 import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentUnit;
@@ -70,4 +71,34 @@
          deployer.undeploy(unit);
       }
    }
+
+   public void testComparator() throws Exception
+   {
+      VirtualFile file = getVirtualFile("/structure/explicit", "comparator.jar");
+      VFSDeploymentContext deployment = new AbstractVFSDeploymentContext(file, "");
+      deployment.setMetaDataPath(Collections.singletonList("META-INF"));
+      VFSDeploymentUnit unit = new AbstractVFSDeploymentUnit(deployment);
+      Deployer deployer = new StructureOMFDeployer();
+
+      deployer.deploy(unit);
+      try
+      {
+         StructureMetaData metaData = unit.getAttachment(StructureMetaData.class);
+         assertNotNull(metaData);
+         assertComparator(metaData, "", "org.jboss.test.deployment.test.SomeDeploymentComparatorTop");
+         assertComparator(metaData, "sub.jar", "org.jboss.test.deployment.test.SomeDeploymentComparatorSub");
+         assertComparator(metaData, "x.war", "org.jboss.test.deployment.test.SomeDeploymentComparatorX");
+      }
+      finally
+      {
+         deployer.undeploy(unit);
+      }
+   }
+
+   protected void assertComparator(StructureMetaData metaData, String path, String comparator)
+   {
+      ContextInfo ci = metaData.getContext(path);
+      assertNotNull(ci);
+      assertEquals(comparator, ci.getComparatorClassName());
+   }
 }
\ No newline at end of file

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/META-INF/jboss-structure.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/META-INF/jboss-structure.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/META-INF/jboss-structure.xml	2008-11-03 11:45:06 UTC (rev 80372)
@@ -0,0 +1,28 @@
+ <structure>
+	<context comparator="org.jboss.test.deployment.test.SomeDeploymentComparatorTop">
+		<path name=""/>
+		<metaDataPath>
+         <path name="META-INF"/>
+      </metaDataPath>
+      <classpath>
+			<path name="jar1.jar"/>
+			<path name="lib-dir" suffixes=".jar"/>
+		</classpath>
+	</context>
+	<context comparator="org.jboss.test.deployment.test.SomeDeploymentComparatorSub">
+		<path name="sub.jar"/>
+      <metaDataPath>
+         <path name="META-INF"/>
+      </metaDataPath>
+	</context>
+	<context comparator="org.jboss.test.deployment.test.SomeDeploymentComparatorX">
+		<path name="x.war"/>
+      <metaDataPath>
+         <path name="WEB-INF"/>
+      </metaDataPath>
+		<classpath>
+			<path name="x.war/WEB-INF/classes"/>
+			<path name="x.war/WEB-INF/lib" suffixes=".jar"/>
+		</classpath>
+	</context>
+</structure>