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/14 07:02:30 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/rundata DefaultTurbineRunData.java RunDataService.java TurbineRunData.java
jvanzyl 01/07/13 22:02:30
Modified: src/java/org/apache/turbine/services/factory
TurbineFactoryService.java
src/java/org/apache/turbine/services/intake
IntakeService.java IntakeTool.java
TurbineIntakeService.java
src/java/org/apache/turbine/services/intake/model Group.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java RunDataService.java
TurbineRunData.java
Log:
- changes to reflect new location of pool classes.
Revision Changes Path
1.10 +2 -3 jakarta-turbine/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java
Index: TurbineFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/factory/TurbineFactoryService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineFactoryService.java 2001/07/13 19:20:26 1.9
+++ TurbineFactoryService.java 2001/07/14 05:02:25 1.10
@@ -62,9 +62,8 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
-
import org.apache.turbine.TurbineException;
-import org.apache.turbine.util.pool.ObjectInputStreamForContext;
+import org.apache.turbine.services.pool.ObjectInputStreamForContext;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
@@ -74,7 +73,7 @@
* will be used.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineFactoryService.java,v 1.9 2001/07/13 19:20:26 jvanzyl Exp $
+ * @version $Id: TurbineFactoryService.java,v 1.10 2001/07/14 05:02:25 jvanzyl Exp $
*/
public class TurbineFactoryService
extends BaseService
1.11 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/IntakeService.java
Index: IntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/IntakeService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- IntakeService.java 2001/07/13 19:20:33 1.10
+++ IntakeService.java 2001/07/14 05:02:26 1.11
@@ -56,8 +56,8 @@
import java.lang.reflect.Method;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.pool.Recyclable;
+import org.apache.turbine.ParameterParser;
+import org.apache.turbine.services.pool.Recyclable;
import org.apache.turbine.services.intake.model.Group;
/**
@@ -65,7 +65,7 @@
* on an XML specification.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: IntakeService.java,v 1.10 2001/07/13 19:20:33 jvanzyl Exp $
+ * @version $Id: IntakeService.java,v 1.11 2001/07/14 05:02:26 jvanzyl Exp $
*/
public interface IntakeService
{
1.19 +2 -2 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- IntakeTool.java 2001/07/13 16:50:14 1.18
+++ IntakeTool.java 2001/07/14 05:02:26 1.19
@@ -66,13 +66,13 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.pool.Recyclable;
+import org.apache.turbine.services.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.18 2001/07/13 16:50:14 jvanzyl Exp $
+ * @version $Id: IntakeTool.java,v 1.19 2001/07/14 05:02:26 jvanzyl Exp $
*/
public class IntakeTool
implements ApplicationTool, Recyclable
1.16 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineIntakeService.java 2001/07/13 19:20:37 1.15
+++ TurbineIntakeService.java 2001/07/14 05:02:26 1.16
@@ -79,8 +79,8 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.util.pool.BoundedBuffer;
-import org.apache.turbine.util.pool.Recyclable;
+import org.apache.turbine.services.pool.BoundedBuffer;
+import org.apache.turbine.services.pool.Recyclable;
/**
@@ -88,7 +88,7 @@
* on an XML specification.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: TurbineIntakeService.java,v 1.15 2001/07/13 19:20:37 jvanzyl Exp $
+ * @version $Id: TurbineIntakeService.java,v 1.16 2001/07/14 05:02:26 jvanzyl Exp $
*/
public class TurbineIntakeService
extends BaseService
1.20 +1 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Group.java 2001/07/13 19:20:49 1.19
+++ Group.java 2001/07/14 05:02:28 1.20
@@ -67,7 +67,7 @@
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.util.pool.Recyclable;
+import org.apache.turbine.services.pool.Recyclable;
/** Holds a group of Fields */
public class Group
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultTurbineRunData.java 2001/07/13 22:22:40 1.18
+++ DefaultTurbineRunData.java 2001/07/14 05:02:29 1.19
@@ -71,8 +71,8 @@
import org.apache.turbine.util.ServerData;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.template.TemplateInfo;
-import org.apache.turbine.util.pool.Recyclable;
-import org.apache.turbine.util.pool.RecyclableSupport;
+import org.apache.turbine.services.pool.Recyclable;
+import org.apache.turbine.services.pool.RecyclableSupport;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.services.mimetype.TurbineMimeTypes;
@@ -101,7 +101,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.18 2001/07/13 22:22:40 jvanzyl Exp $
+ * @version $Id: DefaultTurbineRunData.java,v 1.19 2001/07/14 05:02:29 jvanzyl Exp $
*/
public class DefaultTurbineRunData
extends RecyclableSupport
1.5 +1 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RunDataService.java 2001/07/13 19:21:37 1.4
+++ RunDataService.java 2001/07/14 05:02:29 1.5
@@ -57,7 +57,6 @@
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
import org.apache.turbine.services.Service;
@@ -70,7 +69,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: RunDataService.java,v 1.4 2001/07/13 19:21:37 jvanzyl Exp $
+ * @version $Id: RunDataService.java,v 1.5 2001/07/14 05:02:29 jvanzyl Exp $
*/
public interface RunDataService
extends Service
1.4 +2 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineRunData.java 2001/07/13 16:53:11 1.3
+++ TurbineRunData.java 2001/07/14 05:02:29 1.4
@@ -56,14 +56,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.parser.CookieParser;
import org.apache.turbine.util.ServerData;
-import org.apache.turbine.util.pool.Recyclable;
+import org.apache.turbine.services.pool.Recyclable;
/**
* TurbineRunData is an extension to the RunData interface to be
@@ -79,7 +78,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.3 2001/07/13 16:53:11 jvanzyl Exp $
+ * @version $Id: TurbineRunData.java,v 1.4 2001/07/14 05:02:29 jvanzyl Exp $
*/
public interface TurbineRunData extends RunData,
Recyclable
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org