vgritsenko 01/12/13 10:26:23
Modified: . changes.xml
src/org/apache/cocoon Main.java
src/org/apache/cocoon/servlet CocoonServlet.java
webapp/WEB-INF web.xml
webapp.tutorial/WEB-INF web.xml
Log:
Change default upload directory from image-dir to upload-dir
Revision Changes Path
1.57 +8 -2 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- changes.xml 2001/12/13 11:50:47 1.56
+++ changes.xml 2001/12/13 18:26:23 1.57
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.56 2001/12/13 11:50:47 cziegeler Exp $
+ $Id: changes.xml,v 1.57 2001/12/13 18:26:23 vgritsenko Exp $
-->
<changes title="History of Changes">
@@ -28,11 +28,17 @@
</devs>
<release version="2.1-dev" date="@date@">
+ <action dev="VG" type="update">
+ Changed default upload directory from "image-dir" to "upload-dir".
+ </action>
+ <action dev="VG" type="add" due-to="MIYABE Tatsuhiko"
due-to-email="[EMAIL PROTECTED]">
+ RequestGenerator accepts container-encoding and form-encoding parameters.
+ </action>
<action dev="CZ" type="update">
Added support for configurable URLFactories.
</action>
<action dev="SW" type="fix">
- Made the cach work again by updating cocoon.roles, sitemap.roles and making
EventPipeline
+ Made the cache work again by updating cocoon.roles, sitemap.roles and making
EventPipeline
and StreamPipeline implement Recomposable instead of just Composable.
</action>
<action dev="GR" type="add">
1.32 +2 -2 xml-cocoon2/src/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Main.java 2001/11/26 20:15:32 1.31
+++ Main.java 2001/12/13 18:26:23 1.32
@@ -35,7 +35,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.31 $ $Date: 2001/11/26 20:15:32 $
+ * @version CVS $Revision: 1.32 $ $Date: 2001/12/13 18:26:23 $
*/
public class Main {
@@ -281,7 +281,7 @@
}
appContext.put(Constants.CONTEXT_CLASSPATH, getClassPath(contextDir));
appContext.put(Constants.CONTEXT_WORK_DIR, work);
- appContext.put(Constants.CONTEXT_UPLOAD_DIR, contextDir + "image-dir");
+ appContext.put(Constants.CONTEXT_UPLOAD_DIR, contextDir + "upload-dir");
File cacheDir = getDir(workDir + File.separator + "cache-dir", "cache");
appContext.put(Constants.CONTEXT_CACHE_DIR, cacheDir);
appContext.put(Constants.CONTEXT_CONFIG_URL, conf.toURL());
1.56 +2 -2 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- CocoonServlet.java 2001/12/12 20:36:47 1.55
+++ CocoonServlet.java 2001/12/13 18:26:23 1.56
@@ -62,7 +62,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Revision: 1.55 $ $Date: 2001/12/12 20:36:47 $
+ * @version CVS $Revision: 1.56 $ $Date: 2001/12/13 18:26:23 $
*/
public class CocoonServlet extends HttpServlet {
@@ -234,7 +234,7 @@
log.debug("using upload-directory " + this.uploadDir);
}
} else {
- this.uploadDir = IOUtils.createFile(workDir, "image-dir" +
File.separator);
+ this.uploadDir = IOUtils.createFile(workDir, "upload-dir" +
File.separator);
if (log.isDebugEnabled()) {
log.debug("upload-directory was not set - defaulting to " +
this.uploadDir);
}
1.17 +2 -2 xml-cocoon2/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/WEB-INF/web.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- web.xml 2001/11/28 08:40:07 1.16
+++ web.xml 2001/12/13 18:26:23 1.17
@@ -129,11 +129,11 @@
This parameter allows to specify where Cocoon should put files
which are uploaded by the upload.xsp sample. The path specified
is always relative to the context path of the servlet.
- The default directory is "image-dir" in the work-directory
+ The default directory is "upload-dir" in the work-directory
<init-param>
<param-name>upload-directory</param-name>
- <param-value>/WEB-INF/work/image-dir</param-value>
+ <param-value>/WEB-INF/work/upload-dir</param-value>
</init-param>
-->
1.3 +2 -2 xml-cocoon2/webapp.tutorial/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp.tutorial/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 2001/09/19 16:47:26 1.2
+++ web.xml 2001/12/13 18:26:23 1.3
@@ -126,11 +126,11 @@
This parameter allows to specify where Cocoon should put files
which are uploaded by the upload.xsp sample. The path specified
is always relative to the context path of the servlet.
- The default directory is "image-dir" in the work-directory
+ The default directory is "upload-dir" in the work-directory
<init-param>
<param-name>upload-directory</param-name>
- <param-value>/WEB-INF/work/image-dir</param-value>
+ <param-value>/WEB-INF/work/upload-dir</param-value>
</init-param>
-->
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
