jvanzyl 01/08/01 08:34:17
Modified: src/java/org/apache/turbine/services/intake
IntakeService.java IntakeTool.java
TurbineIntake.java TurbineIntakeService.java
src/java/org/apache/turbine/services/intake/model
BooleanField.java 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
Log:
- reflect changes in services
Revision Changes Path
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IntakeService.java 2001/07/14 19:36:30 1.12
+++ IntakeService.java 2001/08/01 15:34:16 1.13
@@ -55,9 +55,9 @@
*/
import java.lang.reflect.Method;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.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:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: IntakeService.java,v 1.12 2001/07/14 19:36:30 jvanzyl Exp $
+ * @version $Id: IntakeService.java,v 1.13 2001/08/01 15:34:16 jvanzyl Exp $
*/
public interface IntakeService
{
1.21 +3 -3
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- IntakeTool.java 2001/07/17 23:01:02 1.20
+++ IntakeTool.java 2001/08/01 15:34:16 1.21
@@ -63,16 +63,16 @@
import org.apache.turbine.services.db.om.Retrievable;
import org.apache.turbine.services.intake.model.Group;
import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.services.Log;
+import org.apache.fulcrum.Log;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.pool.Recyclable;
+import org.apache.fulcrum.pool.Recyclable;
/**
* A Pull tool to make intake objects available to a template
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: IntakeTool.java,v 1.20 2001/07/17 23:01:02 jvanzyl Exp $
+ * @version $Id: IntakeTool.java,v 1.21 2001/08/01 15:34:16 jvanzyl Exp $
*/
public class IntakeTool
implements ApplicationTool, Recyclable
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineIntake.java 2001/07/14 19:36:30 1.9
+++ TurbineIntake.java 2001/08/01 15:34:16 1.10
@@ -55,9 +55,9 @@
*/
import java.lang.reflect.Method;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.intake.model.Group;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.TurbineServices;
/**
* This is a Facade class for IntakeService.
@@ -67,7 +67,7 @@
* the settings in TurbineResources.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: TurbineIntake.java,v 1.9 2001/07/14 19:36:30 jvanzyl Exp $
+ * @version $Id: TurbineIntake.java,v 1.10 2001/08/01 15:34:16 jvanzyl Exp $
*/
public abstract class TurbineIntake
{
1.18 +6 -7
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurbineIntakeService.java 2001/07/14 19:36:30 1.17
+++ TurbineIntakeService.java 2001/08/01 15:34:16 1.18
@@ -71,24 +71,23 @@
import java.util.List;
import java.util.Map;
import org.apache.turbine.om.OMTool;
-import org.apache.turbine.services.BaseService;
-import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.intake.model.Group;
import org.apache.turbine.services.intake.transform.XmlToAppData;
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.services.ServiceException;
-import org.apache.turbine.services.pool.BoundedBuffer;
-import org.apache.turbine.services.pool.Recyclable;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.pool.BoundedBuffer;
+import org.apache.fulcrum.pool.Recyclable;
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.InitializationException;
-
/**
* This service provides access to input processing objects based
* on an XML specification.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: TurbineIntakeService.java,v 1.17 2001/07/14 19:36:30 jvanzyl Exp $
+ * @version $Id: TurbineIntakeService.java,v 1.18 2001/08/01 15:34:16 jvanzyl Exp $
*/
public class TurbineIntakeService
extends BaseService
1.9 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/BooleanField.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BooleanField.java 2001/07/17 23:01:03 1.8
+++ BooleanField.java 2001/08/01 15:34:16 1.9
@@ -55,14 +55,14 @@
*/
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.services.Log;
+import org.apache.fulcrum.Log;
import org.apache.turbine.ParameterParser;
/**
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: BooleanField.java,v 1.8 2001/07/17 23:01:03 jvanzyl Exp $
+ * @version $Id: BooleanField.java,v 1.9 2001/08/01 15:34:16 jvanzyl Exp $
*/
public class BooleanField extends Field
{
1.12 +3 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ComboKeyField.java 2001/07/30 23:14:04 1.11
+++ ComboKeyField.java 2001/08/01 15:34:16 1.12
@@ -56,13 +56,12 @@
import java.util.Vector;
import org.apache.turbine.ParameterParser;
-import org.apache.turbine.services.ServiceException;
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.services.Log;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.Log;
+//import org.apache.fulcrum.ServiceException;
/** */
public class ComboKeyField extends Field
@@ -95,7 +94,7 @@
setTestValue( new ComboKey(pp.getString(getKey())) );
}
}
- catch (ServiceException e)
+ catch (Exception e)
{
valid_flag = false;
Log.error(e);
1.25 +3 -3
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Field.java 2001/07/17 23:01:03 1.24
+++ Field.java 2001/08/01 15:34:16 1.25
@@ -59,7 +59,6 @@
import org.apache.regexp.RE;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
import org.apache.turbine.services.db.om.Retrievable;
import org.apache.turbine.services.intake.TurbineIntake;
import org.apache.turbine.services.intake.xmlmodel.Rule;
@@ -68,13 +67,14 @@
import org.apache.turbine.services.intake.validator.Validator;
import org.apache.turbine.services.intake.validator.InitableByConstraintMap;
import org.apache.turbine.services.intake.validator.ValidationException;
-import org.apache.turbine.services.Log;
+import org.apache.fulcrum.Log;
+import org.apache.fulcrum.ServiceException;
/**
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: Field.java,v 1.24 2001/07/17 23:01:03 jvanzyl Exp $
+ * @version $Id: Field.java,v 1.25 2001/08/01 15:34:16 jvanzyl Exp $
*/
public abstract class Field
{
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FieldFactory.java 2001/07/14 19:36:30 1.9
+++ FieldFactory.java 2001/08/01 15:34:16 1.10
@@ -57,13 +57,13 @@
import java.util.HashMap;
import java.util.Map;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
/**
* Creates Field objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: FieldFactory.java,v 1.9 2001/07/14 19:36:30 jvanzyl Exp $
+ * @version $Id: FieldFactory.java,v 1.10 2001/08/01 15:34:16 jvanzyl Exp $
*/
public abstract class FieldFactory
{
1.8 +2 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileItemField.java 2001/07/14 19:36:30 1.7
+++ FileItemField.java 2001/08/01 15:34:16 1.8
@@ -59,14 +59,13 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
import org.apache.turbine.services.intake.validator.Validator;
import org.apache.turbine.services.intake.validator.FileValidator;
// import org.apache.turbine.services.intake.validator.InitableByConstraintMap;
import org.apache.turbine.services.intake.validator.ValidationException;
import org.apache.turbine.services.intake.validator.Constraint;
-import org.apache.turbine.services.upload.FileItem;
-
+import org.apache.fulcrum.upload.FileItem;
+import org.apache.fulcrum.ServiceException;
/** */
public class FileItemField extends Field
1.22 +2 -2
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Group.java 2001/07/14 19:36:30 1.21
+++ Group.java 2001/08/01 15:34:16 1.22
@@ -66,8 +66,8 @@
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.pool.Recyclable;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.pool.Recyclable;
/** Holds a group of Fields */
public class Group
1.11 +3 -3
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultValidator.java 2001/07/17 23:01:04 1.10
+++ DefaultValidator.java 2001/08/01 15:34:17 1.11
@@ -62,10 +62,10 @@
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.services.Log;
+import org.apache.fulcrum.Log;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
/**
* 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:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: DefaultValidator.java,v 1.10 2001/07/17 23:01:04 jvanzyl Exp $
+ * @version $Id: DefaultValidator.java,v 1.11 2001/08/01 15:34:17 jvanzyl Exp $
*/
public class DefaultValidator
implements Validator, InitableByConstraintMap
1.8 +4 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileValidator.java 2001/07/17 23:01:04 1.7
+++ FileValidator.java 2001/08/01 15:34:17 1.8
@@ -62,11 +62,11 @@
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.services.Log;
+import org.apache.fulcrum.Log;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.ServiceException;
-import org.apache.turbine.services.upload.FileItem;
+import org.apache.fulcrum.ServiceException;
+import org.apache.fulcrum.upload.FileItem;
/**
* A validator that will compare a testValue against the following
@@ -82,7 +82,7 @@
* This validator can serve as the base class for more specific validators
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: FileValidator.java,v 1.7 2001/07/17 23:01:04 jvanzyl Exp $
+ * @version $Id: FileValidator.java,v 1.8 2001/08/01 15:34:17 jvanzyl Exp $
*/
public class FileValidator
implements Validator, InitableByConstraintMap
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InitableByConstraintMap.java 2001/07/14 19:36:31 1.5
+++ InitableByConstraintMap.java 2001/08/01 15:34:17 1.6
@@ -55,14 +55,14 @@
*/
import java.util.Map;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
/**
* This interface marks a bean/class that can have its properties set
* by values in a Map.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: InitableByConstraintMap.java,v 1.5 2001/07/14 19:36:31 jvanzyl Exp
$
+ * @version $Id: InitableByConstraintMap.java,v 1.6 2001/08/01 15:34:17 jvanzyl Exp
$
*/
public interface InitableByConstraintMap
{
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IntegerValidator.java 2001/07/17 23:01:04 1.6
+++ IntegerValidator.java 2001/08/01 15:34:17 1.7
@@ -55,8 +55,8 @@
*/
import java.util.Map;
-import org.apache.turbine.services.Log;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.Log;
+import org.apache.fulcrum.ServiceException;
/**
* Validates numbers with the following constraints in addition to those
@@ -73,7 +73,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: IntegerValidator.java,v 1.6 2001/07/17 23:01:04 jvanzyl Exp $
+ * @version $Id: IntegerValidator.java,v 1.7 2001/08/01 15:34:17 jvanzyl Exp $
*/
public class IntegerValidator
extends NumberValidator
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NumberKeyValidator.java 2001/07/17 23:01:05 1.7
+++ NumberKeyValidator.java 2001/08/01 15:34:17 1.8
@@ -57,8 +57,8 @@
import java.math.BigDecimal;
import java.util.Map;
import org.apache.turbine.services.db.om.NumberKey;
-import org.apache.turbine.services.Log;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.Log;
+import org.apache.fulcrum.ServiceException;
/**
* Validates numbers with the following constraints in addition to those
@@ -75,7 +75,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: NumberKeyValidator.java,v 1.7 2001/07/17 23:01:05 jvanzyl Exp $
+ * @version $Id: NumberKeyValidator.java,v 1.8 2001/08/01 15:34:17 jvanzyl Exp $
*/
public class NumberKeyValidator
extends NumberValidator
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NumberValidator.java 2001/07/17 23:01:05 1.7
+++ NumberValidator.java 2001/08/01 15:34:17 1.8
@@ -57,8 +57,8 @@
import java.math.BigDecimal;
import java.util.Map;
import org.apache.turbine.services.db.om.NumberKey;
-import org.apache.turbine.services.Log;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.Log;
+import org.apache.fulcrum.ServiceException;
/**
* Validates numbers with the following constraints in addition to those
@@ -75,7 +75,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: NumberValidator.java,v 1.7 2001/07/17 23:01:05 jvanzyl Exp $
+ * @version $Id: NumberValidator.java,v 1.8 2001/08/01 15:34:17 jvanzyl Exp $
*/
public class NumberValidator
extends DefaultValidator
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Validator.java 2001/07/14 19:36:31 1.6
+++ Validator.java 2001/08/01 15:34:17 1.7
@@ -55,13 +55,13 @@
*/
import java.util.Map;
-import org.apache.turbine.services.ServiceException;
+import org.apache.fulcrum.ServiceException;
/**
* Validator api.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: Validator.java,v 1.6 2001/07/14 19:36:31 jvanzyl Exp $
+ * @version $Id: Validator.java,v 1.7 2001/08/01 15:34:17 jvanzyl Exp $
*/
public interface Validator
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
