You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/07/13 18:53:51 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/upload TurbineUploadService.java
jvanzyl 01/07/13 09:53:51
Modified: src/java/org/apache/turbine/services/intake IntakeTool.java
src/java/org/apache/turbine/services/intake/model
BigDecimalField.java BooleanField.java
ComboKeyField.java Field.java FileItemField.java
Group.java IntegerField.java NumberKeyField.java
StringField.java
src/java/org/apache/turbine/services/intake/validator
DefaultValidator.java FileValidator.java
InitableByConstraintMap.java IntegerValidator.java
NumberKeyValidator.java NumberValidator.java
Validator.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java TurbineRunData.java
TurbineRunDataService.java
src/java/org/apache/turbine/services/upload
TurbineUploadService.java
Log:
- more decoupling
- changes to reflect changes in parser packaging
Revision Changes Path
1.18 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/IntakeTool.java
Index: IntakeTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/IntakeTool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- IntakeTool.java 2001/07/11 23:58:55 1.17
+++ IntakeTool.java 2001/07/13 16:50:14 1.18
@@ -64,16 +64,15 @@
import org.apache.turbine.services.intake.model.Group;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.ValueParser;
import org.apache.turbine.util.pool.Recyclable;
/**
* A Pull tool to make intake objects available to a template
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: IntakeTool.java,v 1.17 2001/07/11 23:58:55 jmcnally Exp $
+ * @version $Id: IntakeTool.java,v 1.18 2001/07/13 16:50:14 jvanzyl Exp $
*/
public class IntakeTool
implements ApplicationTool, Recyclable
1.10 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java
Index: BigDecimalField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BigDecimalField.java 2001/05/18 19:35:41 1.9
+++ BigDecimalField.java 2001/07/13 16:50:35 1.10
@@ -58,8 +58,7 @@
import java.util.Vector;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
+import org.apache.turbine.ParameterParser;
/** */
public class BigDecimalField extends Field
1.7 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/BooleanField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BooleanField.java 2001/05/18 19:35:42 1.6
+++ BooleanField.java 2001/07/13 16:50:40 1.7
@@ -56,14 +56,13 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
+import org.apache.turbine.ParameterParser;
/**
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: BooleanField.java,v 1.6 2001/05/18 19:35:42 jmcnally Exp $
+ * @version $Id: BooleanField.java,v 1.7 2001/07/13 16:50:40 jvanzyl Exp $
*/
public class BooleanField extends Field
{
1.6 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java
Index: ComboKeyField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComboKeyField.java 2001/06/25 05:01:09 1.5
+++ ComboKeyField.java 2001/07/13 16:50:46 1.6
@@ -59,8 +59,7 @@
import org.apache.turbine.services.db.om.ObjectKey;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.Log;
1.21 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Field.java 2001/07/10 01:04:08 1.20
+++ Field.java 2001/07/13 16:50:50 1.21
@@ -66,16 +66,15 @@
import org.apache.turbine.services.intake.validator.InitableByConstraintMap;
import org.apache.turbine.services.intake.validator.ValidationException;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.ValueParser;
/**
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: Field.java,v 1.20 2001/07/10 01:04:08 jvanzyl Exp $
+ * @version $Id: Field.java,v 1.21 2001/07/13 16:50:50 jvanzyl Exp $
*/
public abstract class Field
{
1.5 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileItemField.java 2001/07/10 01:04:08 1.4
+++ FileItemField.java 2001/07/13 16:50:59 1.5
@@ -57,7 +57,7 @@
import java.util.Vector;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.services.intake.validator.Validator;
1.18 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Group.java
Index: Group.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Group.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Group.java 2001/07/10 01:04:08 1.17
+++ Group.java 2001/07/13 16:51:02 1.18
@@ -64,10 +64,9 @@
import org.apache.turbine.services.intake.TurbineIntake;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.ValueParser;
import org.apache.turbine.util.pool.Recyclable;
/** Holds a group of Fields */
1.8 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/IntegerField.java
Index: IntegerField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/IntegerField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IntegerField.java 2001/05/18 19:35:44 1.7
+++ IntegerField.java 2001/07/13 16:51:05 1.8
@@ -57,8 +57,7 @@
import java.util.Vector;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
+import org.apache.turbine.ParameterParser;
/** */
public class IntegerField extends Field
1.7 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java
Index: NumberKeyField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NumberKeyField.java 2001/06/25 05:01:11 1.6
+++ NumberKeyField.java 2001/07/13 16:51:09 1.7
@@ -59,8 +59,7 @@
import org.apache.turbine.services.db.om.ObjectKey;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
+import org.apache.turbine.ParameterParser;
/** */
public class NumberKeyField extends Field
1.8 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/StringField.java
Index: StringField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/StringField.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StringField.java 2001/05/18 19:35:45 1.7
+++ StringField.java 2001/07/13 16:51:12 1.8
@@ -54,15 +54,14 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
/**
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: StringField.java,v 1.7 2001/05/18 19:35:45 jmcnally Exp $
+ * @version $Id: StringField.java,v 1.8 2001/07/13 16:51:12 jvanzyl Exp $
*/
public class StringField extends Field
{
1.7 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java
Index: DefaultValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultValidator.java 2001/07/10 01:04:11 1.6
+++ DefaultValidator.java 2001/07/13 16:51:54 1.7
@@ -63,10 +63,9 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.ValueParser;
/**
* A validator that will compare a testValue against the following
@@ -82,7 +81,7 @@
* This validator can serve as the base class for more specific validators
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: DefaultValidator.java,v 1.6 2001/07/10 01:04:11 jvanzyl Exp $
+ * @version $Id: DefaultValidator.java,v 1.7 2001/07/13 16:51:54 jvanzyl Exp $
*/
public class DefaultValidator
implements Validator, InitableByConstraintMap
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/FileValidator.java
Index: FileValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/FileValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileValidator.java 2001/07/10 01:04:11 1.3
+++ FileValidator.java 2001/07/13 16:51:59 1.4
@@ -63,7 +63,7 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.services.upload.FileItem;
@@ -82,7 +82,7 @@
* This validator can serve as the base class for more specific validators
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: FileValidator.java,v 1.3 2001/07/10 01:04:11 jvanzyl Exp $
+ * @version $Id: FileValidator.java,v 1.4 2001/07/13 16:51:59 jvanzyl Exp $
*/
public class FileValidator
implements Validator, InitableByConstraintMap
1.3 +1 -16 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/InitableByConstraintMap.java
Index: InitableByConstraintMap.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/InitableByConstraintMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InitableByConstraintMap.java 2001/07/10 01:04:12 1.2
+++ InitableByConstraintMap.java 2001/07/13 16:52:03 1.3
@@ -54,21 +54,6 @@
* <http://www.apache.org/>.
*/
-/*
-import java.lang.reflect.Method;
-import java.util.Vector;
-import org.apache.regexp.RE;
-import org.apache.turbine.om.Retrievable;
-import org.apache.turbine.services.intake.TurbineIntake;
-import org.apache.turbine.services.intake.xmlmodel.Rule;
-import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.RunData;
-import org.apache.turbine.util.ValueParser;
-*/
-
import java.util.Map;
import org.apache.turbine.util.TurbineException;
@@ -77,7 +62,7 @@
* by values in a Map.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: InitableByConstraintMap.java,v 1.2 2001/07/10 01:04:12 jvanzyl Exp $
+ * @version $Id: InitableByConstraintMap.java,v 1.3 2001/07/13 16:52:03 jvanzyl Exp $
*/
public interface InitableByConstraintMap
{
1.3 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java
Index: IntegerValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntegerValidator.java 2001/06/18 23:35:46 1.2
+++ IntegerValidator.java 2001/07/13 16:52:09 1.3
@@ -55,7 +55,6 @@
*/
import java.util.Map;
-
import org.apache.turbine.util.Log;
import org.apache.turbine.util.TurbineException;
@@ -74,7 +73,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: IntegerValidator.java,v 1.2 2001/06/18 23:35:46 jmcnally Exp $
+ * @version $Id: IntegerValidator.java,v 1.3 2001/07/13 16:52:09 jvanzyl Exp $
*/
public class IntegerValidator
extends NumberValidator
1.4 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java
Index: NumberKeyValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NumberKeyValidator.java 2001/06/25 05:01:16 1.3
+++ NumberKeyValidator.java 2001/07/13 16:52:18 1.4
@@ -56,7 +56,6 @@
import java.math.BigDecimal;
import java.util.Map;
-
import org.apache.turbine.services.db.om.NumberKey;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.TurbineException;
@@ -76,7 +75,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberKeyValidator.java,v 1.3 2001/06/25 05:01:16 jvanzyl Exp $
+ * @version $Id: NumberKeyValidator.java,v 1.4 2001/07/13 16:52:18 jvanzyl Exp $
*/
public class NumberKeyValidator
extends NumberValidator
1.4 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java
Index: NumberValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NumberValidator.java 2001/06/25 05:01:17 1.3
+++ NumberValidator.java 2001/07/13 16:52:24 1.4
@@ -56,7 +56,6 @@
import java.math.BigDecimal;
import java.util.Map;
-
import org.apache.turbine.services.db.om.NumberKey;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.TurbineException;
@@ -76,7 +75,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberValidator.java,v 1.3 2001/06/25 05:01:17 jvanzyl Exp $
+ * @version $Id: NumberValidator.java,v 1.4 2001/07/13 16:52:24 jvanzyl Exp $
*/
public class NumberValidator
extends DefaultValidator
1.4 +1 -16 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/Validator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Validator.java 2001/07/10 01:04:13 1.3
+++ Validator.java 2001/07/13 16:52:27 1.4
@@ -54,21 +54,6 @@
* <http://www.apache.org/>.
*/
-/*
-import java.lang.reflect.Method;
-import java.util.Vector;
-import org.apache.regexp.RE;
-import org.apache.turbine.om.Retrievable;
-import org.apache.turbine.services.intake.TurbineIntake;
-import org.apache.turbine.services.intake.xmlmodel.Rule;
-import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.RunData;
-import org.apache.turbine.util.ValueParser;
-*/
-
import java.util.Map;
import org.apache.turbine.util.TurbineException;
@@ -76,7 +61,7 @@
* Validator api.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: Validator.java,v 1.3 2001/07/10 01:04:13 jvanzyl Exp $
+ * @version $Id: Validator.java,v 1.4 2001/07/13 16:52:27 jvanzyl Exp $
*/
public interface Validator
{
1.13 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultTurbineRunData.java 2001/07/12 20:23:45 1.12
+++ DefaultTurbineRunData.java 2001/07/13 16:53:00 1.13
@@ -66,8 +66,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.om.security.User;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.CookieParser;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.parser.CookieParser;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.FormMessages;
import org.apache.turbine.util.SystemError;
@@ -103,7 +103,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:bhoeneis@ee.ethz.ch">Bernie Hoeneisen</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: DefaultTurbineRunData.java,v 1.12 2001/07/12 20:23:45 jvanzyl Exp $
+ * @version $Id: DefaultTurbineRunData.java,v 1.13 2001/07/13 16:53:00 jvanzyl Exp $
*/
public class DefaultTurbineRunData
extends RecyclableSupport
1.3 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/rundata/TurbineRunData.java
Index: TurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/TurbineRunData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineRunData.java 2001/07/10 01:04:32 1.2
+++ TurbineRunData.java 2001/07/13 16:53:11 1.3
@@ -55,13 +55,13 @@
*/
import org.apache.turbine.RunData;
+import org.apache.turbine.ParameterParser;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.util.CookieParser;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.pool.Recyclable;
@@ -79,7 +79,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:bhoeneis@ee.ethz.ch">Bernie Hoeneisen</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineRunData.java,v 1.2 2001/07/10 01:04:32 jvanzyl Exp $
+ * @version $Id: TurbineRunData.java,v 1.3 2001/07/13 16:53:11 jvanzyl Exp $
*/
public interface TurbineRunData extends RunData,
Recyclable
1.6 +3 -5 jakarta-turbine/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineRunDataService.java 2001/07/10 01:04:32 1.5
+++ TurbineRunDataService.java 2001/07/13 16:53:16 1.6
@@ -59,14 +59,12 @@
import java.util.Iterator;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.apache.turbine.RunData;
-import org.apache.turbine.util.CookieParser;
-import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.ParameterParser;
+import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.services.TurbineServices;
@@ -82,7 +80,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineRunDataService.java,v 1.5 2001/07/10 01:04:32 jvanzyl Exp $
+ * @version $Id: TurbineRunDataService.java,v 1.6 2001/07/13 16:53:16 jvanzyl Exp $
*/
public class TurbineRunDataService
extends BaseService
1.20 +1 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Index: TurbineUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurbineUploadService.java 2001/06/30 13:07:28 1.19
+++ TurbineUploadService.java 2001/07/13 16:53:39 1.20
@@ -67,7 +67,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.ValueParser;
/**
* <p> This class is an implementation of {@link UploadService}.
@@ -88,7 +87,7 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: TurbineUploadService.java,v 1.19 2001/06/30 13:07:28 jvanzyl Exp $
+ * @version $Id: TurbineUploadService.java,v 1.20 2001/07/13 16:53:39 jvanzyl Exp $
*/
public class TurbineUploadService
extends BaseUploadService
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org