[jboss-cvs] JBossAS SVN: r83551 - in projects/jboss-deployers/trunk: deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structureprocessor/test and 1 other directories.

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

Author: alesj
Date: 2009-01-28 06:51:18 -0500 (Wed, 28 Jan 2009)
New Revision: 83551

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structureprocessor/childmod.jar
Removed:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structureprocessor/childmod/
Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structureprocessor/test/VFSStructureProcessorUnitTestCase.java
   projects/jboss-deployers/trunk/pom.xml
Log:
Use unpack in child.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structureprocessor/test/VFSStructureProcessorUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structureprocessor/test/VFSStructureProcessorUnitTestCase.java	2009-01-28 11:46:29 UTC (rev 83550)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structureprocessor/test/VFSStructureProcessorUnitTestCase.java	2009-01-28 11:51:18 UTC (rev 83551)
@@ -61,15 +61,16 @@
    {
       ModificationTypeStructureProcessor mtsp = new ModificationTypeStructureProcessor();
 
-      ModificationTypeMatcher topAndChildren = createTempMatcher(true, true, false, true, "child.xml");
-      ModificationTypeMatcher directTop = createTempMatcher(true, false, true, false, "top.xml");
-      ModificationTypeMatcher justChildren = createTempMatcher(true, false, false, true, "sub.xml");
+      ModificationTypeMatcher topAndChildren = createTempMatcher(ModificationType.TEMP, true, true, true, false, "child.xml");
+      ModificationTypeMatcher directTop = createTempMatcher(ModificationType.TEMP, true, false, true, false, "top.xml");
+      ModificationTypeMatcher justChildren = createTempMatcher(ModificationType.UNPACK, true, false, false, true, "sub.xml");
 
-      mtsp.setMatchers(Arrays.asList(directTop, topAndChildren, justChildren));
+      mtsp.setMatchers(Arrays.asList(topAndChildren, directTop, justChildren));
       return mtsp;
    }
 
    protected ModificationTypeMatcher createTempMatcher(
+         ModificationType type,
          boolean metadataOnly,
          boolean checkChildren,
          boolean topLevelOnly,
@@ -77,7 +78,7 @@
          String... paths)
    {
       FileModificationTypeMatcher matcher = new FileModificationTypeMatcher(paths);
-      matcher.setModificationType(ModificationType.TEMP);
+      matcher.setModificationType(type);
       matcher.setMetadataOnly(metadataOnly);
       matcher.setCheckChildren(checkChildren);
       matcher.setTopLevelOnly(topLevelOnly);
@@ -131,13 +132,13 @@
       DeployerClient main = createMainDeployer();
       addStructureDeployer(main, new JARStructure());
 
-      VFSDeployment deployment = createDeployment("/structureprocessor", "childmod");
+      VFSDeployment deployment = createDeployment("/structureprocessor", "childmod.jar");
       main.deploy(deployment);
       try
       {
-         VFSDeploymentContext vdc = getTopDeploymentContext(main, "childmod");
+         VFSDeploymentContext vdc = getTopDeploymentContext(main, "childmod.jar");
          VirtualFile root = vdc.getRoot();
-         VirtualFile file = root.getChild("tempchild");
+         VirtualFile file = root.getChild("tempchild.jar");
          try
          {
             assertTrue("Should be temp", VFSUtils.isTemporaryFile(file));

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structureprocessor/childmod.jar
===================================================================
(Binary files differ)


Property changes on: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structureprocessor/childmod.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2009-01-28 11:46:29 UTC (rev 83550)
+++ projects/jboss-deployers/trunk/pom.xml	2009-01-28 11:51:18 UTC (rev 83551)
@@ -21,7 +21,7 @@
   </scm>
 
   <properties>
-    <version.jboss.vfs>2.0.1.GA</version.jboss.vfs>
+    <version.jboss.vfs>2.2.0-SNAPSHOT</version.jboss.vfs>
     <version.jboss.man>2.0.0.GA</version.jboss.man>
     <version.jboss.mdr>2.0.1.GA</version.jboss.mdr>
     <version.jboss.microcontainer>2.0.3.GA</version.jboss.microcontainer>