You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/02/04 18:21:48 UTC
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
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() {