You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2006/12/12 11:04:17 UTC
svn commit: r486081 -
/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java
Author: giacomo
Date: Tue Dec 12 02:04:17 2006
New Revision: 486081
URL: http://svn.apache.org/viewvc?view=rev&rev=486081
Log:
the xpatches should be applied in any case
Modified:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java?view=diff&rev=486081&r1=486080&r2=486081
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/MonolithicCocoonDeployer.java Tue Dec 12 02:04:17 2006
@@ -172,6 +172,14 @@
}
copyFile(basedir, "WEB-INF/applicationContext.xml");
copyFile(basedir, "WEB-INF/cocoon/properties/core.properties");
+ } else {
+ // At least apply the patches
+ InputStream sourceWebXmlFile = readResourceFromClassloader("WEB-INF/web.xml");
+ try {
+ xwebPatcher.applyPatches(sourceWebXmlFile, "WEB-INF/web.xml");
+ } finally {
+ IOUtils.closeQuietly(sourceWebXmlFile);
+ }
}
// write properties