jvanzyl 01/06/24 21:52:16
Modified: src/java/org/apache/turbine/util ParameterParser.java
ValueParser.java
src/java/org/apache/turbine/util/mail Email.java
MultiPartEmail.java SimpleEmail.java
src/java/org/apache/turbine/util/parser BaseValueParser.java
DefaultParameterParser.java
Log:
- updating PP classes with new locations of the upload service classes.
Revision Changes Path
1.31 +2 -2
jakarta-turbine/src/java/org/apache/turbine/util/ParameterParser.java
Index: ParameterParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/ParameterParser.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ParameterParser.java 2001/05/06 17:06:40 1.30
+++ ParameterParser.java 2001/06/25 04:52:06 1.31
@@ -55,8 +55,8 @@
*/
import javax.servlet.http.HttpServletRequest;
+import org.apache.turbine.services.upload.FileItem;
-import org.apache.turbine.util.upload.FileItem;
/**
* ParameterParser is an interface to a utility to handle parsing and
* retrieving the data passed via the GET/POST/PATH_INFO arguments.
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: ParameterParser.java,v 1.30 2001/05/06 17:06:40 jvanzyl Exp $
+ * @version $Id: ParameterParser.java,v 1.31 2001/06/25 04:52:06 jvanzyl Exp $
*/
public interface ParameterParser
extends ValueParser
1.7 +4 -3
jakarta-turbine/src/java/org/apache/turbine/util/ValueParser.java
Index: ValueParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/ValueParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValueParser.java 2001/05/06 17:06:40 1.6
+++ ValueParser.java 2001/06/25 04:52:06 1.7
@@ -63,8 +63,9 @@
import java.util.Date;
import java.util.Enumeration;
-import org.apache.turbine.om.NumberKey;
-import org.apache.turbine.om.StringKey;
+//!! why are these here? jvz.
+import org.apache.turbine.services.db.om.NumberKey;
+import org.apache.turbine.services.db.om.StringKey;
/**
* ValueParser is a base interface for classes that need to parse
@@ -81,7 +82,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ValueParser.java,v 1.6 2001/05/06 17:06:40 jvanzyl Exp $
+ * @version $Id: ValueParser.java,v 1.7 2001/06/25 04:52:06 jvanzyl Exp $
*/
public interface ValueParser
{
1.12 +3 -2 jakarta-turbine/src/java/org/apache/turbine/util/mail/Email.java
Index: Email.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/mail/Email.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Email.java 2001/05/06 17:06:45 1.11
+++ Email.java 2001/06/25 04:52:10 1.12
@@ -68,8 +68,9 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
+//!! these are bad.
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
/**
* The base class for all email messages. This class sets the
@@ -82,7 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Ritter</a>
* @author <a href="mailto:unknown";>Regis Koenig</a>
- * @version $Id: Email.java,v 1.11 2001/05/06 17:06:45 jvanzyl Exp $
+ * @version $Id: Email.java,v 1.12 2001/06/25 04:52:10 jvanzyl Exp $
*/
public abstract class Email
{
1.8 +2 -2
jakarta-turbine/src/java/org/apache/turbine/util/mail/MultiPartEmail.java
Index: MultiPartEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/mail/MultiPartEmail.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiPartEmail.java 2001/05/06 17:06:45 1.7
+++ MultiPartEmail.java 2001/06/25 04:52:10 1.8
@@ -70,7 +70,7 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
/**
* A multipart email.
@@ -86,7 +86,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:unknown";>Regis Koenig</a>
- * @version $Id: MultiPartEmail.java,v 1.7 2001/05/06 17:06:45 jvanzyl Exp $
+ * @version $Id: MultiPartEmail.java,v 1.8 2001/06/25 04:52:10 jvanzyl Exp $
*/
public class MultiPartEmail
extends Email
1.7 +2 -2
jakarta-turbine/src/java/org/apache/turbine/util/mail/SimpleEmail.java
Index: SimpleEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/mail/SimpleEmail.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleEmail.java 2001/05/06 17:06:46 1.6
+++ SimpleEmail.java 2001/06/25 04:52:11 1.7
@@ -59,7 +59,7 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
/**
* This class is used to send simple internet email messages without
@@ -69,7 +69,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:unknown";>Regis Koenig</a>
- * @version $Id: SimpleEmail.java,v 1.6 2001/05/06 17:06:46 jvanzyl Exp $
+ * @version $Id: SimpleEmail.java,v 1.7 2001/06/25 04:52:11 jvanzyl Exp $
*/
public class SimpleEmail
extends Email
1.14 +3 -3
jakarta-turbine/src/java/org/apache/turbine/util/parser/BaseValueParser.java
Index: BaseValueParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/BaseValueParser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BaseValueParser.java 2001/06/20 23:10:37 1.13
+++ BaseValueParser.java 2001/06/25 04:52:13 1.14
@@ -73,8 +73,8 @@
import java.util.GregorianCalendar;
import java.util.Hashtable;
-import org.apache.turbine.om.NumberKey;
-import org.apache.turbine.om.StringKey;
+import org.apache.turbine.services.db.om.NumberKey;
+import org.apache.turbine.services.db.om.StringKey;
import org.apache.turbine.services.resources.TurbineResources;
@@ -111,7 +111,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: BaseValueParser.java,v 1.13 2001/06/20 23:10:37 dlr Exp $
+ * @version $Id: BaseValueParser.java,v 1.14 2001/06/25 04:52:13 jvanzyl Exp $
*/
public class BaseValueParser
extends RecyclableSupport
1.5 +12 -6
jakarta-turbine/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultParameterParser.java 2001/05/15 01:54:14 1.4
+++ DefaultParameterParser.java 2001/06/25 04:52:14 1.5
@@ -54,18 +54,17 @@
* <http://www.apache.org/>.
*/
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.Enumeration;
import java.util.StringTokenizer;
-
import javax.servlet.http.HttpServletRequest;
-
import org.apache.jserv.JServUtils;
-
import org.apache.turbine.util.Log;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
-import org.apache.turbine.util.upload.FileItem;
+import org.apache.turbine.services.upload.FileItem;
import org.apache.turbine.services.upload.TurbineUpload;
/**
@@ -90,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: DefaultParameterParser.java,v 1.4 2001/05/15 01:54:14 dlr Exp $
+ * @version $Id: DefaultParameterParser.java,v 1.5 2001/06/25 04:52:14 jvanzyl Exp $
*/
public class DefaultParameterParser
extends BaseValueParser
@@ -186,7 +185,14 @@
{
try
{
- TurbineUpload.parseRequest(req, this);
+ ArrayList items = TurbineUpload.parseRequest(req);
+ Iterator i = items.iterator();
+
+ while (i.hasNext())
+ {
+ FileItem item = (FileItem) i.next();
+ append(item.getFieldName(), item);
+ }
}
catch(TurbineException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
