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/08/16 05:50:41 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/util DynamicURI.java TurbineConfig.java ParameterParser.java RunData.java RunDataFactory.java
jvanzyl 01/08/15 20:50:41
Modified: src/java/org/apache/turbine/util DynamicURI.java
TurbineConfig.java
Removed: src/java/org/apache/turbine/util ParameterParser.java
RunData.java RunDataFactory.java
Log:
- remove RunData from here and am using the o.a.t interface everywhere, the
adaptor layer will come later
- moved all the rundata related code into the service directory to keep it
in one place for now
Revision Changes Path
1.22 +5 -5 jakarta-turbine/src/java/org/apache/turbine/util/DynamicURI.java
Index: DynamicURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/DynamicURI.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DynamicURI.java 2001/08/10 12:12:31 1.21
+++ DynamicURI.java 2001/08/16 03:50:41 1.22
@@ -61,7 +61,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.Turbine;
-import org.apache.turbine.util.parser.BaseValueParser;
+import org.apache.turbine.ParameterParser;
/**
* This creates a Dynamic URI for use within the Turbine system
@@ -83,7 +83,7 @@
*
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: DynamicURI.java,v 1.21 2001/08/10 12:12:31 knielsen Exp $
+ * @version $Id: DynamicURI.java,v 1.22 2001/08/16 03:50:41 jvanzyl Exp $
*/
public class DynamicURI
{
@@ -248,7 +248,7 @@
String value )
{
Object[] tmp = new Object[2];
- tmp[0] = (Object) BaseValueParser.convertAndTrim(name);
+ tmp[0] = (Object) data.getParameters().convertAndTrim(name);
tmp[1] = (Object) value;
switch (type)
{
@@ -538,7 +538,7 @@
e.hasMoreElements() ;)
{
Object[] tmp = (Object[]) e.nextElement();
- if ( BaseValueParser.convertAndTrim(name)
+ if ( data.getParameters().convertAndTrim(name)
.equals ( (String)tmp[0] ) )
{
this.pathInfo.removeElement ( tmp );
@@ -554,7 +554,7 @@
e.hasMoreElements() ;)
{
Object[] tmp = (Object[]) e.nextElement();
- if ( BaseValueParser.convertAndTrim(name)
+ if ( data.getParameters().convertAndTrim(name)
.equals ( (String)tmp[0] ) )
{
this.queryData.removeElement ( tmp );
1.25 +2 -1 jakarta-turbine/src/java/org/apache/turbine/util/TurbineConfig.java
Index: TurbineConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/TurbineConfig.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TurbineConfig.java 2001/08/11 08:57:25 1.24
+++ TurbineConfig.java 2001/08/16 03:50:41 1.25
@@ -73,6 +73,7 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import org.apache.turbine.Turbine;
+import org.apache.turbine.RunData;
/**
* A class used for initalization of Turbine without a servlet container.
@@ -99,7 +100,7 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: TurbineConfig.java,v 1.24 2001/08/11 08:57:25 dlr Exp $
+ * @version $Id: TurbineConfig.java,v 1.25 2001/08/16 03:50:41 jvanzyl Exp $
*/
public class TurbineConfig implements ServletConfig, ServletContext
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org