vgritsenko 01/12/13 10:24:55
Modified: . Tag: cocoon_20_branch changes.xml
src/org/apache/cocoon Tag: cocoon_20_branch Main.java
src/org/apache/cocoon/servlet Tag: cocoon_20_branch
CocoonServlet.java
webapp/WEB-INF Tag: cocoon_20_branch web.xml
Log:
Change default upload directory from image-dir to upload-dir
Revision Changes Path
No revision
No revision
1.2.2.51 +7 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.2.2.50
retrieving revision 1.2.2.51
diff -u -r1.2.2.50 -r1.2.2.51
--- changes.xml 2001/12/13 11:50:24 1.2.2.50
+++ changes.xml 2001/12/13 18:24:54 1.2.2.51
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.2.2.50 2001/12/13 11:50:24 cziegeler Exp $
+ $Id: changes.xml,v 1.2.2.51 2001/12/13 18:24:54 vgritsenko Exp $
-->
<changes title="History of Changes">
@@ -27,6 +27,12 @@
</devs>
<release version="@version@" 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>
No revision
No revision
1.4.2.25 +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.4.2.24
retrieving revision 1.4.2.25
diff -u -r1.4.2.24 -r1.4.2.25
--- Main.java 2001/10/25 17:58:00 1.4.2.24
+++ Main.java 2001/12/13 18:24:54 1.4.2.25
@@ -35,7 +35,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.24 $ $Date: 2001/10/25 17:58:00 $
+ * @version CVS $Revision: 1.4.2.25 $ $Date: 2001/12/13 18:24:54 $
*/
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());
No revision
No revision
1.13.2.36 +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.13.2.35
retrieving revision 1.13.2.36
diff -u -r1.13.2.35 -r1.13.2.36
--- CocoonServlet.java 2001/11/23 14:40:22 1.13.2.35
+++ CocoonServlet.java 2001/12/13 18:24:55 1.13.2.36
@@ -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.13.2.35 $ $Date: 2001/11/23 14:40:22 $
+ * @version CVS $Revision: 1.13.2.36 $ $Date: 2001/12/13 18:24:55 $
*/
public class CocoonServlet extends HttpServlet {
@@ -163,7 +163,7 @@
if ((uploadDirParam != null) && (!uploadDirParam.trim().equals(""))) {
this.uploadDir = IOUtils.createFile( new
File(this.servletContext.getRealPath("/")) , uploadDirParam);
} else {
- this.uploadDir = IOUtils.createFile(workDir, "image-dir" +
File.separator);
+ this.uploadDir = IOUtils.createFile(workDir, "upload-dir" +
File.separator);
}
this.appContext.put(Constants.CONTEXT_UPLOAD_DIR, this.uploadDir);
No revision
No revision
1.1.1.1.2.14 +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.1.1.1.2.13
retrieving revision 1.1.1.1.2.14
diff -u -r1.1.1.1.2.13 -r1.1.1.1.2.14
--- web.xml 2001/11/28 08:40:30 1.1.1.1.2.13
+++ web.xml 2001/12/13 18:24:55 1.1.1.1.2.14
@@ -140,11 +140,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]
