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/06/25 07:01:18 UTC

cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/intake/validator DefaultValidator.java NumberKeyValidator.java NumberValidator.java

jvanzyl     01/06/24 22:01:18

  Modified:    src/java/org/apache/turbine/services/intake IntakeTool.java
               src/java/org/apache/turbine/services/intake/model
                        ComboKeyField.java Field.java Group.java
                        NumberKeyField.java
               src/java/org/apache/turbine/services/intake/validator
                        DefaultValidator.java NumberKeyValidator.java
                        NumberValidator.java
  Log:
  - updating to reflect the change in torque/om classes.
  
  Revision  Changes    Path
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- IntakeTool.java	2001/05/17 00:58:45	1.14
  +++ IntakeTool.java	2001/06/25 05:01:07	1.15
  @@ -60,7 +60,7 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  -import org.apache.turbine.om.Retrievable;
  +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.util.Log;
  @@ -73,7 +73,7 @@
    * 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.14 2001/05/17 00:58:45 jmcnally Exp $
  + * @version $Id: IntakeTool.java,v 1.15 2001/06/25 05:01:07 jvanzyl Exp $
    */
   public class IntakeTool 
       implements ApplicationTool, Recyclable
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ComboKeyField.java	2001/05/18 19:35:42	1.4
  +++ ComboKeyField.java	2001/06/25 05:01:09	1.5
  @@ -55,8 +55,8 @@
    */
   
   import java.util.Vector;
  -import org.apache.turbine.om.ComboKey;
  -import org.apache.turbine.om.ObjectKey;
  +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.util.ParameterParser;
  
  
  
  1.19      +2 -2      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Field.java	2001/06/24 18:06:27	1.18
  +++ Field.java	2001/06/25 05:01:10	1.19
  @@ -57,7 +57,7 @@
   import java.util.Map;
   import java.lang.reflect.Method;
   import org.apache.regexp.RE;
  -import org.apache.turbine.om.Retrievable;
  +import org.apache.turbine.services.db.om.Retrievable;
   import org.apache.turbine.services.intake.TurbineIntake;
   import org.apache.turbine.services.intake.xmlmodel.Rule;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
  @@ -75,7 +75,7 @@
    * Base class for Intake generated input processing classes.
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: Field.java,v 1.18 2001/06/24 18:06:27 jmcnally Exp $
  + * @version $Id: Field.java,v 1.19 2001/06/25 05:01:10 jvanzyl Exp $
    */
   public abstract class Field
   {
  
  
  
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Group.java	2001/06/19 16:03:57	1.15
  +++ Group.java	2001/06/25 05:01:11	1.16
  @@ -60,7 +60,7 @@
   import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import org.apache.turbine.om.Retrievable;
  +import org.apache.turbine.services.db.om.Retrievable;
   import org.apache.turbine.services.intake.TurbineIntake;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
  
  
  
  1.6       +2 -2      jakarta-turbine/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java
  
  Index: NumberKeyField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/NumberKeyField.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NumberKeyField.java	2001/05/18 19:35:44	1.5
  +++ NumberKeyField.java	2001/06/25 05:01:11	1.6
  @@ -55,8 +55,8 @@
    */
   
   import java.util.Vector;
  -import org.apache.turbine.om.NumberKey;
  -import org.apache.turbine.om.ObjectKey;
  +import org.apache.turbine.services.db.om.NumberKey;
  +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.util.ParameterParser;
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultValidator.java	2001/06/18 23:35:46	1.4
  +++ DefaultValidator.java	2001/06/25 05:01:16	1.5
  @@ -57,7 +57,7 @@
   import java.lang.reflect.Method;
   import java.util.Map;
   import org.apache.regexp.RE;
  -import org.apache.turbine.om.Retrievable;
  +import org.apache.turbine.services.db.om.Retrievable;
   import org.apache.turbine.services.intake.TurbineIntake;
   import org.apache.turbine.services.intake.xmlmodel.Rule;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
  @@ -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: DefaultValidator.java,v 1.4 2001/06/18 23:35:46 jmcnally Exp $
  + * @version $Id: DefaultValidator.java,v 1.5 2001/06/25 05:01:16 jvanzyl Exp $
    */
   public class DefaultValidator
       implements Validator, InitableByConstraintMap
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NumberKeyValidator.java	2001/06/18 23:35:46	1.2
  +++ NumberKeyValidator.java	2001/06/25 05:01:16	1.3
  @@ -57,7 +57,7 @@
   import java.math.BigDecimal;
   import java.util.Map;
   
  -import org.apache.turbine.om.NumberKey;
  +import org.apache.turbine.services.db.om.NumberKey;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.TurbineException;
   
  @@ -76,7 +76,7 @@
    * </table>
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: NumberKeyValidator.java,v 1.2 2001/06/18 23:35:46 jmcnally Exp $
  + * @version $Id: NumberKeyValidator.java,v 1.3 2001/06/25 05:01:16 jvanzyl Exp $
    */
   public class NumberKeyValidator
       extends NumberValidator
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NumberValidator.java	2001/06/18 23:35:47	1.2
  +++ NumberValidator.java	2001/06/25 05:01:17	1.3
  @@ -57,7 +57,7 @@
   import java.math.BigDecimal;
   import java.util.Map;
   
  -import org.apache.turbine.om.NumberKey;
  +import org.apache.turbine.services.db.om.NumberKey;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.TurbineException;
   
  @@ -76,7 +76,7 @@
    * </table>
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: NumberValidator.java,v 1.2 2001/06/18 23:35:47 jmcnally Exp $
  + * @version $Id: NumberValidator.java,v 1.3 2001/06/25 05:01:17 jvanzyl Exp $
    */
   public class NumberValidator
       extends DefaultValidator
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org