You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/08/02 07:59:41 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/util/parser BaseValueParser.java ValueParser.java
jon 01/08/01 22:59:41
Modified: src/java/org/apache/turbine/om OMTool.java
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 FileValidator.java
NumberKeyValidator.java NumberValidator.java
src/java/org/apache/turbine/util/parser BaseValueParser.java
ValueParser.java
Log:
fixed a bunch of compile errors
Revision Changes Path
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OMTool.java 2001/08/01 15:44:23 1.9
+++ OMTool.java 2001/08/02 05:59:41 1.10
@@ -64,13 +64,13 @@
import org.apache.turbine.TurbineException;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.fulcrum.pool.Recyclable;
-import org.apache.turbine.services.db.om.RetrieverFactory;
+import org.apache.torque.om.RetrieverFactory;
/**
* 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.9 2001/08/01 15:44:23 jvanzyl Exp $
+ * @version $Id: OMTool.java,v 1.10 2001/08/02 05:59:41 jon Exp $
*/
public class OMTool
implements ApplicationTool, Recyclable
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- IntakeTool.java 2001/08/01 15:34:16 1.21
+++ IntakeTool.java 2001/08/02 05:59:41 1.22
@@ -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.torque.om.Retrievable;
import org.apache.turbine.services.intake.model.Group;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.fulcrum.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.21 2001/08/01 15:34:16 jvanzyl Exp $
+ * @version $Id: IntakeTool.java,v 1.22 2001/08/02 05:59:41 jon Exp $
*/
public class IntakeTool
implements ApplicationTool, Recyclable
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ComboKeyField.java 2001/08/01 15:34:16 1.12
+++ ComboKeyField.java 2001/08/02 05:59:41 1.13
@@ -56,8 +56,8 @@
import java.util.Vector;
import org.apache.turbine.ParameterParser;
-import org.apache.turbine.services.db.om.ComboKey;
-import org.apache.turbine.services.db.om.ObjectKey;
+import org.apache.torque.om.ComboKey;
+import org.apache.torque.om.ObjectKey;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.fulcrum.Log;
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Field.java 2001/08/01 15:34:16 1.25
+++ Field.java 2001/08/02 05:59:41 1.26
@@ -59,7 +59,7 @@
import org.apache.regexp.RE;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.RunData;
-import org.apache.turbine.services.db.om.Retrievable;
+import org.apache.torque.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.25 2001/08/01 15:34:16 jvanzyl Exp $
+ * @version $Id: Field.java,v 1.26 2001/08/02 05:59:41 jon Exp $
*/
public abstract class Field
{
1.23 +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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Group.java 2001/08/01 15:34:16 1.22
+++ Group.java 2001/08/02 05:59:41 1.23
@@ -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.torque.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.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NumberKeyField.java 2001/07/13 16:51:09 1.7
+++ NumberKeyField.java 2001/08/02 05:59:41 1.8
@@ -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.torque.om.NumberKey;
+import org.apache.torque.om.ObjectKey;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.ParameterParser;
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultValidator.java 2001/08/01 15:34:17 1.11
+++ DefaultValidator.java 2001/08/02 05:59:41 1.12
@@ -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.torque.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.11 2001/08/01 15:34:17 jvanzyl Exp $
+ * @version $Id: DefaultValidator.java,v 1.12 2001/08/02 05:59:41 jon Exp $
*/
public class DefaultValidator
implements Validator, InitableByConstraintMap
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileValidator.java 2001/08/01 15:34:17 1.8
+++ FileValidator.java 2001/08/02 05:59:41 1.9
@@ -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.torque.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: FileValidator.java,v 1.8 2001/08/01 15:34:17 jvanzyl Exp $
+ * @version $Id: FileValidator.java,v 1.9 2001/08/02 05:59:41 jon Exp $
*/
public class FileValidator
implements Validator, InitableByConstraintMap
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NumberKeyValidator.java 2001/08/01 15:34:17 1.8
+++ NumberKeyValidator.java 2001/08/02 05:59:41 1.9
@@ -56,7 +56,7 @@
import java.math.BigDecimal;
import java.util.Map;
-import org.apache.turbine.services.db.om.NumberKey;
+import org.apache.torque.om.NumberKey;
import org.apache.fulcrum.Log;
import org.apache.fulcrum.ServiceException;
@@ -75,7 +75,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberKeyValidator.java,v 1.8 2001/08/01 15:34:17 jvanzyl Exp $
+ * @version $Id: NumberKeyValidator.java,v 1.9 2001/08/02 05:59:41 jon Exp $
*/
public class NumberKeyValidator
extends NumberValidator
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NumberValidator.java 2001/08/01 15:34:17 1.8
+++ NumberValidator.java 2001/08/02 05:59:41 1.9
@@ -56,7 +56,7 @@
import java.math.BigDecimal;
import java.util.Map;
-import org.apache.turbine.services.db.om.NumberKey;
+import org.apache.torque.om.NumberKey;
import org.apache.fulcrum.Log;
import org.apache.fulcrum.ServiceException;
@@ -75,7 +75,7 @@
* </table>
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: NumberValidator.java,v 1.8 2001/08/01 15:34:17 jvanzyl Exp $
+ * @version $Id: NumberValidator.java,v 1.9 2001/08/02 05:59:41 jon Exp $
*/
public class NumberValidator
extends DefaultValidator
1.23 +3 -3 jakarta-turbine/src/java/org/apache/turbine/util/parser/BaseValueParser.java
Index: BaseValueParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/BaseValueParser.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BaseValueParser.java 2001/08/01 15:44:25 1.22
+++ BaseValueParser.java 2001/08/02 05:59:41 1.23
@@ -68,8 +68,8 @@
import java.util.GregorianCalendar;
import java.util.Hashtable;
import org.apache.turbine.Turbine;
-import org.apache.turbine.services.db.om.NumberKey;
-import org.apache.turbine.services.db.om.StringKey;
+import org.apache.torque.om.NumberKey;
+import org.apache.torque.om.StringKey;
import org.apache.fulcrum.pool.Recyclable;
import org.apache.fulcrum.pool.RecyclableSupport;
import org.apache.turbine.util.StringUtils;
@@ -100,7 +100,7 @@
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: BaseValueParser.java,v 1.22 2001/08/01 15:44:25 jvanzyl Exp $
+ * @version $Id: BaseValueParser.java,v 1.23 2001/08/02 05:59:41 jon Exp $
*/
public class BaseValueParser
extends RecyclableSupport
1.5 +3 -3 jakarta-turbine/src/java/org/apache/turbine/util/parser/ValueParser.java
Index: ValueParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/ValueParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValueParser.java 2001/07/30 20:39:22 1.4
+++ ValueParser.java 2001/08/02 05:59:41 1.5
@@ -60,8 +60,8 @@
import java.util.Date;
import java.util.Enumeration;
//!! why are these here? jvz.
-import org.apache.turbine.services.db.om.NumberKey;
-import org.apache.turbine.services.db.om.StringKey;
+import org.apache.torque.om.NumberKey;
+import org.apache.torque.om.StringKey;
/**
* ValueParser is a base interface for classes that need to parse
@@ -78,7 +78,7 @@
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: ValueParser.java,v 1.4 2001/07/30 20:39:22 jvanzyl Exp $
+ * @version $Id: ValueParser.java,v 1.5 2001/08/02 05:59:41 jon Exp $
*/
public interface ValueParser
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org