jvanzyl 01/08/01 08:44:26
Modified: src/adapter/org/apache/turbine TurbineAdapter.java
src/adapter/org/apache/turbine/util/template
RelativeTemplateLink.java TemplateInfo.java
TemplateLink.java
src/adapter/org/apache/turbine/util/velocity
VelocityEmail.java
src/java/org/apache/turbine RunData.java Turbine.java
src/java/org/apache/turbine/modules ScriptableModule.java
src/java/org/apache/turbine/modules/actions
AccessController.java LoginUser.java
LogoutUser.java
src/java/org/apache/turbine/modules/actions/sessionvalidator
TemplateSessionValidator.java
src/java/org/apache/turbine/modules/screens
TemplateScreen.java TemplateSecureScreen.java
src/java/org/apache/turbine/om OMTool.java
src/java/org/apache/turbine/pipeline ClassicPipeline.java
src/java/org/apache/turbine/util ContentURI.java
ParameterParser.java RunDataFactory.java
src/java/org/apache/turbine/util/parser BaseValueParser.java
DefaultCookieParser.java
DefaultParameterParser.java
Log:
- reflect changes in services
Revision Changes Path
1.2 +1 -1
jakarta-turbine/src/adapter/org/apache/turbine/TurbineAdapter.java
Index: TurbineAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/TurbineAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineAdapter.java 2001/07/10 00:40:22 1.1
+++ TurbineAdapter.java 2001/08/01 15:44:20 1.2
@@ -94,7 +94,7 @@
* UploadService
* import org.apache.turbine.util.upload.FileItem
* changes to
- * import org.apache.turbine.services.upload.FileItem
+ * import org.apache.fulcrum.upload.FileItem
*
* XmlRpcService
* The properties have been fully qualified.
1.2 +2 -4
jakarta-turbine/src/adapter/org/apache/turbine/util/template/RelativeTemplateLink.java
Index: RelativeTemplateLink.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/template/RelativeTemplateLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RelativeTemplateLink.java 2001/07/10 00:38:52 1.1
+++ RelativeTemplateLink.java 2001/08/01 15:44:21 1.2
@@ -55,12 +55,10 @@
*/
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.turbine.services.pull.ApplicationTool;
-
import org.apache.turbine.util.RelativeDynamicURI;
import org.apache.turbine.RunData;
import org.apache.turbine.util.ServerData;
+import org.apache.turbine.services.pull.ApplicationTool;
/**
* A customized version of the RelativeDynamicURI to be used in Templates.
@@ -73,7 +71,7 @@
*
* @author <a href="[EMAIL PROTECTED]">John D. McNally</a>
* @author see the authors of TemplateLink
- * @version $Id: RelativeTemplateLink.java,v 1.1 2001/07/10 00:38:52 jvanzyl Exp $
+ * @version $Id: RelativeTemplateLink.java,v 1.2 2001/08/01 15:44:21 jvanzyl Exp $
*/
public class RelativeTemplateLink
extends RelativeDynamicURI
1.3 +1 -2
jakarta-turbine/src/adapter/org/apache/turbine/util/template/TemplateInfo.java
Index: TemplateInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/template/TemplateInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateInfo.java 2001/07/12 20:19:53 1.2
+++ TemplateInfo.java 2001/08/01 15:44:21 1.3
@@ -55,7 +55,6 @@
*/
import java.util.Hashtable;
-
import org.apache.turbine.RunData;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -66,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TemplateInfo.java,v 1.2 2001/07/12 20:19:53 jvanzyl Exp $
+ * @version $Id: TemplateInfo.java,v 1.3 2001/08/01 15:44:21 jvanzyl Exp $
*/
public class TemplateInfo
{
1.2 +2 -4
jakarta-turbine/src/adapter/org/apache/turbine/util/template/TemplateLink.java
Index: TemplateLink.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/template/TemplateLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateLink.java 2001/07/10 00:38:52 1.1
+++ TemplateLink.java 2001/08/01 15:44:21 1.2
@@ -55,12 +55,10 @@
*/
import javax.servlet.http.HttpServletResponse;
-
-import org.apache.turbine.services.pull.ApplicationTool;
-
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.RunData;
import org.apache.turbine.util.ServerData;
+import org.apache.turbine.services.pull.ApplicationTool;
/**
* A customized version of the DynamicURI to be used in Templates.
@@ -76,7 +74,7 @@
* @author <a href="[EMAIL PROTECTED]">Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
- * @version $Id: TemplateLink.java,v 1.1 2001/07/10 00:38:52 jvanzyl Exp $
+ * @version $Id: TemplateLink.java,v 1.2 2001/08/01 15:44:21 jvanzyl Exp $
*/
public class TemplateLink
extends DynamicURI
1.3 +2 -2
jakarta-turbine/src/adapter/org/apache/turbine/util/velocity/VelocityEmail.java
Index: VelocityEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/velocity/VelocityEmail.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VelocityEmail.java 2001/07/12 20:19:58 1.2
+++ VelocityEmail.java 2001/08/01 15:44:21 1.3
@@ -58,8 +58,8 @@
import org.apache.turbine.util.StringUtils;
import org.apache.turbine.util.mail.Email;
import org.apache.turbine.util.mail.SimpleEmail;
-import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.velocity.context.Context;
+import org.apache.turbine.services.velocity.TurbineVelocity;
/**
* This is a simple class for sending email from within Velocity.
@@ -122,7 +122,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Coladonato</a>
- * @version $Id: VelocityEmail.java,v 1.2 2001/07/12 20:19:58 jvanzyl Exp $
+ * @version $Id: VelocityEmail.java,v 1.3 2001/08/01 15:44:21 jvanzyl Exp $
*/
public class VelocityEmail
{
1.11 +3 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RunData.java 2001/07/17 11:37:25 1.10
+++ RunData.java 2001/08/01 15:44:21 1.11
@@ -63,8 +63,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.turbine.services.security.entity.User;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.util.AccessControlList;
//!! This is a lot of baggage.
import org.apache.turbine.ParameterParser;
@@ -82,7 +82,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.10 2001/07/17 11:37:25 jvanzyl Exp $
+ * @version $Id: RunData.java,v 1.11 2001/08/01 15:44:21 jvanzyl Exp $
*/
public interface RunData
{
1.81 +4 -4 jakarta-turbine/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Turbine.java 2001/07/25 23:36:31 1.80
+++ Turbine.java 2001/08/01 15:44:21 1.81
@@ -72,8 +72,8 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunDataFactory;
import org.apache.turbine.util.StringUtils;
-import org.apache.turbine.services.ServiceManager;
-import org.apache.turbine.services.TurbineServices;
+import org.apache.fulcrum.ServiceManager;
+import org.apache.fulcrum.TurbineServices;
import org.apache.log4j.Category;
import org.apache.velocity.runtime.configuration.Configuration;
@@ -90,7 +90,7 @@
*
* <ul>
* <li><code>resources</code> the implementation of
- * {@link org.apache.turbine.services.resources.ResourceService} to be used</li>
+ * {@link org.apache.fulcrum.resources.ResourceService} to be used</li>
* <li><code>properties</code> the path to TurbineResources.properties file
* used by the default implementation of <code>ResourceService</code>, relative
* to the application root.</li>
@@ -108,7 +108,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Turbine.java,v 1.80 2001/07/25 23:36:31 jvanzyl Exp $
+ * @version $Id: Turbine.java,v 1.81 2001/08/01 15:44:21 jvanzyl Exp $
*/
public class Turbine
extends HttpServlet
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/modules/ScriptableModule.java
Index: ScriptableModule.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/ScriptableModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptableModule.java 2001/07/10 01:03:21 1.2
+++ ScriptableModule.java 2001/08/01 15:44:22 1.3
@@ -55,7 +55,7 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.services.bsf.TurbineBSF;
+import org.apache.fulcrum.bsf.TurbineBSF;
/**
* This is an interface that defines what a Module is. All the
@@ -63,7 +63,7 @@
* future use is yet to be determined.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ScriptableModule.java,v 1.2 2001/07/10 01:03:21 jvanzyl Exp $
+ * @version $Id: ScriptableModule.java,v 1.3 2001/08/01 15:44:22 jvanzyl Exp $
*/
public class ScriptableModule
extends Module
1.13 +4 -4
jakarta-turbine/src/java/org/apache/turbine/modules/actions/AccessController.java
Index: AccessController.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/AccessController.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AccessController.java 2001/07/20 21:32:47 1.12
+++ AccessController.java 2001/08/01 15:44:23 1.13
@@ -56,8 +56,8 @@
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Action;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
@@ -90,7 +90,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: AccessController.java,v 1.12 2001/07/20 21:32:47 jon Exp $
+ * @version $Id: AccessController.java,v 1.13 2001/08/01 15:44:23 jvanzyl Exp $
*/
public class AccessController
extends Action
@@ -102,7 +102,7 @@
* <code>TurbineSecurity.getACL()</code> and added to the current
* session.
*
- * @see org.apache.turbine.services.security.TurbineSecurity
+ * @see org.apache.fulcrum.security.TurbineSecurity
* @param data Turbine information.
* @exception Exception, a generic exception.
*/
1.17 +5 -5
jakarta-turbine/src/java/org/apache/turbine/modules/actions/LoginUser.java
Index: LoginUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/LoginUser.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LoginUser.java 2001/07/17 11:37:28 1.16
+++ LoginUser.java 2001/08/01 15:44:23 1.17
@@ -57,11 +57,11 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Action;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.security.entity.User;
+import org.apache.fulcrum.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.User;
import org.apache.turbine.util.Log;
-import org.apache.turbine.services.security.util.DataBackendException;
-import org.apache.turbine.services.security.util.TurbineSecurityException;
+import org.apache.fulcrum.security.util.DataBackendException;
+import org.apache.fulcrum.security.util.TurbineSecurityException;
/**
* This is where we authenticate the user logging into the system
@@ -69,7 +69,7 @@
* that users last login time will be updated.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: LoginUser.java,v 1.16 2001/07/17 11:37:28 jvanzyl Exp $
+ * @version $Id: LoginUser.java,v 1.17 2001/08/01 15:44:23 jvanzyl Exp $
*/
public class LoginUser
extends Action
1.15 +4 -4
jakarta-turbine/src/java/org/apache/turbine/modules/actions/LogoutUser.java
Index: LogoutUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/LogoutUser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LogoutUser.java 2001/07/17 11:37:28 1.14
+++ LogoutUser.java 2001/08/01 15:44:23 1.15
@@ -57,17 +57,17 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Action;
-import org.apache.turbine.services.security.entity.User;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.util.Log;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* This action removes a user from the session. It makes sure to save
* the User object in the session.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: LogoutUser.java,v 1.14 2001/07/17 11:37:28 jvanzyl Exp $
+ * @version $Id: LogoutUser.java,v 1.15 2001/08/01 15:44:23 jvanzyl Exp $
*/
public class LogoutUser
extends Action
1.16 +2 -2
jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
Index: TemplateSessionValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TemplateSessionValidator.java 2001/07/20 21:32:47 1.15
+++ TemplateSessionValidator.java 2001/08/01 15:44:23 1.16
@@ -56,7 +56,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.turbine.util.Log;
/**
@@ -71,7 +71,7 @@
* @see TemplateSecureSessionValidator
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateSessionValidator.java,v 1.15 2001/07/20 21:32:47 jon Exp $
+ * @version $Id: TemplateSessionValidator.java,v 1.16 2001/08/01 15:44:23 jvanzyl
Exp $
*/
public class TemplateSessionValidator
extends SessionValidator
1.19 +1 -2
jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
Index: TemplateScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TemplateScreen.java 2001/07/24 21:54:54 1.18
+++ TemplateScreen.java 2001/08/01 15:44:23 1.19
@@ -56,7 +56,6 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.Log;
import org.apache.turbine.TemplateContext;
import org.apache.turbine.modules.Module;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -74,7 +73,7 @@
* going on there (it is quite simple really).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateScreen.java,v 1.18 2001/07/24 21:54:54 mikeh Exp $
+ * @version $Id: TemplateScreen.java,v 1.19 2001/08/01 15:44:23 jvanzyl Exp $
*/
public class TemplateScreen
extends Module
@@ -143,7 +142,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ e.printStackTrace();
}
finally
{
1.4 +1 -2
jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateSecureScreen.java
Index: TemplateSecureScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateSecureScreen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TemplateSecureScreen.java 2001/07/16 15:34:34 1.3
+++ TemplateSecureScreen.java 2001/08/01 15:44:23 1.4
@@ -56,7 +56,6 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.services.template.TurbineTemplate;
/**
* VelocitySecureScreen
@@ -70,7 +69,7 @@
* your base screen.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateSecureScreen.java,v 1.3 2001/07/16 15:34:34 jvanzyl Exp $
+ * @version $Id: TemplateSecureScreen.java,v 1.4 2001/08/01 15:44:23 jvanzyl Exp $
*/
public abstract class TemplateSecureScreen
extends TemplateScreen
1.9 +2 -2 jakarta-turbine/src/java/org/apache/turbine/om/OMTool.java
Index: OMTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/OMTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OMTool.java 2001/07/14 21:29:33 1.8
+++ OMTool.java 2001/08/01 15:44:23 1.9
@@ -63,14 +63,14 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.TurbineException;
import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.services.pool.Recyclable;
+import org.apache.fulcrum.pool.Recyclable;
import org.apache.turbine.services.db.om.RetrieverFactory;
/**
* A Pull tool to make om objects available to a template
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: OMTool.java,v 1.8 2001/07/14 21:29:33 jvanzyl Exp $
+ * @version $Id: OMTool.java,v 1.9 2001/08/01 15:44:23 jvanzyl Exp $
*/
public class OMTool
implements ApplicationTool, Recyclable
1.10 +1 -2
jakarta-turbine/src/java/org/apache/turbine/pipeline/ClassicPipeline.java
Index: ClassicPipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/pipeline/ClassicPipeline.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ClassicPipeline.java 2001/07/17 11:37:29 1.9
+++ ClassicPipeline.java 2001/08/01 15:44:24 1.10
@@ -64,11 +64,10 @@
import org.apache.turbine.services.template.TemplateContext;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.Log;
-
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.modules.actions.sessionvalidator.SessionValidator;
import org.apache.turbine.modules.actions.AccessController;
-import org.apache.turbine.services.security.util.AccessControlList;
+import org.apache.fulcrum.security.util.AccessControlList;
/**
* This is a pipeline that emulates the standard Turbine
1.13 +2 -2 jakarta-turbine/src/java/org/apache/turbine/util/ContentURI.java
Index: ContentURI.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/ContentURI.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ContentURI.java 2001/07/17 11:37:36 1.12
+++ ContentURI.java 2001/08/01 15:44:24 1.13
@@ -55,8 +55,8 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.services.pull.ApplicationTool;
import java.lang.reflect.Method;
+import org.apache.turbine.services.pull.ApplicationTool;
/**
* Utility class to allow the easy inclusion of
@@ -65,7 +65,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Cameron Riley</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: ContentURI.java,v 1.12 2001/07/17 11:37:36 jvanzyl Exp $
+ * @version $Id: ContentURI.java,v 1.13 2001/08/01 15:44:24 jvanzyl Exp $
*/
public class ContentURI
extends DynamicURI
1.33 +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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ParameterParser.java 2001/07/13 16:49:16 1.32
+++ ParameterParser.java 2001/08/01 15:44:24 1.33
@@ -55,7 +55,7 @@
*/
import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.services.upload.FileItem;
+import org.apache.fulcrum.upload.FileItem;
import org.apache.turbine.util.parser.ValueParser;
/**
@@ -80,7 +80,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.32 2001/07/13 16:49:16 jvanzyl Exp $
+ * @version $Id: ParameterParser.java,v 1.33 2001/08/01 15:44:24 jvanzyl Exp $
*/
public interface ParameterParser
extends ValueParser
1.18 +4 -4
jakarta-turbine/src/java/org/apache/turbine/util/RunDataFactory.java
Index: RunDataFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/RunDataFactory.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RunDataFactory.java 2001/07/20 21:32:49 1.17
+++ RunDataFactory.java 2001/08/01 15:44:24 1.18
@@ -60,9 +60,9 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.pool.PoolService;
+import org.apache.fulcrum.TurbineServices;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.pool.PoolService;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.services.rundata.TurbineRunData;
import org.apache.turbine.services.rundata.DefaultTurbineRunData;
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: RunDataFactory.java,v 1.17 2001/07/20 21:32:49 jon Exp $
+ * @version $Id: RunDataFactory.java,v 1.18 2001/08/01 15:44:24 jvanzyl Exp $
*/
public class RunDataFactory
{
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- BaseValueParser.java 2001/07/30 20:39:22 1.21
+++ BaseValueParser.java 2001/08/01 15:44:25 1.22
@@ -70,9 +70,9 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.services.db.om.NumberKey;
import org.apache.turbine.services.db.om.StringKey;
+import org.apache.fulcrum.pool.Recyclable;
+import org.apache.fulcrum.pool.RecyclableSupport;
import org.apache.turbine.util.StringUtils;
-import org.apache.turbine.services.pool.Recyclable;
-import org.apache.turbine.services.pool.RecyclableSupport;
/**
* BaseValueParser is a base class for classes that need to parse
@@ -100,7 +100,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.21 2001/07/30 20:39:22 jvanzyl Exp $
+ * @version $Id: BaseValueParser.java,v 1.22 2001/08/01 15:44:25 jvanzyl Exp $
*/
public class BaseValueParser
extends RecyclableSupport
1.6 +2 -2
jakarta-turbine/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java
Index: DefaultCookieParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultCookieParser.java 2001/07/14 05:02:59 1.5
+++ DefaultCookieParser.java 2001/08/01 15:44:25 1.6
@@ -60,7 +60,7 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.RunData;
import org.apache.turbine.util.DynamicURI;
-import org.apache.turbine.services.pool.Recyclable;
+import org.apache.fulcrum.pool.Recyclable;
/**
* CookieParser is used to get and set values of Cookies on the Client
@@ -87,7 +87,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leon Messerschmidt</a>
- * @version $Id: DefaultCookieParser.java,v 1.5 2001/07/14 05:02:59 jvanzyl Exp $
+ * @version $Id: DefaultCookieParser.java,v 1.6 2001/08/01 15:44:25 jvanzyl Exp $
*/
public class DefaultCookieParser
extends BaseValueParser
1.13 +5 -5
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultParameterParser.java 2001/07/14 21:29:43 1.12
+++ DefaultParameterParser.java 2001/08/01 15:44:25 1.13
@@ -62,10 +62,10 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.util.Log;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.pool.Recyclable;
-import org.apache.turbine.services.upload.FileItem;
-import org.apache.turbine.services.upload.TurbineUpload;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.pool.Recyclable;
+import org.apache.fulcrum.upload.FileItem;
+import org.apache.fulcrum.upload.TurbineUpload;
/**
* DefaultParameterParser is a utility object to handle parsing and
@@ -89,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.12 2001/07/14 21:29:43 jvanzyl Exp
$
+ * @version $Id: DefaultParameterParser.java,v 1.13 2001/08/01 15:44:25 jvanzyl Exp
$
*/
public class DefaultParameterParser
extends BaseValueParser
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
