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/13 21:22:24 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc TurbineXmlRpc.java TurbineXmlRpcService.java XmlRpcService.java
jvanzyl 01/07/13 12:22:23
Modified: src/java/org/apache/turbine/om OMTool.java
src/java/org/apache/turbine/services BaseService.java
BaseServiceBroker.java InitializationException.java
InstantiationException.java
src/java/org/apache/turbine/services/db DatabaseService.java
TurbineDB.java TurbineDatabaseService.java
src/java/org/apache/turbine/services/db/om ComboKey.java
DateKey.java NumberKey.java ObjectKey.java
StringKey.java
src/java/org/apache/turbine/services/db/om/peer
BasePeer.java
src/java/org/apache/turbine/services/db/util IDBroker.java
src/java/org/apache/turbine/services/factory Factory.java
FactoryService.java TurbineFactoryService.java
src/java/org/apache/turbine/services/intake
IntakeService.java TurbineIntake.java
TurbineIntakeService.java
src/java/org/apache/turbine/services/intake/model
ComboKeyField.java Field.java FieldFactory.java
FileItemField.java Group.java
src/java/org/apache/turbine/services/intake/validator
DefaultValidator.java FileValidator.java
InitableByConstraintMap.java IntegerValidator.java
NumberKeyValidator.java NumberValidator.java
Validator.java
src/java/org/apache/turbine/services/jsp JspService.java
src/java/org/apache/turbine/services/pool PoolService.java
TurbinePool.java TurbinePoolService.java
src/java/org/apache/turbine/services/pool/util
InitableRecyclable.java
src/java/org/apache/turbine/services/resources
TurbineResourceService.java
src/java/org/apache/turbine/services/rundata
RunDataService.java TurbineRunDataService.java
src/java/org/apache/turbine/services/template
BaseTemplateEngineService.java
TemplateEngineService.java TemplateService.java
TurbineTemplate.java TurbineTemplateService.java
src/java/org/apache/turbine/services/upload
BaseUploadService.java TurbineUpload.java
TurbineUploadService.java UploadService.java
src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java VelocityService.java
src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpc.java TurbineXmlRpcService.java
XmlRpcService.java
Log:
- patch by kasper to use the public API for exceptions. now
using the top level org.apache.turbine exception classes.
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OMTool.java 2001/07/10 01:03:54 1.5
+++ OMTool.java 2001/07/13 19:19:39 1.6
@@ -60,7 +60,7 @@
import org.apache.turbine.util.StringUtils;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.pool.Recyclable;
@@ -70,7 +70,7 @@
* A Pull tool to make om objects available to a template
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: OMTool.java,v 1.5 2001/07/10 01:03:54 jvanzyl Exp $
+ * @version $Id: OMTool.java,v 1.6 2001/07/13 19:19:39 jvanzyl Exp $
*/
public class OMTool
implements ApplicationTool, Recyclable
1.17 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/BaseService.java
Index: BaseService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/BaseService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BaseService.java 2001/07/12 23:42:47 1.16
+++ BaseService.java 2001/07/13 19:19:43 1.17
@@ -57,7 +57,7 @@
import java.util.Properties;
import java.util.List;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.log4j.Category;
@@ -73,7 +73,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:leonardr@segfault.org">Leonard Richardson</a>
- * @version $Id: BaseService.java,v 1.16 2001/07/12 23:42:47 jvanzyl Exp $
+ * @version $Id: BaseService.java,v 1.17 2001/07/13 19:19:43 jvanzyl Exp $
*/
public class BaseService implements Service
{
1.42 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/BaseServiceBroker.java
Index: BaseServiceBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/BaseServiceBroker.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- BaseServiceBroker.java 2001/07/12 23:42:48 1.41
+++ BaseServiceBroker.java 2001/07/13 19:19:46 1.42
@@ -64,7 +64,7 @@
import java.util.Stack;
import org.apache.turbine.util.StringUtils;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.log4j.Category;
@@ -96,7 +96,7 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: BaseServiceBroker.java,v 1.41 2001/07/12 23:42:48 jvanzyl Exp $
+ * @version $Id: BaseServiceBroker.java,v 1.42 2001/07/13 19:19:46 jvanzyl Exp $
*/
public abstract class BaseServiceBroker implements ServiceBroker
{
1.10 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/InitializationException.java
Index: InitializationException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/InitializationException.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- InitializationException.java 2001/06/25 05:40:21 1.9
+++ InitializationException.java 2001/07/13 19:19:47 1.10
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Thrown by <code>Initable</code> class in case of initialization
@@ -62,7 +62,7 @@
*
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: InitializationException.java,v 1.9 2001/06/25 05:40:21 jvanzyl Exp $
+ * @version $Id: InitializationException.java,v 1.10 2001/07/13 19:19:47 jvanzyl Exp $
* @see org.apache.turbine.services.Initable
*/
public class InitializationException
1.11 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/InstantiationException.java
Index: InstantiationException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/InstantiationException.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- InstantiationException.java 2001/06/25 05:40:21 1.10
+++ InstantiationException.java 2001/07/13 19:19:48 1.11
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineRuntimeException;
+import org.apache.turbine.TurbineRuntimeException;
/**
* Thrown by <code>InitableBroker</code> and
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:burton@apache.org">Kevin Burton</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: InstantiationException.java,v 1.10 2001/06/25 05:40:21 jvanzyl Exp $
+ * @version $Id: InstantiationException.java,v 1.11 2001/07/13 19:19:48 jvanzyl Exp $
* @see org.apache.turbine.services.Initable
*/
public class InstantiationException
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/db/DatabaseService.java
Index: DatabaseService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/DatabaseService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatabaseService.java 2001/06/25 04:59:15 1.3
+++ DatabaseService.java 2001/07/13 19:19:55 1.4
@@ -55,7 +55,7 @@
*/
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.db.map.DatabaseMap;
import org.apache.turbine.services.db.pool.DBConnection;
import org.apache.turbine.services.db.adapter.DB;
@@ -84,7 +84,7 @@
* to the pool.<br>
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: DatabaseService.java,v 1.3 2001/06/25 04:59:15 jvanzyl Exp $
+ * @version $Id: DatabaseService.java,v 1.4 2001/07/13 19:19:55 jvanzyl Exp $
*/
public interface DatabaseService extends Service
{
1.12 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDB.java
Index: TurbineDB.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDB.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TurbineDB.java 2001/06/25 04:59:16 1.11
+++ TurbineDB.java 2001/07/13 19:19:56 1.12
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.db.adapter.DB;
import org.apache.turbine.services.db.map.DatabaseMap;
import org.apache.turbine.services.db.pool.DBConnection;
@@ -93,7 +93,7 @@
* </pre></code></blockquote>
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineDB.java,v 1.11 2001/06/25 04:59:16 jvanzyl Exp $
+ * @version $Id: TurbineDB.java,v 1.12 2001/07/13 19:19:56 jvanzyl Exp $
*/
public abstract class TurbineDB
{
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDatabaseService.java
Index: TurbineDatabaseService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/TurbineDatabaseService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineDatabaseService.java 2001/06/25 07:34:15 1.4
+++ TurbineDatabaseService.java 2001/07/13 19:19:58 1.5
@@ -59,7 +59,7 @@
import java.util.Map;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.db.util.AutoIncrementIdGenerator;
import org.apache.turbine.services.db.util.SequenceIdGenerator;
import org.apache.turbine.services.db.util.IDBroker;
@@ -81,7 +81,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineDatabaseService.java,v 1.4 2001/06/25 07:34:15 jvanzyl Exp $
+ * @version $Id: TurbineDatabaseService.java,v 1.5 2001/07/13 19:19:58 jvanzyl Exp $
*/
public class TurbineDatabaseService
extends BaseService
1.2 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/db/om/ComboKey.java
Index: ComboKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/ComboKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComboKey.java 2001/06/25 05:13:05 1.1
+++ ComboKey.java 2001/07/13 19:20:05 1.2
@@ -55,7 +55,7 @@
*/
import java.util.ArrayList;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.ObjectUtils;
/**
1.2 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/db/om/DateKey.java
Index: DateKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/DateKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateKey.java 2001/06/25 05:13:05 1.1
+++ DateKey.java 2001/07/13 19:20:05 1.2
@@ -55,7 +55,7 @@
*/
import java.util.Date;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This class can be used as an ObjectKey to uniquely identify an
1.2 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/db/om/NumberKey.java
Index: NumberKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/NumberKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NumberKey.java 2001/06/25 05:13:05 1.1
+++ NumberKey.java 2001/07/13 19:20:06 1.2
@@ -55,7 +55,7 @@
*/
import java.math.BigDecimal;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This class can be used as an ObjectKey to uniquely identify an
1.2 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/db/om/ObjectKey.java
Index: ObjectKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/ObjectKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectKey.java 2001/06/25 05:13:05 1.1
+++ ObjectKey.java 2001/07/13 19:20:07 1.2
@@ -55,7 +55,7 @@
*/
import java.io.Serializable;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This class can be used to uniquely identify an object within
1.2 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/db/om/StringKey.java
Index: StringKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/StringKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringKey.java 2001/06/25 05:13:06 1.1
+++ StringKey.java 2001/07/13 19:20:08 1.2
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This class can be used as an ObjectKey to uniquely identify an
1.2 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/db/om/peer/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/peer/BasePeer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasePeer.java 2001/06/25 05:13:06 1.1
+++ BasePeer.java 2001/07/13 19:20:13 1.2
@@ -100,7 +100,7 @@
//!! no good.
import org.apache.turbine.util.StringStackBuffer;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.log4j.Category;
@@ -115,7 +115,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.1 2001/06/25 05:13:06 jvanzyl Exp $
+ * @version $Id: BasePeer.java,v 1.2 2001/07/13 19:20:13 jvanzyl Exp $
*/
public abstract class BasePeer
{
1.3 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/db/util/IDBroker.java
Index: IDBroker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/IDBroker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IDBroker.java 2001/06/25 07:34:17 1.2
+++ IDBroker.java 2001/07/13 19:20:18 1.3
@@ -69,7 +69,7 @@
import org.apache.turbine.services.db.om.peer.BasePeer;
import org.apache.turbine.services.db.TurbineDB;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.db.map.DatabaseMap;
import org.apache.turbine.services.db.map.TableMap;
@@ -118,7 +118,7 @@
*
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: IDBroker.java,v 1.2 2001/06/25 07:34:17 jvanzyl Exp $
+ * @version $Id: IDBroker.java,v 1.3 2001/07/13 19:20:18 jvanzyl Exp $
*/
public class IDBroker
implements Runnable, IdGenerator
1.2 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/factory/Factory.java
Index: Factory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/factory/Factory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Factory.java 2001/03/18 12:32:38 1.1
+++ Factory.java 2001/07/13 19:20:23 1.2
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Factory is an interface for object factories. Object factories
@@ -65,7 +65,7 @@
* provider specific initializations before instantiation.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: Factory.java,v 1.1 2001/03/18 12:32:38 ilkka Exp $
+ * @version $Id: Factory.java,v 1.2 2001/07/13 19:20:23 jvanzyl Exp $
*/
public interface Factory
{
1.7 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/factory/FactoryService.java
Index: FactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/factory/FactoryService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FactoryService.java 2001/04/08 16:41:07 1.6
+++ FactoryService.java 2001/07/13 19:20:24 1.7
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.Service;
/**
@@ -64,7 +64,7 @@
* and can be tested with the isLoaderSupported method.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: FactoryService.java,v 1.6 2001/04/08 16:41:07 ilkka Exp $
+ * @version $Id: FactoryService.java,v 1.7 2001/07/13 19:20:24 jvanzyl Exp $
*/
public interface FactoryService extends Service
{
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineFactoryService.java 2001/06/14 14:39:33 1.8
+++ TurbineFactoryService.java 2001/07/13 19:20:26 1.9
@@ -63,7 +63,7 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.pool.ObjectInputStreamForContext;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
@@ -74,7 +74,7 @@
* will be used.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineFactoryService.java,v 1.8 2001/06/14 14:39:33 jvanzyl Exp $
+ * @version $Id: TurbineFactoryService.java,v 1.9 2001/07/13 19:20:26 jvanzyl Exp $
*/
public class TurbineFactoryService
extends BaseService
1.10 +2 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IntakeService.java 2001/06/14 14:40:05 1.9
+++ IntakeService.java 2001/07/13 19:20:33 1.10
@@ -55,7 +55,7 @@
*/
import java.lang.reflect.Method;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.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.9 2001/06/14 14:40:05 jvanzyl Exp $
+ * @version $Id: IntakeService.java,v 1.10 2001/07/13 19:20:33 jvanzyl Exp $
*/
public interface IntakeService
{
1.8 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/TurbineIntake.java
Index: TurbineIntake.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/TurbineIntake.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineIntake.java 2001/05/17 00:58:45 1.7
+++ TurbineIntake.java 2001/07/13 19:20:36 1.8
@@ -57,7 +57,7 @@
import java.lang.reflect.Method;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.intake.model.Group;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This is a Facade class for IntakeService.
@@ -67,7 +67,7 @@
* the settings in TurbineResources.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: TurbineIntake.java,v 1.7 2001/05/17 00:58:45 jmcnally Exp $
+ * @version $Id: TurbineIntake.java,v 1.8 2001/07/13 19:20:36 jvanzyl Exp $
*/
public abstract class TurbineIntake
{
1.15 +2 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineIntakeService.java 2001/06/14 14:40:05 1.14
+++ TurbineIntakeService.java 2001/07/13 19:20:37 1.15
@@ -78,7 +78,7 @@
import org.apache.turbine.services.intake.xmlmodel.AppData;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.pool.BoundedBuffer;
import org.apache.turbine.util.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.14 2001/06/14 14:40:05 jvanzyl Exp $
+ * @version $Id: TurbineIntakeService.java,v 1.15 2001/07/13 19:20:37 jvanzyl Exp $
*/
public class TurbineIntakeService
extends BaseService
1.7 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java
Index: ComboKeyField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/ComboKeyField.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ComboKeyField.java 2001/07/13 16:50:46 1.6
+++ ComboKeyField.java 2001/07/13 19:20:44 1.7
@@ -55,12 +55,12 @@
*/
import java.util.Vector;
+import org.apache.turbine.ParameterParser;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.db.om.ComboKey;
import org.apache.turbine.services.db.om.ObjectKey;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.ParameterParser;
-import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.Log;
/** */
1.22 +4 -4 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Field.java 2001/07/13 16:50:50 1.21
+++ Field.java 2001/07/13 19:20:45 1.22
@@ -57,6 +57,9 @@
import java.util.Map;
import java.lang.reflect.Method;
import org.apache.regexp.RE;
+import org.apache.turbine.ParameterParser;
+import org.apache.turbine.RunData;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.db.om.Retrievable;
import org.apache.turbine.services.intake.TurbineIntake;
import org.apache.turbine.services.intake.xmlmodel.Rule;
@@ -66,15 +69,12 @@
import org.apache.turbine.services.intake.validator.InitableByConstraintMap;
import org.apache.turbine.services.intake.validator.ValidationException;
import org.apache.turbine.util.Log;
-import org.apache.turbine.ParameterParser;
-import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
/**
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: Field.java,v 1.21 2001/07/13 16:50:50 jvanzyl Exp $
+ * @version $Id: Field.java,v 1.22 2001/07/13 19:20:45 jvanzyl Exp $
*/
public abstract class Field
{
1.8 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FieldFactory.java
Index: FieldFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FieldFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FieldFactory.java 2001/06/24 18:06:27 1.7
+++ FieldFactory.java 2001/07/13 19:20:47 1.8
@@ -57,13 +57,13 @@
import java.util.HashMap;
import java.util.Map;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Creates Field objects.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: FieldFactory.java,v 1.7 2001/06/24 18:06:27 jmcnally Exp $
+ * @version $Id: FieldFactory.java,v 1.8 2001/07/13 19:20:47 jvanzyl Exp $
*/
public abstract class FieldFactory
{
1.6 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileItemField.java 2001/07/13 16:50:59 1.5
+++ FileItemField.java 2001/07/13 19:20:48 1.6
@@ -59,7 +59,7 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.intake.validator.Validator;
import org.apache.turbine.services.intake.validator.FileValidator;
// import org.apache.turbine.services.intake.validator.InitableByConstraintMap;
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Group.java 2001/07/13 16:51:02 1.18
+++ Group.java 2001/07/13 19:20:49 1.19
@@ -66,7 +66,7 @@
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
/** Holds a group of Fields */
1.8 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java
Index: DefaultValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultValidator.java 2001/07/13 16:51:54 1.7
+++ DefaultValidator.java 2001/07/13 19:20:56 1.8
@@ -65,7 +65,7 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* A validator that will compare a testValue against the following
@@ -81,7 +81,7 @@
* This validator can serve as the base class for more specific validators
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: DefaultValidator.java,v 1.7 2001/07/13 16:51:54 jvanzyl Exp $
+ * @version $Id: DefaultValidator.java,v 1.8 2001/07/13 19:20:56 jvanzyl Exp $
*/
public class DefaultValidator
implements Validator, InitableByConstraintMap
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/FileValidator.java
Index: FileValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/FileValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileValidator.java 2001/07/13 16:51:59 1.4
+++ FileValidator.java 2001/07/13 19:20:58 1.5
@@ -65,7 +65,7 @@
import org.apache.turbine.util.Log;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.upload.FileItem;
/**
@@ -82,7 +82,7 @@
* This validator can serve as the base class for more specific validators
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: FileValidator.java,v 1.4 2001/07/13 16:51:59 jvanzyl Exp $
+ * @version $Id: FileValidator.java,v 1.5 2001/07/13 19:20:58 jvanzyl Exp $
*/
public class FileValidator
implements Validator, InitableByConstraintMap
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/InitableByConstraintMap.java
Index: InitableByConstraintMap.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/InitableByConstraintMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InitableByConstraintMap.java 2001/07/13 16:52:03 1.3
+++ InitableByConstraintMap.java 2001/07/13 19:20:59 1.4
@@ -55,14 +55,14 @@
*/
import java.util.Map;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This interface marks a bean/class that can have its properties set
* by values in a Map.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: InitableByConstraintMap.java,v 1.3 2001/07/13 16:52:03 jvanzyl Exp $
+ * @version $Id: InitableByConstraintMap.java,v 1.4 2001/07/13 19:20:59 jvanzyl Exp $
*/
public interface InitableByConstraintMap
{
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java
Index: IntegerValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IntegerValidator.java 2001/07/13 16:52:09 1.3
+++ IntegerValidator.java 2001/07/13 19:21:01 1.4
@@ -56,7 +56,7 @@
import java.util.Map;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Validates numbers with the following constraints in addition to those
@@ -73,7 +73,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: IntegerValidator.java,v 1.3 2001/07/13 16:52:09 jvanzyl Exp $
+ * @version $Id: IntegerValidator.java,v 1.4 2001/07/13 19:21:01 jvanzyl Exp $
*/
public class IntegerValidator
extends NumberValidator
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java
Index: NumberKeyValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NumberKeyValidator.java 2001/07/13 16:52:18 1.4
+++ NumberKeyValidator.java 2001/07/13 19:21:02 1.5
@@ -58,7 +58,7 @@
import java.util.Map;
import org.apache.turbine.services.db.om.NumberKey;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Validates numbers with the following constraints in addition to those
@@ -75,7 +75,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberKeyValidator.java,v 1.4 2001/07/13 16:52:18 jvanzyl Exp $
+ * @version $Id: NumberKeyValidator.java,v 1.5 2001/07/13 19:21:02 jvanzyl Exp $
*/
public class NumberKeyValidator
extends NumberValidator
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java
Index: NumberValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NumberValidator.java 2001/07/13 16:52:24 1.4
+++ NumberValidator.java 2001/07/13 19:21:03 1.5
@@ -58,7 +58,7 @@
import java.util.Map;
import org.apache.turbine.services.db.om.NumberKey;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Validates numbers with the following constraints in addition to those
@@ -75,7 +75,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberValidator.java,v 1.4 2001/07/13 16:52:24 jvanzyl Exp $
+ * @version $Id: NumberValidator.java,v 1.5 2001/07/13 19:21:03 jvanzyl Exp $
*/
public class NumberValidator
extends DefaultValidator
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/Validator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Validator.java 2001/07/13 16:52:27 1.4
+++ Validator.java 2001/07/13 19:21:04 1.5
@@ -55,13 +55,13 @@
*/
import java.util.Map;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* Validator api.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: Validator.java,v 1.4 2001/07/13 16:52:27 jvanzyl Exp $
+ * @version $Id: Validator.java,v 1.5 2001/07/13 19:21:04 jvanzyl Exp $
*/
public interface Validator
{
1.5 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/jsp/JspService.java
Index: JspService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/JspService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JspService.java 2001/07/10 01:04:15 1.4
+++ JspService.java 2001/07/13 19:21:16 1.5
@@ -56,7 +56,7 @@
import org.apache.turbine.services.Service;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/pool/PoolService.java
Index: PoolService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pool/PoolService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PoolService.java 2001/04/08 16:41:08 1.5
+++ PoolService.java 2001/07/13 19:21:20 1.6
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
import org.apache.turbine.services.factory.FactoryService;
@@ -71,7 +71,7 @@
* a dispose method, when they are returned to the pool.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: PoolService.java,v 1.5 2001/04/08 16:41:08 ilkka Exp $
+ * @version $Id: PoolService.java,v 1.6 2001/07/13 19:21:20 jvanzyl Exp $
*/
public interface PoolService extends FactoryService
{
1.3 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/pool/TurbinePool.java
Index: TurbinePool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pool/TurbinePool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbinePool.java 2001/04/01 17:12:42 1.2
+++ TurbinePool.java 2001/07/13 19:21:22 1.3
@@ -54,14 +54,14 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.TurbineServices;
/**
* This is a static accessor to common pooling tasks.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbinePool.java,v 1.2 2001/04/01 17:12:42 ilkka Exp $
+ * @version $Id: TurbinePool.java,v 1.3 2001/07/13 19:21:22 jvanzyl Exp $
*/
public abstract class TurbinePool
{
1.13 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/pool/TurbinePoolService.java
Index: TurbinePoolService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pool/TurbinePoolService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TurbinePoolService.java 2001/06/14 14:41:59 1.12
+++ TurbinePoolService.java 2001/07/13 19:21:23 1.13
@@ -59,7 +59,7 @@
import java.util.Iterator;
import java.lang.reflect.Method;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.pool.Recyclable;
import org.apache.turbine.util.pool.ArrayCtorRecyclable;
import org.apache.turbine.util.pool.BoundedBuffer;
@@ -82,7 +82,7 @@
* a dispose method, when they are returned to the pool.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbinePoolService.java,v 1.12 2001/06/14 14:41:59 jvanzyl Exp $
+ * @version $Id: TurbinePoolService.java,v 1.13 2001/07/13 19:21:23 jvanzyl Exp $
*/
public class TurbinePoolService
extends TurbineFactoryService
1.2 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/pool/util/InitableRecyclable.java
Index: InitableRecyclable.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pool/util/InitableRecyclable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InitableRecyclable.java 2001/06/20 18:02:37 1.1
+++ InitableRecyclable.java 2001/07/13 19:21:29 1.2
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
@@ -65,7 +65,7 @@
* introspection/reflection when pooling an object.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: InitableRecyclable.java,v 1.1 2001/06/20 18:02:37 jvanzyl Exp $
+ * @version $Id: InitableRecyclable.java,v 1.2 2001/07/13 19:21:29 jvanzyl Exp $
*/
public interface InitableRecyclable extends Recyclable
{
1.33 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/resources/TurbineResourceService.java
Index: TurbineResourceService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/resources/TurbineResourceService.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TurbineResourceService.java 2001/06/14 14:42:26 1.32
+++ TurbineResourceService.java 2001/07/13 19:21:33 1.33
@@ -64,7 +64,7 @@
import org.apache.turbine.services.ServiceBroker;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* <p>This implementation of the <code>resourcesService</code> relies
@@ -87,7 +87,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com@">Jason van Zyl</a>
- * @version $Id: TurbineResourceService.java,v 1.32 2001/06/14 14:42:26 jvanzyl Exp $
+ * @version $Id: TurbineResourceService.java,v 1.33 2001/07/13 19:21:33 jvanzyl Exp $
*/
public class TurbineResourceService
extends BaseService
1.4 +2 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RunDataService.java 2001/07/10 01:04:31 1.3
+++ RunDataService.java 2001/07/13 19:21:37 1.4
@@ -59,7 +59,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.Service;
/**
@@ -70,7 +70,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.3 2001/07/10 01:04:31 jvanzyl Exp $
+ * @version $Id: RunDataService.java,v 1.4 2001/07/13 19:21:37 jvanzyl Exp $
*/
public interface RunDataService
extends Service
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineRunDataService.java 2001/07/13 16:53:16 1.6
+++ TurbineRunDataService.java 2001/07/13 19:21:38 1.7
@@ -66,7 +66,7 @@
import org.apache.turbine.ParameterParser;
import org.apache.turbine.util.parser.CookieParser;
import org.apache.turbine.util.ServerData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
@@ -80,7 +80,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineRunDataService.java,v 1.6 2001/07/13 16:53:16 jvanzyl Exp $
+ * @version $Id: TurbineRunDataService.java,v 1.7 2001/07/13 19:21:38 jvanzyl Exp $
*/
public class TurbineRunDataService
extends BaseService
1.10 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
Index: BaseTemplateEngineService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BaseTemplateEngineService.java 2001/07/12 20:23:49 1.9
+++ BaseTemplateEngineService.java 2001/07/13 19:21:43 1.10
@@ -60,7 +60,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
import org.apache.turbine.services.BaseService;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* The base implementation of Turbine {@link
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: BaseTemplateEngineService.java,v 1.9 2001/07/12 20:23:49 jvanzyl Exp $
+ * @version $Id: BaseTemplateEngineService.java,v 1.10 2001/07/13 19:21:43 jvanzyl Exp $
*/
public abstract class BaseTemplateEngineService
extends BaseService
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateEngineService.java
Index: TemplateEngineService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateEngineService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TemplateEngineService.java 2001/07/10 01:04:36 1.5
+++ TemplateEngineService.java 2001/07/13 19:21:45 1.6
@@ -57,7 +57,7 @@
import java.io.OutputStream;
import java.util.Hashtable;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.TemplateContext;
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TemplateEngineService.java,v 1.5 2001/07/10 01:04:36 jvanzyl Exp $ */
+ * @version $Id: TemplateEngineService.java,v 1.6 2001/07/13 19:21:45 jvanzyl Exp $ */
public interface TemplateEngineService
{
public static final String TEMPLATE_EXTENSIONS = "template.extension";
1.17 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java
Index: TemplateService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TemplateService.java 2001/07/12 20:23:50 1.16
+++ TemplateService.java 2001/07/13 19:21:47 1.17
@@ -56,7 +56,7 @@
import java.io.OutputStream;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.Service;
import org.apache.turbine.TemplateContext;
@@ -72,7 +72,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TemplateService.java,v 1.16 2001/07/12 20:23:50 jvanzyl Exp $
+ * @version $Id: TemplateService.java,v 1.17 2001/07/13 19:21:47 jvanzyl Exp $
*/
public interface TemplateService
extends Service
1.10 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplate.java
Index: TurbineTemplate.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineTemplate.java 2001/07/12 20:23:51 1.9
+++ TurbineTemplate.java 2001/07/13 19:21:49 1.10
@@ -56,7 +56,7 @@
import java.io.OutputStream;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.TemplateContext;
@@ -66,7 +66,7 @@
* getting a Screen that is associated with a screen template.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: TurbineTemplate.java,v 1.9 2001/07/12 20:23:51 jvanzyl Exp $
+ * @version $Id: TurbineTemplate.java,v 1.10 2001/07/13 19:21:49 jvanzyl Exp $
*/
public abstract class TurbineTemplate
{
1.49 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- TurbineTemplateService.java 2001/07/12 20:23:52 1.48
+++ TurbineTemplateService.java 2001/07/13 19:21:51 1.49
@@ -60,7 +60,7 @@
import java.util.Hashtable;
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.pull.TurbinePull;
@@ -105,7 +105,7 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineTemplateService.java,v 1.48 2001/07/12 20:23:52 jvanzyl Exp $
+ * @version $Id: TurbineTemplateService.java,v 1.49 2001/07/13 19:21:51 jvanzyl Exp $
*/
public class TurbineTemplateService
extends BaseService
1.7 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java
Index: BaseUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseUploadService.java 2001/06/30 13:07:28 1.6
+++ BaseUploadService.java 2001/07/13 19:21:59 1.7
@@ -59,7 +59,7 @@
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.ParameterParser;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* <p> This class is a base implementation of
@@ -68,7 +68,7 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: BaseUploadService.java,v 1.6 2001/06/30 13:07:28 jvanzyl Exp $
+ * @version $Id: BaseUploadService.java,v 1.7 2001/07/13 19:21:59 jvanzyl Exp $
*/
public abstract class BaseUploadService
extends BaseService
1.16 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java
Index: TurbineUpload.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUpload.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineUpload.java 2001/07/12 23:42:56 1.15
+++ TurbineUpload.java 2001/07/13 19:22:01 1.16
@@ -58,7 +58,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.InstantiationException;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* <p> This is a facade class for {@link UploadService}.
@@ -70,7 +70,7 @@
* the service's properties and default values for them.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: TurbineUpload.java,v 1.15 2001/07/12 23:42:56 jvanzyl Exp $
+ * @version $Id: TurbineUpload.java,v 1.16 2001/07/13 19:22:01 jvanzyl Exp $
*/
public abstract class TurbineUpload
{
1.21 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Index: TurbineUploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TurbineUploadService.java 2001/07/13 16:53:39 1.20
+++ TurbineUploadService.java 2001/07/13 19:22:03 1.21
@@ -66,7 +66,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.turbine.services.BaseService;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* <p> This class is an implementation of {@link UploadService}.
@@ -87,7 +87,7 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: TurbineUploadService.java,v 1.20 2001/07/13 16:53:39 jvanzyl Exp $
+ * @version $Id: TurbineUploadService.java,v 1.21 2001/07/13 19:22:03 jvanzyl Exp $
*/
public class TurbineUploadService
extends BaseUploadService
1.16 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java
Index: UploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- UploadService.java 2001/07/12 23:42:57 1.15
+++ UploadService.java 2001/07/13 19:22:04 1.16
@@ -57,7 +57,7 @@
import java.util.ArrayList;
import org.apache.turbine.services.Service;
import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* <p> This service handles parsing <code>multipart/form-data</code>
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: UploadService.java,v 1.15 2001/07/12 23:42:57 jvanzyl Exp $
+ * @version $Id: UploadService.java,v 1.16 2001/07/13 19:22:04 jvanzyl Exp $
*/
public interface UploadService
extends Service
1.52 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- TurbineVelocityService.java 2001/07/10 01:04:40 1.51
+++ TurbineVelocityService.java 2001/07/13 19:22:10 1.52
@@ -68,7 +68,7 @@
import org.apache.turbine.util.ContentURI;
import org.apache.turbine.RunData;
import org.apache.turbine.util.StringUtils;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.turbine.util.template.TemplateLink;
import org.apache.turbine.util.template.TemplatePageAttributes;
import org.apache.turbine.services.InitializationException;
@@ -93,7 +93,7 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:sean@informage.ent">Sean Legassick</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineVelocityService.java,v 1.51 2001/07/10 01:04:40 jvanzyl Exp $
+ * @version $Id: TurbineVelocityService.java,v 1.52 2001/07/13 19:22:10 jvanzyl Exp $
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
1.15 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java
Index: VelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- VelocityService.java 2001/07/10 01:04:40 1.14
+++ VelocityService.java 2001/07/13 19:22:12 1.15
@@ -57,7 +57,7 @@
import java.io.OutputStream;
import org.apache.turbine.services.Service;
import org.apache.turbine.RunData;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
@@ -67,7 +67,7 @@
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: VelocityService.java,v 1.14 2001/07/10 01:04:40 jvanzyl Exp $
+ * @version $Id: VelocityService.java,v 1.15 2001/07/13 19:22:12 jvanzyl Exp $
*/
public interface VelocityService extends Service
{
1.11 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpc.java
Index: TurbineXmlRpc.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpc.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineXmlRpc.java 2001/06/08 02:46:32 1.10
+++ TurbineXmlRpc.java 2001/07/13 19:22:17 1.11
@@ -62,7 +62,7 @@
import org.apache.turbine.services.Service;
import org.apache.turbine.services.ServiceBroker;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* This is a static accesor class for {@link XmlRpcService}.
1.29 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- TurbineXmlRpcService.java 2001/07/13 00:29:01 1.28
+++ TurbineXmlRpcService.java 2001/07/13 19:22:18 1.29
@@ -73,7 +73,7 @@
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.ServiceBroker;
import org.apache.turbine.services.xmlrpc.util.FileTransfer;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
import org.apache.velocity.runtime.configuration.Configuration;
@@ -97,7 +97,7 @@
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineXmlRpcService.java,v 1.28 2001/07/13 00:29:01 jvanzyl Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.29 2001/07/13 19:22:18 jvanzyl Exp $
*/
public class TurbineXmlRpcService
extends BaseService
1.14 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/XmlRpcService.java
Index: XmlRpcService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/XmlRpcService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XmlRpcService.java 2001/06/08 02:46:36 1.13
+++ XmlRpcService.java 2001/07/13 19:22:20 1.14
@@ -60,7 +60,7 @@
import java.io.InputStream;
import java.net.URL;
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.TurbineException;
+import org.apache.turbine.TurbineException;
/**
* The interface an XmlRpcService implements.
@@ -69,7 +69,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: XmlRpcService.java,v 1.13 2001/06/08 02:46:36 thorhauer Exp $
+ * @version $Id: XmlRpcService.java,v 1.14 2001/07/13 19:22:20 jvanzyl Exp $
*/
public interface XmlRpcService
extends Service
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org