Author: henning
Date: Fri Sep 9 10:05:54 2005
New Revision: 279820
URL: http://svn.apache.org/viewcvs?rev=279820&view=rev
Log:
Also deprecate append() in the parser Interfaces. Make sure that the
upload service does not use the deprecated methods.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/UploadService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParameterParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ValueParser.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java?rev=279820&r1=279819&r2=279820&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Fri Sep 9 10:05:54 2005
@@ -44,15 +44,15 @@
*
* <p> Files will be stored in temporary disk storage on in memory,
* depending on request size, and will be available from the [EMAIL PROTECTED]
- * org.apache.turbine.util.ParameterParser} as [EMAIL PROTECTED]
- * org.apache.turbine.util.upload.FileItem}s.
+ * org.apache.turbine.util.parser.ParameterParser} as [EMAIL PROTECTED]
+ * org.apache.commons.fileupload.FileItem}s.
*
* <p>This implementation of [EMAIL PROTECTED] UploadService} handles multiple
* files per single html widget, sent using multipar/mixed encoding
* type, as specified by RFC 1867. Use [EMAIL PROTECTED]
- * org.apache.turbine.util.ParameterParser#getFileItems(String)} to
+ * org.apache.turbine.util.parser.ParameterParser#getFileItems(String)} to
* acquire an array of [EMAIL PROTECTED]
- * org.apache.turbine.util.upload.FileItem}s associated with given
+ * org.apache.commons.fileupload.FileItem}s associated with given
* html widget.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Rafal Krzewski</a>
@@ -245,14 +245,14 @@
+ "Used the default when reading form
data.");
value = fi.getString();
}
- params.append(fi.getFieldName(), value);
+ params.add(fi.getFieldName(), value);
}
else
{
log.debug("Found an uploaded file: " +
fi.getFieldName());
log.debug("It has " + fi.getSize() + " Bytes and is "
+ (fi.isInMemory() ? "" : "not ") + "in Memory");
log.debug("Adding FileItem as " + fi.getFieldName() +
" to the params");
- params.append(fi.getFieldName(), fi);
+ params.add(fi.getFieldName(), fi);
}
}
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/UploadService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/UploadService.java?rev=279820&r1=279819&r2=279820&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/UploadService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/UploadService.java
Fri Sep 9 10:05:54 2005
@@ -26,7 +26,7 @@
* <p> This service handles parsing <code>multipart/form-data</code>
* POST requests and turing them into form fields and uploaded files.
* This can be either performed automatically by the [EMAIL PROTECTED]
- * org.apache.turbine.util.ParameterParser} or manually by an user
+ * org.apache.turbine.util.parser.ParameterParser} or manually by an user
* definded [EMAIL PROTECTED] org.apache.turbine.modules.Action}.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Rafal Krzewski</a>
@@ -88,7 +88,7 @@
* <p> The default value of 'automatic' property
* (<code>false</code>). If set to <code>true</code>, parsing the
* multipart request will be performed automaticaly by [EMAIL PROTECTED]
- * org.apache.turbine.util.ParameterParser}. Otherwise, an [EMAIL
PROTECTED]
+ * org.apache.turbine.util.parser.ParameterParser}. Otherwise, an [EMAIL
PROTECTED]
* org.apache.turbine.modules.Action} may decide to to parse the
* request by calling [EMAIL PROTECTED] #parseRequest(HttpServletRequest,
* ParameterParser, String) parseRequest} manually.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParameterParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParameterParser.java?rev=279820&r1=279819&r2=279820&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParameterParser.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ParameterParser.java
Fri Sep 9 10:05:54 2005
@@ -91,9 +91,22 @@
* files to be associated with single HTML input element.
*
* @param name A String with the name.
- * @param value A FileItem with the value.
+ * @param item A FileItem with the value.
+ *
+ * @deprecated Use add(String name, FileItem item) instead.
*/
- void append(String name, FileItem value);
+ void append(String name, FileItem item);
+
+ /**
+ * Add a FileItem object as a parameters. If there are any
+ * FileItems already associated with the name, append to the
+ * array. The reason for this is that RFC 1867 allows multiple
+ * files to be associated with single HTML input element.
+ *
+ * @param name A String with the name.
+ * @param item A FileItem with the value.
+ */
+ void add(String name, FileItem item);
/**
* Return a FileItem object for the given name. If the name does
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ValueParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ValueParser.java?rev=279820&r1=279819&r2=279820&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ValueParser.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/ValueParser.java
Fri Sep 9 10:05:54 2005
@@ -150,6 +150,8 @@
*
* @param name A String with the name.
* @param value A String with the value.
+ *
+ * @deprecated Use add(name, value) instead.
*/
void append(String name, String value);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
