You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2001/08/03 09:12:16 UTC

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

mpoeschl    01/08/03 00:12:16

  Modified:    src/java/org/apache/turbine/services/intake Tag:
                        T_2_1_BRANCH IntakeTool.java
               src/java/org/apache/turbine/services/intake/model Tag:
                        T_2_1_BRANCH ComboKeyField.java Field.java
                        Group.java NumberKeyField.java
               src/java/org/apache/turbine/services/intake/validator Tag:
                        T_2_1_BRANCH DefaultValidator.java
                        NumberKeyValidator.java NumberValidator.java
  Log:
  fix imports
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.12.4.8  +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.12.4.7
  retrieving revision 1.12.4.8
  diff -u -r1.12.4.7 -r1.12.4.8
  --- IntakeTool.java	2001/08/02 00:26:22	1.12.4.7
  +++ IntakeTool.java	2001/08/03 07:12:15	1.12.4.8
  @@ -60,7 +60,7 @@
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  -import org.apache.turbine.services.db.om.Retrievable;
  +import org.apache.turbine.om.Retrievable;
   import org.apache.turbine.services.intake.model.Group;
   import org.apache.turbine.services.pull.ApplicationTool;
   import org.apache.turbine.util.Log;
  @@ -72,7 +72,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.12.4.7 2001/08/02 00:26:22 mpoeschl Exp $
  + * @version $Id: IntakeTool.java,v 1.12.4.8 2001/08/03 07:12:15 mpoeschl Exp $
    */
   public class IntakeTool
       implements ApplicationTool, Recyclable
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.4.4   +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.2.4.3
  retrieving revision 1.2.4.4
  diff -u -r1.2.4.3 -r1.2.4.4
  --- ComboKeyField.java	2001/08/02 00:26:22	1.2.4.3
  +++ ComboKeyField.java	2001/08/03 07:12:15	1.2.4.4
  @@ -56,8 +56,8 @@
   
   import java.util.Vector;
   import org.apache.turbine.util.ParameterParser;
  -import org.apache.turbine.services.db.om.ComboKey;
  -import org.apache.turbine.services.db.om.ObjectKey;
  +import org.apache.turbine.om.ComboKey;
  +import org.apache.turbine.om.ObjectKey;
   import org.apache.turbine.services.intake.xmlmodel.Rule;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   import org.apache.turbine.util.Log;
  
  
  
  1.10.4.8  +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.10.4.7
  retrieving revision 1.10.4.8
  diff -u -r1.10.4.7 -r1.10.4.8
  --- Field.java	2001/08/02 00:26:22	1.10.4.7
  +++ Field.java	2001/08/03 07:12:15	1.10.4.8
  @@ -59,7 +59,7 @@
   import org.apache.regexp.RE;
   import org.apache.turbine.util.ParameterParser;
   import org.apache.turbine.util.RunData;
  -import org.apache.turbine.services.db.om.Retrievable;
  +import org.apache.turbine.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;
  @@ -74,7 +74,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.10.4.7 2001/08/02 00:26:22 mpoeschl Exp $
  + * @version $Id: Field.java,v 1.10.4.8 2001/08/03 07:12:15 mpoeschl Exp $
    */
   public abstract class Field
   {
  
  
  
  1.12.4.3  +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.12.4.2
  retrieving revision 1.12.4.3
  diff -u -r1.12.4.2 -r1.12.4.3
  --- Group.java	2001/08/02 00:26:22	1.12.4.2
  +++ Group.java	2001/08/03 07:12:15	1.12.4.3
  @@ -60,7 +60,7 @@
   import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import org.apache.turbine.services.db.om.Retrievable;
  +import org.apache.turbine.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.3.4.4   +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.3.4.3
  retrieving revision 1.3.4.4
  diff -u -r1.3.4.3 -r1.3.4.4
  --- NumberKeyField.java	2001/08/02 00:26:22	1.3.4.3
  +++ NumberKeyField.java	2001/08/03 07:12:15	1.3.4.4
  @@ -55,8 +55,8 @@
    */
   
   import java.util.Vector;
  -import org.apache.turbine.services.db.om.NumberKey;
  -import org.apache.turbine.services.db.om.ObjectKey;
  +import org.apache.turbine.om.NumberKey;
  +import org.apache.turbine.om.ObjectKey;
   import org.apache.turbine.services.intake.xmlmodel.Rule;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   import org.apache.turbine.util.ParameterParser;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.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.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- DefaultValidator.java	2001/08/02 00:26:23	1.1.2.4
  +++ DefaultValidator.java	2001/08/03 07:12:16	1.1.2.5
  @@ -57,7 +57,7 @@
   import java.lang.reflect.Method;
   import java.util.Map;
   import org.apache.regexp.RE;
  -import org.apache.turbine.services.db.om.Retrievable;
  +import org.apache.turbine.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;
  @@ -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.1.2.4 2001/08/02 00:26:23 mpoeschl Exp $
  + * @version $Id: DefaultValidator.java,v 1.1.2.5 2001/08/03 07:12:16 mpoeschl Exp $
    */
   public class DefaultValidator
       implements Validator, InitableByConstraintMap
  
  
  
  1.1.2.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.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- NumberKeyValidator.java	2001/08/02 00:26:23	1.1.2.2
  +++ NumberKeyValidator.java	2001/08/03 07:12:16	1.1.2.3
  @@ -56,7 +56,7 @@
   
   import java.math.BigDecimal;
   import java.util.Map;
  -import org.apache.turbine.services.db.om.NumberKey;
  +import org.apache.turbine.om.NumberKey;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.TurbineException;
   
  @@ -75,7 +75,7 @@
    * </table>
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: NumberKeyValidator.java,v 1.1.2.2 2001/08/02 00:26:23 mpoeschl Exp $
  + * @version $Id: NumberKeyValidator.java,v 1.1.2.3 2001/08/03 07:12:16 mpoeschl Exp $
    */
   public class NumberKeyValidator
       extends NumberValidator
  
  
  
  1.1.2.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.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- NumberValidator.java	2001/08/02 00:26:23	1.1.2.2
  +++ NumberValidator.java	2001/08/03 07:12:16	1.1.2.3
  @@ -56,7 +56,7 @@
   
   import java.math.BigDecimal;
   import java.util.Map;
  -import org.apache.turbine.services.db.om.NumberKey;
  +import org.apache.turbine.om.NumberKey;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.TurbineException;
   
  @@ -75,7 +75,7 @@
    * </table>
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: NumberValidator.java,v 1.1.2.2 2001/08/02 00:26:23 mpoeschl Exp $
  + * @version $Id: NumberValidator.java,v 1.1.2.3 2001/08/03 07:12:16 mpoeschl 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