[jboss-cvs] JBossAS SVN: r94196 - in projects/jboss-deployers/tags/2.0.8.SP1: deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 30 23:35:51 EDT 2009
Author: jason.greene at jboss.com
Date: 2009-09-30 23:35:50 -0400 (Wed, 30 Sep 2009)
New Revision: 94196
Added:
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3
Removed:
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3
Modified:
projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java
projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java
projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java
Log:
Merge JBDEPLOY-215 work
Modified: projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java
===================================================================
--- projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java 2009-10-01 03:27:03 UTC (rev 94195)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractStructureBuilder.java 2009-10-01 03:35:50 UTC (rev 94196)
@@ -135,10 +135,11 @@
if (childContext == null)
throw new IllegalStateException("Child deployment context is null");
- context.addChild(childContext);
childContext.setParent(context);
-
applyContextInfo(childContext, child);
+
+ // Child must be added after context info is applied for correct sorting
+ context.addChild(childContext);
Attachments attachments = child.getPredeterminedManagedObjects();
if (attachments != null)
Modified: projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java
===================================================================
--- projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java 2009-10-01 03:27:03 UTC (rev 94195)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java 2009-10-01 03:35:50 UTC (rev 94196)
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Random;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.client.spi.DeploymentFactory;
@@ -135,6 +136,36 @@
return deployment;
}
+ protected Deployment createOrderedChildren(String... names) throws Exception
+ {
+ DeploymentFactory factory = getDeploymentFactory();
+ Deployment deployment = createDeployment(factory);
+ for (int i = 0; names != null && i < names.length; i++)
+ {
+ ContextInfo ctx = factory.addContext(deployment, "child" + names[i]);
+ ctx.setRelativeOrder(i + 1);
+ }
+ return deployment;
+ }
+
+ public void testOrderedChildren() throws Exception
+ {
+ String[] names = new String[]{"123", "132", "213", "231", "312", "321"};
+ String random = names[new Random().nextInt(6)];
+ log.info("Random: " + random);
+ names = new String[]{String.valueOf(random.charAt(0)), String.valueOf(random.charAt(1)), String.valueOf(random.charAt(2))};
+
+ Deployment deployment = createOrderedChildren(names);
+ DeploymentContext context = build(deployment);
+
+ for (int i = 0; i < names.length; i++)
+ {
+ assertEquals("child" + names[i], context.getChildren().get(i).getRelativePath());
+ }
+
+ checkDeployment(context, deployment);
+ }
+
public void testMetaDataLocation() throws Exception
{
Deployment deployment = createMetaDataLocation();
Modified: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java 2009-10-01 03:27:03 UTC (rev 94195)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java 2009-10-01 03:35:50 UTC (rev 94196)
@@ -113,4 +113,10 @@
{
return createDefaultDeployment();
}
+
+ @Override
+ public void testOrderedChildren() throws Exception
+ {
+ // ignore this test
+ }
}
Copied: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren (from rev 94195, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren)
Deleted: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 2009-10-01 03:27:03 UTC (rev 94195)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 2009-10-01 03:35:50 UTC (rev 94196)
@@ -1 +0,0 @@
-empty
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 (from rev 94195, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1)
===================================================================
--- projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 (rev 0)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 2009-10-01 03:35:50 UTC (rev 94196)
@@ -0,0 +1 @@
+empty
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 2009-10-01 03:27:03 UTC (rev 94195)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 2009-10-01 03:35:50 UTC (rev 94196)
@@ -1 +0,0 @@
-empty
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 (from rev 94195, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2)
===================================================================
--- projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 (rev 0)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 2009-10-01 03:35:50 UTC (rev 94196)
@@ -0,0 +1 @@
+empty
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 2009-10-01 03:27:03 UTC (rev 94195)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 2009-10-01 03:35:50 UTC (rev 94196)
@@ -1 +0,0 @@
-empty
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 (from rev 94195, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3)
===================================================================
--- projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 (rev 0)
+++ projects/jboss-deployers/tags/2.0.8.SP1/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 2009-10-01 03:35:50 UTC (rev 94196)
@@ -0,0 +1 @@
+empty
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list