jvanzyl 01/07/13 10:07:43
Modified: src/java/org/apache/turbine RunData.java
src/java/org/apache/turbine/modules/actions
TemplateAction.java
Added: src/java/org/apache/turbine ParameterParser.java
Removed: src/java/org/apache/turbine/util SecurityCheck.java
Log:
- more cleanup
Revision Changes Path
1.4 +6 -3 jakarta-turbine/src/java/org/apache/turbine/RunData.java
Index: RunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/RunData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RunData.java 2001/07/12 20:32:02 1.3
+++ RunData.java 2001/07/13 17:06:59 1.4
@@ -71,8 +71,8 @@
import org.apache.ecs.StringElement;
//!! This is a lot of baggage.
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.CookieParser;
+import org.apache.turbine.ParameterParser;
+import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.FormMessages;
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.SystemError;
@@ -88,7 +88,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Bernie Hoeneisen</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: RunData.java,v 1.3 2001/07/12 20:32:02 jvanzyl Exp $
+ * @version $Id: RunData.java,v 1.4 2001/07/13 17:06:59 jvanzyl Exp $
*/
public interface RunData
{
@@ -660,4 +660,7 @@
* @return a hashtable for debug variables.
*/
public Hashtable getVarDebug();
+
+ // this seems to have been missing from the interface?
+ public void setParameterParser(ParameterParser p);
}
1.1 jakarta-turbine/src/java/org/apache/turbine/ParameterParser.java
Index: ParameterParser.java
===================================================================
package org.apache.turbine;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
public interface ParameterParser
extends org.apache.turbine.util.ParameterParser
{
}
1.4 +2 -3
jakarta-turbine/src/java/org/apache/turbine/modules/actions/TemplateAction.java
Index: TemplateAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/TemplateAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateAction.java 2001/07/13 02:20:09 1.3
+++ TemplateAction.java 2001/07/13 17:07:19 1.4
@@ -58,10 +58,9 @@
import org.apache.turbine.TemplateContext;
import java.lang.reflect.Method;
import java.util.Enumeration;
+import org.apache.turbine.ParameterParser;
import org.apache.turbine.modules.ActionEvent;
import org.apache.turbine.services.template.TurbineTemplate;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.ValueParser;
import org.apache.turbine.util.template.TemplateInfo;
/**
@@ -79,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TemplateAction.java,v 1.3 2001/07/13 02:20:09 jvanzyl Exp $
+ * @version $Id: TemplateAction.java,v 1.4 2001/07/13 17:07:19 jvanzyl Exp $
*/
public abstract class TemplateAction
extends ActionEvent
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
