Author: antonio
Date: Mon Nov 15 21:21:59 2004
New Revision: 75984
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Fix #32214: Context directory not required to be writable by the CLI
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Mon Nov 15 21:21:59 2004
@@ -259,9 +259,14 @@
throw new IOException("'" + d + "' is not a directory.");
}
- if (!(d.canRead() && d.canWrite())) {
+ if (!d.canRead()) {
throw new IOException(
- "Directory '" + d + "' is not readable/writable");
+ "Directory '" + d + "' is not readable");
+ }
+
+ if ("working".equals( type ) && !d.canWrite()) {
+ throw new IOException(
+ "Directory '" + d + "' is not writable");
}
return d;
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Nov 15 21:21:59 2004
@@ -201,6 +201,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AG" type="fix" fixes-bug="32214" due-to="Rick Tessner"
due-to-email="[EMAIL PROTECTED]">
+ Context directory not required to be writable by the CLI
+ </action>
<action dev="CZ" type="fix" fixes-bug="32199">
Portal: If a coplet has an error, the error-uri has been called twice.
This is fixed now.
</action>