cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r409260 - in /cocoon/trunk/tools/cocoon-block-deployer: cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
Date Wed, 24 May 2006 22:30:58 GMT
Author: reinhard
Date: Wed May 24 15:30:57 2006
New Revision: 409260

URL: http://svn.apache.org/viewvc?rev=409260&view=rev
Log:
also copy cocoon.xconf; make sure that resources in the webapp are have higher precendence
than resources in blocks

Modified:
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
    cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java?rev=409260&r1=409259&r2=409260&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/MonolithicCocoonDeployer.java
Wed May 24 15:30:57 2006
@@ -35,8 +35,8 @@
         	Object id = it.next();
         	File lib = (File) libraries.get(id);  	
         	try {
-        		
         		MonolithicServer22 zipExtractor = new MonolithicServer22(basedir, logger);
+                zipExtractor.addRule("**legacy/cocoon.xconf", new SingleFileDeployer("WEB-INF"));
       		
                 zipExtractor.addRule("**legacy**.xconf", new SingleFileDeployer("WEB-INF/xconf"));
                 zipExtractor.addRule("**legacy**.xmap", new SingleFileDeployer("WEB-INF/sitemap-additions"));
 
                 zipExtractor.addRule("COB-INF**", new SingleFileDeployer(blocksdir + "/"
+ (String) id, true));  

Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java?rev=409260&r1=409259&r2=409260&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
(original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/AbstractDeployMojo.java
Wed May 24 15:30:57 2006
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -216,6 +217,16 @@
         }
 
         MonolithicCocoonDeployer.deploy(files, webappDirectory_, blocksdir, new MavenLoggingWrapper(this.getLog()));
+        
+        // make sure that all configuration files available in the webapp override block
configuration files
+        try {
+            copyResources( getWarSourceDirectory(), webappDirectory_, getWebXml() );
+        } catch (IOException e) {
+            throw new MojoExecutionException("A problem occurred while copying webapp resources.",
e);
+        }
+        
+        // take care of paranoid classloading
+        // TBD
 	}   
     
     



Mime
View raw message