jvanzyl 01/08/01 08:35:22
Modified: src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java RunDataService.java
TurbineRunData.java TurbineRunDataService.java
Log:
- reflect changes in services
Revision Changes Path
1.24 +6 -7
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultTurbineRunData.java 2001/07/17 11:37:31 1.23
+++ DefaultTurbineRunData.java 2001/08/01 15:35:21 1.24
@@ -64,18 +64,17 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.services.security.entity.User;
import org.apache.turbine.RunData;
import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.Turbine;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.util.ServerData;
-import org.apache.turbine.services.security.util.AccessControlList;
-import org.apache.turbine.services.pool.Recyclable;
-import org.apache.turbine.services.pool.RecyclableSupport;
+import org.apache.fulcrum.security.util.AccessControlList;
+import org.apache.fulcrum.pool.Recyclable;
+import org.apache.fulcrum.pool.RecyclableSupport;
+import org.apache.fulcrum.mimetype.TurbineMimeTypes;
+import org.apache.fulcrum.security.entity.User;
import org.apache.turbine.services.template.TurbineTemplate;
-import org.apache.turbine.services.mimetype.TurbineMimeTypes;
-
import org.apache.commons.collections.FastHashMap;
/**
@@ -97,7 +96,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: DefaultTurbineRunData.java,v 1.23 2001/07/17 11:37:31 jvanzyl Exp $
+ * @version $Id: DefaultTurbineRunData.java,v 1.24 2001/08/01 15:35:21 jvanzyl Exp $
*/
public class DefaultTurbineRunData
extends RecyclableSupport
1.7 +3 -3
jakarta-turbine/src/java/org/apache/turbine/services/rundata/RunDataService.java
Index: RunDataService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/RunDataService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RunDataService.java 2001/07/14 19:36:33 1.6
+++ RunDataService.java 2001/08/01 15:35:22 1.7
@@ -58,8 +58,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.Service;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.Service;
/**
* The RunData Service provides the implementations for RunData and
@@ -69,7 +69,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: RunDataService.java,v 1.6 2001/07/14 19:36:33 jvanzyl Exp $
+ * @version $Id: RunDataService.java,v 1.7 2001/08/01 15:35:22 jvanzyl Exp $
*/
public interface RunDataService
extends Service
1.5 +2 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineRunData.java 2001/07/14 05:02:29 1.4
+++ TurbineRunData.java 2001/08/01 15:35:22 1.5
@@ -62,7 +62,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.ServerData;
-import org.apache.turbine.services.pool.Recyclable;
+import org.apache.fulcrum.pool.Recyclable;
/**
* TurbineRunData is an extension to the RunData interface to be
@@ -78,7 +78,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: TurbineRunData.java,v 1.4 2001/07/14 05:02:29 jvanzyl Exp $
+ * @version $Id: TurbineRunData.java,v 1.5 2001/08/01 15:35:22 jvanzyl Exp $
*/
public interface TurbineRunData extends RunData,
Recyclable
1.9 +7 -7
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineRunDataService.java 2001/07/14 19:36:33 1.8
+++ TurbineRunDataService.java 2001/08/01 15:35:22 1.9
@@ -66,11 +66,11 @@
import org.apache.turbine.ParameterParser;
import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.ServerData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.BaseService;
-import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.pool.PoolService;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.TurbineServices;
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.InitializationException;
+import org.apache.fulcrum.pool.PoolService;
/**
* The RunData Service provides the implementations for RunData and
@@ -80,7 +80,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TurbineRunDataService.java,v 1.8 2001/07/14 19:36:33 jvanzyl Exp $
+ * @version $Id: TurbineRunDataService.java,v 1.9 2001/08/01 15:35:22 jvanzyl Exp $
*/
public class TurbineRunDataService
extends BaseService
@@ -105,7 +105,7 @@
* The default implementations.
*/
private static final String DEFAULT_RUN_DATA =
- "org.apache.turbine.services.rundata.DefaultTurbineRunData";
+ "org.apache.fulcrum.rundata.DefaultTurbineRunData";
private static final String DEFAULT_PARAMETER_PARSER =
"org.apache.turbine.util.parser.DefaultParameterParser";
private static final String DEFAULT_COOKIE_PARSER =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
