You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/20 22:33:32 UTC
svn commit: r424050 - in
/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic:
FileDeployer.java MonolithicCocoonDeployer.java
Author: cziegeler
Date: Thu Jul 20 13:33:32 2006
New Revision: 424050
URL: http://svn.apache.org/viewvc?rev=424050&view=rev
Log:
Copy all legacy resources and copy from legacy/conf to web-inf/classes to make the ojb block work
Modified:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/FileDeployer.java
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/FileDeployer.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/FileDeployer.java?rev=424050&r1=424049&r2=424050&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/FileDeployer.java (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/java/org/apache/cocoon/maven/deployer/monolithic/FileDeployer.java Thu Jul 20 13:33:32 2006
@@ -32,12 +32,12 @@
*/
public interface FileDeployer {
- public OutputStream writeResource(String documentName) throws IOException;
+ OutputStream writeResource(String documentName) throws IOException;
- public void setBasedir(File file);
+ void setBasedir(File file);
- public void setLogger(Log logger);
+ void setLogger(Log logger);
- public void setAlreadyDeployedFilesSet(Set alreadyDeployedFilesSet);
+ void setAlreadyDeployedFilesSet(Set alreadyDeployedFilesSet);
}
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?rev=424050&r1=424049&r2=424050&view=diff
==============================================================================
--- 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 Thu Jul 20 13:33:32 2006
@@ -57,9 +57,10 @@
this.logger.info("Deploying " + id);
MonolithicServer22 zipExtractor = new MonolithicServer22(basedir, logger);
zipExtractor.addRule("**legacy/cocoon.xconf", new SingleFileDeployer("WEB-INF/cocoon"));
- zipExtractor.addRule("**legacy**.xconf", new SingleFileDeployer("WEB-INF/cocoon/xconf"));
- zipExtractor.addRule("**legacy**.xmap", new SingleFileDeployer("WEB-INF/cocoon/sitemap-additions"));
- zipExtractor.addRule("**spring/**.xml", new SingleFileDeployer("WEB-INF/cocoon/spring"));
+ zipExtractor.addRule("**legacy/xconf/**", new SingleFileDeployer("WEB-INF/cocoon/xconf"));
+ zipExtractor.addRule("**legacy/sitemap-additions**", new SingleFileDeployer("WEB-INF/cocoon/sitemap-additions"));
+ zipExtractor.addRule("**legacy/conf/**", new SingleFileDeployer("WEB-INF/classes"));
+ zipExtractor.addRule("**spring/**", new SingleFileDeployer("WEB-INF/cocoon/spring"));
zipExtractor.addRule("COB-INF**", new SingleFileDeployer(blocksdir + "/" + (String) id, true));
// extract all configurations files
zipExtractor.extract(lib);