Author: reinhard
Date: Sun Mar 19 09:22:40 2006
New Revision: 387005
URL: http://svn.apache.org/viewcvs?rev=387005&view=rev
Log:
if any of the rules matches, continue with the next zip entry
Modified:
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer.java?rev=387005&r1=387004&r2=387005&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/main/java/org/apache/cocoon/deployer/applicationserver/MonolithicServer.java Sun Mar 19 09:22:40 2006
@@ -29,7 +29,6 @@
import org.apache.cocoon.deployer.logger.Logger;
import org.apache.cocoon.deployer.monolithic.FileDeployer;
-import org.apache.cocoon.deployer.monolithic.NoRuleFoundException;
import org.apache.cocoon.deployer.util.WildcardHelper;
import org.apache.commons.lang.Validate;
@@ -66,7 +65,12 @@
}
OutputStream out = null;
try {
- out = findFileDeployer(document.getName()).writeResource(document.getName());
+ FileDeployer fileDeployer = findFileDeployer(document.getName());
+ if(fileDeployer == null) {
+ continue;
+ }
+ out = fileDeployer.writeResource(document.getName());
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
// loop over ZIP entry stream
byte[] buffer = new byte[8192];
@@ -105,7 +109,7 @@
return rule.fileDeployer;
}
}
- throw new NoRuleFoundException("You have to specify a rule for the path '" + name + "'.");
+ return null;
}
private static class Rule {
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java?rev=387005&r1=387004&r2=387005&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/applicationserver/MonoliticServerTest.java Sun Mar 19 09:22:40 2006
@@ -16,14 +16,10 @@
package org.apache.cocoon.deployer.applicationserver;
import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
import org.apache.cocoon.deployer.AbstractDeployerTestCase;
import org.apache.cocoon.deployer.logger.ConsoleLogger;
-import org.apache.cocoon.deployer.logger.Logger;
import org.apache.cocoon.deployer.monolithic.FileAlreadyDeployedException;
-import org.apache.cocoon.deployer.monolithic.FileDeployer;
import org.apache.cocoon.deployer.monolithic.SingleFileDeployer;
public class MonoliticServerTest extends AbstractDeployerTestCase {
@@ -34,7 +30,6 @@
MonolithicServer monolithicServer = new MonolithicServer(new File(SERVER_DIR), new ConsoleLogger());
monolithicServer.addRule("**webdav*.xconf", new SingleFileDeployer("WEB-INF/xconf"));
monolithicServer.addRule("**legacy**.xmap", new SingleFileDeployer("WEB-INF/sitemap-additions"));
- monolithicServer.addRule("**", new NullDeployer());
monolithicServer.extract(this.getMockArtefact("validMonolithicBlock-02/valid-block-1.0.jar"));
assertTrue(new File("target/test/monolithicServer23/WEB-INF/xconf/my-webdav-server.xconf").exists());
assertTrue(new File("target/test/monolithicServer23/WEB-INF/sitemap-additions/sa.xmap").exists());
@@ -43,7 +38,6 @@
public void testNotWorkingDeploy() throws Exception {
MonolithicServer monolithicServer = new MonolithicServer(new File(SERVER_DIR), new ConsoleLogger());
monolithicServer.addRule("**webdav*.xconf", new SingleFileDeployer("WEB-INF/xconf"));
- monolithicServer.addRule("**", new NullDeployer());
monolithicServer.extract(this.getMockArtefact("validMonolithicBlock-02/valid-block-1.0.jar"));
try {
monolithicServer.extract(this.getMockArtefact("validMonolithicBlock-02/valid-block-1.0.jar"));
@@ -51,22 +45,6 @@
} catch(FileAlreadyDeployedException fade) {
// expected
}
- }
-
- static class NullDeployer implements FileDeployer {
-
- public OutputStream writeResource(String documentName) throws IOException {
- return new NullOutputStream();
- }
-
- public void setBasedir(File file) {}
-
- public void setLogger(Logger logger) {}
-
- }
-
- static class NullOutputStream extends OutputStream {
- public void write(int arg0) throws IOException {}
}
}