cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r374889 - in /cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src: main/java/org/apache/cocoon/deployer/BlockDeployer.java test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
Date Sat, 04 Feb 2006 17:21:48 GMT
Author: reinhard
Date: Sat Feb  4 09:21:42 2006
New Revision: 374889

URL: http://svn.apache.org/viewcvs?rev=374889&view=rev
Log:
currently the order of blocks in wiring.xml is significant for loading components :-(

Modified:
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
    cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java?rev=374889&r1=374888&r2=374889&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/BlockDeployer.java
Sat Feb  4 09:21:42 2006
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -104,6 +105,7 @@
 		// deploy the blocks
 		CocoonServer cocoonServer = CocoonServerFactory.createServer(
 				deploymentDescriptor.getCocoon(), this.variableResolver, this.artifactProvider);
+		Collections.reverse(blockList);
 		cocoonServer.deploy((Block[]) blockList.toArray(new Block[blockList.size()]), 
 				cocoonWebappUrn, libraries, this.log);
 		

Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java?rev=374889&r1=374888&r2=374889&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
(original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AutoWiringResolverTest.java
Sat Feb  4 09:21:42 2006
@@ -41,7 +41,6 @@
 				this.getMockArtefact("validBlock-04/valid-block-1.0.jar"), deploy.getBlock(0))
 		);
 		autoWiringResolver.resolve(blocks);
-		System.out.println("blocks: " + blocks);
 	}
 
 	private ArtifactProvider getArtifactProviderInstance() {



Mime
View raw message