You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/10/14 14:17:26 UTC
cvs commit: jakarta-turbine-2 project.xml
epugh 2003/10/14 05:17:26
Modified: src/java/org/apache/turbine/services/intake/model
BooleanField.java BigDecimalField.java
IntegerField.java FloatField.java ShortField.java
Group.java DateStringField.java LongField.java
FileItemField.java DoubleField.java
FieldFactory.java Field.java StringField.java
src/java/org/apache/turbine/services/intake
IntakeService.java TurbineIntake.java
IntakeTool.java IntakeException.java package.html
TurbineIntakeService.java
src/java/org/apache/turbine/services/intake/xmlmodel
Rule.java AppData.java XmlField.java XmlGroup.java
src/java/org/apache/turbine/services/intake/transform
XmlToAppData.java DTDResolver.java
src/java/org/apache/turbine/services/intake/validator
BigDecimalValidator.java DefaultValidator.java
InitableByConstraintMap.java Constraint.java
NumberValidator.java Validator.java
BooleanValidator.java ShortValidator.java
LongValidator.java NumberKeyValidator.java
package.html StringValidator.java
FileValidator.java DoubleValidator.java
FloatValidator.java DateStringValidator.java
IntegerValidator.java InvalidMaskException.java
ValidationException.java
xdocs changes.xml
. project.xml
Added: conf/test intakeRoleConfiguration.xml intake.xml
TestIntake.properties
intakeComponentConfiguration.xml
src/test/org/apache/turbine/services/intake LoginForm.java
IntakeToolTest.java
Log:
Deprecate IntakeService in favor of Fulcrum Intake. Unit test to verify that the
IntakeTool continues to work as before.
Revision Changes Path
1.15 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BooleanField.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BooleanField.java 1 Oct 2003 06:11:15 -0000 1.14
+++ BooleanField.java 14 Oct 2003 12:17:24 -0000 1.15
@@ -64,6 +64,7 @@
/**
* Processor for boolean fields.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.11 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java
Index: BigDecimalField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BigDecimalField.java 18 Jul 2003 08:32:29 -0000 1.10
+++ BigDecimalField.java 14 Oct 2003 12:17:24 -0000 1.11
@@ -65,6 +65,7 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
/**
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
1.13 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java
Index: IntegerField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/IntegerField.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IntegerField.java 1 Oct 2003 06:11:15 -0000 1.12
+++ IntegerField.java 14 Oct 2003 12:17:24 -0000 1.13
@@ -61,6 +61,7 @@
import org.apache.turbine.services.intake.xmlmodel.XmlField;
/**
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.12 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java
Index: FloatField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FloatField.java 1 Oct 2003 06:11:15 -0000 1.11
+++ FloatField.java 14 Oct 2003 12:17:24 -0000 1.12
@@ -63,6 +63,7 @@
/**
* Creates Float Field objects.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:r.wekker@rubicon-bv.com>Ronald Wekker</a>
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ShortField.java
Index: ShortField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/ShortField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ShortField.java 1 Oct 2003 06:11:15 -0000 1.5
+++ ShortField.java 14 Oct 2003 12:17:24 -0000 1.6
@@ -63,6 +63,7 @@
/**
* Creates Short Field objects.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
1.10 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Group.java
Index: Group.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Group.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Group.java 15 Jul 2003 10:15:18 -0000 1.9
+++ Group.java 14 Oct 2003 12:17:24 -0000 1.10
@@ -77,6 +77,7 @@
/**
* Holds a group of Fields
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.10 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DateStringField.java
Index: DateStringField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DateStringField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DateStringField.java 18 Jul 2003 08:32:30 -0000 1.9
+++ DateStringField.java 14 Oct 2003 12:17:24 -0000 1.10
@@ -71,6 +71,7 @@
* is dependent on any rules that are defined, so this field will expect that
* any validator will be (or extend) DateStringValidator.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/LongField.java
Index: LongField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/LongField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LongField.java 1 Oct 2003 06:11:15 -0000 1.5
+++ LongField.java 14 Oct 2003 12:17:24 -0000 1.6
@@ -63,6 +63,7 @@
/**
* Creates Short Field objects.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
1.14 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FileItemField.java 18 Jul 2003 08:32:30 -0000 1.13
+++ FileItemField.java 14 Oct 2003 12:17:24 -0000 1.14
@@ -65,6 +65,7 @@
import org.apache.turbine.util.parser.ValueParser;
/**
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.10 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java
Index: DoubleField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DoubleField.java 1 Oct 2003 06:11:15 -0000 1.9
+++ DoubleField.java 14 Oct 2003 12:17:24 -0000 1.10
@@ -63,6 +63,7 @@
/**
* Creates Double Field objects.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
* @version $Id$
1.10 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FieldFactory.java
Index: FieldFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 11 Sep 2003 08:30:49 -0000 1.9
+++ FieldFactory.java 14 Oct 2003 12:17:24 -0000 1.10
@@ -63,6 +63,7 @@
/**
* Creates Field objects.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
1.22 +6 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 1 Oct 2003 06:11:15 -0000 1.21
+++ Field.java 14 Oct 2003 12:17:24 -0000 1.22
@@ -63,9 +63,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fulcrum.localization.Localization;
import org.apache.turbine.om.Retrievable;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.TurbineIntake;
import org.apache.turbine.services.intake.validator.DefaultValidator;
@@ -74,8 +74,7 @@
import org.apache.turbine.services.intake.validator.Validator;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.services.localization.Localization;
-import org.apache.turbine.services.localization.LocalizationService;
+
import org.apache.turbine.util.SystemError;
import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.parser.ValueParser;
@@ -83,6 +82,7 @@
/**
* Base class for Intake generated input processing classes.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:dlr@finemaltcoding.com>Daniel Rall</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
@@ -358,8 +358,8 @@
// If the parser is for a HTTP request, use the request it's
// associated with to grok the locale.
- if (TurbineServices.getInstance()
- .isRegistered(LocalizationService.SERVICE_NAME))
+
+ if (Localization.isInitialized())
{
if (pp instanceof ParameterParser)
{
1.11 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java
Index: StringField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StringField.java 18 Jul 2003 08:32:30 -0000 1.10
+++ StringField.java 14 Oct 2003 12:17:24 -0000 1.11
@@ -63,6 +63,7 @@
/**
* Text field.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.9 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeService.java
Index: IntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IntakeService.java 7 Apr 2003 15:34:52 -0000 1.8
+++ IntakeService.java 14 Oct 2003 12:17:24 -0000 1.9
@@ -72,6 +72,7 @@
* </pre></code></blockquote>
* </p>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntake.java
Index: TurbineIntake.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntake.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineIntake.java 7 Apr 2003 15:30:49 -0000 1.4
+++ TurbineIntake.java 14 Oct 2003 12:17:24 -0000 1.5
@@ -68,6 +68,7 @@
* implementation of the IntakeService used by the System, according to
* the settings in TurbineResources.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
1.19 +22 -18 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java
Index: IntakeTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- IntakeTool.java 14 Sep 2003 23:20:30 -0000 1.18
+++ IntakeTool.java 14 Oct 2003 12:17:24 -0000 1.19
@@ -61,21 +61,24 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fulcrum.intake.Intake;
+import org.apache.fulcrum.intake.IntakeException;
+import org.apache.fulcrum.intake.Retrievable;
+import org.apache.fulcrum.intake.model.Group;
-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.RunData;
-import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.parser.ValueParser;
import org.apache.turbine.util.pool.Recyclable;
/**
- * The main class through which Intake is accessed.
+ * The main class through which Intake is accessed. Provides easy access
+ * to the Fulcrum Intake component.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
+ * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class IntakeTool
@@ -108,7 +111,7 @@
*/
public IntakeTool()
{
- String[] groupNames = TurbineIntake.getGroupNames();
+ String[] groupNames = Intake.getGroupNames();
int groupCount = 0;
if (groupNames != null)
{
@@ -134,14 +137,14 @@
String[] groupNames = null;
if (groupKeys == null || groupKeys.length == 0)
{
- groupNames = TurbineIntake.getGroupNames();
+ groupNames = Intake.getGroupNames();
}
else
{
groupNames = new String[groupKeys.length];
for (int i = groupKeys.length - 1; i >= 0; i--)
{
- groupNames[i] = TurbineIntake.getGroupName(groupKeys[i]);
+ groupNames[i] = Intake.getGroupName(groupKeys[i]);
}
}
@@ -150,7 +153,7 @@
{
try
{
- List foundGroups = TurbineIntake.getGroup(groupNames[i])
+ List foundGroups = Intake.getGroup(groupNames[i])
.getObjects(pp);
if (foundGroups != null)
@@ -306,14 +309,14 @@
{
Group g = null;
- String inputKey = TurbineIntake.getGroupKey(groupName) + key;
+ String inputKey = Intake.getGroupKey(groupName) + key;
if (groups.containsKey(inputKey))
{
g = (Group) groups.get(inputKey);
}
else if (create)
{
- g = TurbineIntake.getGroup(groupName);
+ g = Intake.getGroup(groupName);
groups.put(inputKey, g);
g.init(key, pp);
}
@@ -334,7 +337,7 @@
try
{
- String inputKey = TurbineIntake.getGroupKey(groupName)
+ String inputKey = Intake.getGroupKey(groupName)
+ obj.getQueryKey();
if (groups.containsKey(inputKey))
{
@@ -342,9 +345,10 @@
}
else
{
- g = TurbineIntake.getGroup(groupName);
+ g = Intake.getGroup(groupName);
groups.put(inputKey, g);
}
+
return g.init(obj);
}
catch (Exception e)
@@ -354,7 +358,7 @@
return null;
}
- }
+ }
/**
* get a specific group
@@ -457,9 +461,9 @@
try
{
- TurbineIntake.releaseGroup(group);
+ Intake.releaseGroup(group);
}
- catch (TurbineException se)
+ catch (IntakeException ie)
{
log.error("Tried to release unknown group "
+ group.getIntakeGroupName());
@@ -524,9 +528,9 @@
try
{
- TurbineIntake.releaseGroup(g);
+ Intake.releaseGroup(g);
}
- catch (TurbineException se)
+ catch (IntakeException ie)
{
log.error("Tried to release unknown group "
+ g.getIntakeGroupName());
1.3 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeException.java
Index: IntakeException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntakeException.java 9 Mar 2003 03:06:26 -0000 1.2
+++ IntakeException.java 14 Oct 2003 12:17:24 -0000 1.3
@@ -59,6 +59,7 @@
/**
* Base exception thrown by the Intake service.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
1.2 +5 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 3 Sep 2003 08:21:53 -0000 1.1
+++ package.html 14 Oct 2003 12:17:24 -0000 1.2
@@ -5,7 +5,10 @@
<body>
The intake service can validate user input from HTML forms.
-<br>
+<br/>
+This service has been deprecated in favor of the Fulcrum Intake component available from
+<a href="http://jakarta.apache.org/turbine/fulcrum/intake">Fulcrum Intake</a>
+<br/>
<font size="-2">$Id$</font>
</body>
</html>
1.15 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 12 Aug 2003 23:24:26 -0000 1.14
+++ TurbineIntakeService.java 14 Oct 2003 12:17:24 -0000 1.15
@@ -96,6 +96,7 @@
* This service provides access to input processing objects based
* on an XML specification.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/Rule.java
Index: Rule.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/Rule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Rule.java 7 Apr 2003 15:30:51 -0000 1.5
+++ Rule.java 14 Oct 2003 12:17:24 -0000 1.6
@@ -63,6 +63,7 @@
/**
* A Class for holding data about a constraint on a property.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @version $Id$
*/
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/AppData.java
Index: AppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/AppData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AppData.java 7 Apr 2003 15:30:51 -0000 1.5
+++ AppData.java 14 Oct 2003 12:17:24 -0000 1.6
@@ -67,6 +67,7 @@
/**
* A class for holding application data structures.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
1.11 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/XmlField.java
Index: XmlField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/XmlField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlField.java 18 Jul 2003 09:09:00 -0000 1.10
+++ XmlField.java 14 Oct 2003 12:17:24 -0000 1.11
@@ -72,6 +72,7 @@
/**
* A Class for holding data about a property used in an Application.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/XmlGroup.java
Index: XmlGroup.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/xmlmodel/XmlGroup.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XmlGroup.java 7 Apr 2003 15:39:31 -0000 1.5
+++ XmlGroup.java 14 Oct 2003 12:17:24 -0000 1.6
@@ -67,6 +67,7 @@
/**
* A Class for holding data about a grouping of inputs used in an Application.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
* @version $Id$
*/
1.1 jakarta-turbine-2/conf/test/intakeRoleConfiguration.xml
Index: intakeRoleConfiguration.xml
===================================================================
<!-- This configuration file for Avalon components is used for testing the TorqueComponent -->
<role-list>
<role
name="org.apache.fulcrum.intake.IntakeService"
shorthand="intake"
default-class="org.apache.fulcrum.intake.IntakeServiceImpl"/>
<role
name="org.apache.fulcrum.localization.LocalizationService"
shorthand="localization"
default-class="org.apache.fulcrum.localization.DefaultLocalizationService"/>
<role
name="org.apache.fulcrum.factory.FactoryService"
shorthand="factory"
default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
</role-list>
1.1 jakarta-turbine-2/conf/test/intake.xml
Index: intake.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE input-data SYSTEM
"http://jakarta.apache.org/turbine/dtd/intake_2_3.dtd">
<input-data basePackage="org.apache.turbine.services.intake.">
<group name="LoginGroup" key="loginGroupKey" mapToObject="LoginForm">
<field name="Username" key="loginUsernameKey" type="String"
mapToProperty="Username">
</field>
</group>
</input-data>
1.1 jakarta-turbine-2/conf/test/TestIntake.properties
Index: TestIntake.properties
===================================================================
# -------------------------------------------------------------------
# $Id: TestIntake.properties,v 1.1 2003/10/14 12:17:25 epugh Exp $
#
# This is the configuration file for Turbine.
#
# Note that strings containing "," (comma) characters must backslash
# escape the comma (i.e. '\,')
#
# -------------------------------------------------------------------
# -------------------------------------------------------------------
#
# L O G 4 J - L O G G I N G
#
# -------------------------------------------------------------------
log4j.file = /conf/test/Log4j.properties
# If module.cache=true, then how large should we make the hashtables
# by default.
action.cache.size=20
layout.cache.size=10
navigation.cache.size=10
page.cache.size=5
screen.cache.size=50
scheduledjob.cache.size=10
# -------------------------------------------------------------------
#
# M O D U L E P A C K A G E S
#
# -------------------------------------------------------------------
# This is the "classpath" for Turbine. In order to locate your own
# modules, you should add them to this path. For example, if you have
# com.company.actions, com.company.screens, com.company.navigations,
# then this setting would be "com.company,org.apache.turbine.modules".
# This path is searched in order. For example, Turbine comes with a
# screen module named "Login". If you wanted to have your own screen
# module named "Login", then you would specify the path to your
# modules before the others.
#
# Note: org.apache.turbine.modules will always be added to the search
# path. If it is not explictly added here, it will be added to the
# end.
#
# Default: org.apache.turbine.modules
# -------------------------------------------------------------------
module.packages=@MODULE_PACKAGES@
services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
services.RunDataService.default.parameter.parser=org.apache.turbine.util.parser.DefaultParameterParser
services.RunDataService.default.cookie.parser=org.apache.turbine.util.parser.DefaultCookieParser
# -------------------------------------------------------------------
#
# A S S E M B L E R B R O K E R S E R V I C E
#
# -------------------------------------------------------------------
# A list of AssemblerFactory classes that will be registered
# with TurbineAssemblerBrokerService
# -------------------------------------------------------------------
services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.java.JavaScreenFactory
#services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.python.PythonScreenFactory
services.AssemblerBrokerService.action=org.apache.turbine.services.assemblerbroker.util.java.JavaActionFactory
services.AssemblerBrokerService.layout=org.apache.turbine.services.assemblerbroker.util.java.JavaLayoutFactory
services.AssemblerBrokerService.page=org.apache.turbine.services.assemblerbroker.util.java.JavaPageFactory
services.AssemblerBrokerService.navigation=org.apache.turbine.services.assemblerbroker.util.java.JavaNavigationFactory
services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
# -------------------------------------------------------------------
#
# T E M P L A T E S E R V I C E
#
# -------------------------------------------------------------------
# Roughly, the number of templates in each category.
#
# Defaults: layout=2, navigation=10, screen=50
services.TemplateService.layout.cache.size=2
services.TemplateService.navigation.cache.size=10
services.TemplateService.screen.cache.size=50
services.PullService.earlyInit= true
services.PullService.tools.per.request.refresh=true
tool.request.intake=org.apache.turbine.services.intake.IntakeTool
services.AvalonComponentService.componentConfiguration = conf/test/intakeComponentConfiguration.xml
services.AvalonComponentService.componentRoles = conf/test/intakeRoleConfiguration.xml
services.AvalonComponentService.lookup = org.apache.fulcrum.intake.IntakeService
1.1 jakarta-turbine-2/conf/test/intakeComponentConfiguration.xml
Index: intakeComponentConfiguration.xml
===================================================================
<!-- This configuration file for Avalon components is used for testing the LocalizationTool pull tool -->
<componentConfig>
<intake>
<serialDataPath>./target/appData.ser</serialDataPath>
<xmlPaths>
<xmlPath>conf/test/intake.xml</xmlPath>
</xmlPaths>
</intake>
<localization>
<bundles>
<bundle>org.apache.fulcrum.localization.BarBundle</bundle>
<bundle>org.apache.fulcrum.localization.FooBundle</bundle>
</bundles>
</localization>
<factory/>
</componentConfig>
1.8 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/XmlToAppData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XmlToAppData.java 7 Apr 2003 15:30:50 -0000 1.7
+++ XmlToAppData.java 14 Oct 2003 12:17:25 -0000 1.8
@@ -81,6 +81,7 @@
* xml schema file and creates and AppData java structure.
* It uses apache Xerces to do the xml parsing.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.9 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/DTDResolver.java
Index: DTDResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/transform/DTDResolver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DTDResolver.java 7 Apr 2003 15:30:50 -0000 1.8
+++ DTDResolver.java 14 Oct 2003 12:17:25 -0000 1.9
@@ -70,6 +70,7 @@
* <a href="http://developer.java.sun.com/developer/bugParade/bugs/4337703.html">
* Bug 4337703</a>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BigDecimalValidator.java
Index: BigDecimalValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BigDecimalValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BigDecimalValidator.java 12 Sep 2003 00:23:21 -0000 1.4
+++ BigDecimalValidator.java 14 Oct 2003 12:17:25 -0000 1.5
@@ -74,6 +74,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.12 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DefaultValidator.java
Index: DefaultValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 1 Oct 2003 00:31:00 -0000 1.11
+++ DefaultValidator.java 14 Oct 2003 12:17:25 -0000 1.12
@@ -74,6 +74,7 @@
*
* This validator can serve as the base class for more specific validators
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
1.7 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/InitableByConstraintMap.java
Index: InitableByConstraintMap.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/InitableByConstraintMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InitableByConstraintMap.java 9 Mar 2003 03:06:28 -0000 1.6
+++ InitableByConstraintMap.java 14 Oct 2003 12:17:25 -0000 1.7
@@ -60,6 +60,7 @@
* This interface marks a bean/class that can have its properties set
* by values in a Map.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @version $Id$
*/
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/Constraint.java
Index: Constraint.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/Constraint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constraint.java 9 Mar 2003 03:06:28 -0000 1.4
+++ Constraint.java 14 Oct 2003 12:17:25 -0000 1.5
@@ -64,6 +64,7 @@
* value="255"
* message="Value cannot be longer than 255 characters."
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @version $Id$
*/
1.9 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberValidator.java
Index: NumberValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 19 Jun 2003 16:55:17 -0000 1.8
+++ NumberValidator.java 14 Oct 2003 12:17:25 -0000 1.9
@@ -70,6 +70,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
1.8 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/Validator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Validator.java 19 Jun 2003 16:55:17 -0000 1.7
+++ Validator.java 14 Oct 2003 12:17:25 -0000 1.8
@@ -57,6 +57,7 @@
/**
* Validator api.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @version $Id$
*/
1.11 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java
Index: BooleanValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BooleanValidator.java 12 Sep 2003 00:23:21 -0000 1.10
+++ BooleanValidator.java 14 Oct 2003 12:17:25 -0000 1.11
@@ -84,6 +84,7 @@
* <li>0</li>
* </ul>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java
Index: ShortValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ShortValidator.java 12 Sep 2003 00:23:21 -0000 1.4
+++ ShortValidator.java 14 Oct 2003 12:17:25 -0000 1.5
@@ -72,6 +72,7 @@
* <td>Entry was not a valid Short</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/LongValidator.java
Index: LongValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/LongValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LongValidator.java 12 Sep 2003 00:23:21 -0000 1.4
+++ LongValidator.java 14 Oct 2003 12:17:25 -0000 1.5
@@ -72,6 +72,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.12 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java
Index: NumberKeyValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/NumberKeyValidator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NumberKeyValidator.java 19 Jun 2003 16:55:17 -0000 1.11
+++ NumberKeyValidator.java 14 Oct 2003 12:17:25 -0000 1.12
@@ -72,6 +72,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
1.2 +5 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 3 Sep 2003 08:21:53 -0000 1.1
+++ package.html 14 Oct 2003 12:17:25 -0000 1.2
@@ -5,7 +5,10 @@
<body>
Validators for the various intake field types.
-<br>
+<br/>
+This service has been deprecated in favor of the Fulcrum Intake component available from
+<a href="http://jakarta.apache.org/turbine/fulcrum/intake">Fulcrum Intake</a>
+<br/>
<font size="-2">$Id$</font>
</body>
</html>
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/StringValidator.java
Index: StringValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/StringValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringValidator.java 12 Sep 2003 00:23:21 -0000 1.4
+++ StringValidator.java 14 Oct 2003 12:17:25 -0000 1.5
@@ -76,6 +76,7 @@
*
* This validator can serve as the base class for more specific validators
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
1.9 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FileValidator.java
Index: FileValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 19 Jun 2003 15:24:49 -0000 1.8
+++ FileValidator.java 14 Oct 2003 12:17:25 -0000 1.9
@@ -68,6 +68,7 @@
*
* This validator can serve as the base class for more specific validators
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java
Index: DoubleValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DoubleValidator.java 12 Sep 2003 00:23:21 -0000 1.5
+++ DoubleValidator.java 14 Oct 2003 12:17:25 -0000 1.6
@@ -72,6 +72,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.6 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java
Index: FloatValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FloatValidator.java 12 Sep 2003 00:23:21 -0000 1.5
+++ FloatValidator.java 14 Oct 2003 12:17:25 -0000 1.6
@@ -72,6 +72,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.12 +10 -26 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java
Index: DateStringValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DateStringValidator.java 29 Sep 2003 11:24:04 -0000 1.11
+++ DateStringValidator.java 14 Oct 2003 12:17:25 -0000 1.12
@@ -77,18 +77,18 @@
* <td> </td></tr>
* <tr><td>formatx</td><td>see SimpleDateFormat javadoc</td>
* <td> </td></tr>
- * <tr><td colspan=3>where x is >= 1 to specify multiple date
+ * <tr><td colspan=3>where x is >= 0 to specify multiple date
* formats. Only one format rule should have a message</td></tr>
* <tr><td>flexible</td><td>true, as long as DateFormat can parse the date,
* allow it, and false</td>
* <td>false</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
- * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
* @version $Id$
*/
public class DateStringValidator
@@ -170,15 +170,15 @@
flexible = Boolean.valueOf(constraint.getValue()).booleanValue();
}
- if (dateFormats.size() == 0)
+ if (dateFormats.size() == 0 || flexible)
{
df = DateFormat.getInstance();
- df.setLenient(flexible);
+ df.setLenient(true);
}
- else
+
+ if (dateFormats.size() != 0)
{
sdf = new SimpleDateFormat();
- sdf.setLenient(flexible);
}
}
@@ -210,11 +210,8 @@
}
/**
- * Parses the String s according to the rules/formats for this validator.
- * The formats provided by the "formatx" rules (where x is >= 1) are
- * used <strong>before</strong> the "format" rules to allow for a display
- * format that includes a 4 digit year, but that will parse the date using
- * a format that accepts 2 digit years.
+ * Parses the String s according to the rules/formats for this
+ * validator.
*
* @throws ParseException indicates that the string could not be
* parsed into a date.
@@ -229,7 +226,7 @@
throw new ParseException("Input string was null", -1);
}
- for (int i = 1; i < dateFormats.size() && date == null; i++)
+ for (int i = 0; i < dateFormats.size() && date == null; i++)
{
sdf.applyPattern((String) dateFormats.get(i));
@@ -241,20 +238,7 @@
{
// ignore
}
- }
-
- if (date == null)
- {
- sdf.applyPattern((String) dateFormats.get(0));
- try
- {
- date = sdf.parse(s);
- }
- catch (ParseException e)
- {
- // ignore
- }
}
if (date == null && df != null)
1.11 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java
Index: IntegerValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- IntegerValidator.java 12 Sep 2003 00:23:21 -0000 1.10
+++ IntegerValidator.java 14 Oct 2003 12:17:25 -0000 1.11
@@ -72,6 +72,7 @@
* <td>Entry was not a valid number</td></tr>
* </table>
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:Colin.Chalmers@maxware.nl">Colin Chalmers</a>
* @author <a href="mailto:jh@byteaction.de">Jürgen Hoffmann</a>
1.4 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/InvalidMaskException.java
Index: InvalidMaskException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/InvalidMaskException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InvalidMaskException.java 9 Mar 2003 03:06:28 -0000 1.3
+++ InvalidMaskException.java 14 Oct 2003 12:17:25 -0000 1.4
@@ -59,6 +59,7 @@
/**
* An Exception indidate an invalid field mask.
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
1.5 +2 -1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/ValidationException.java
Index: ValidationException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/validator/ValidationException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValidationException.java 9 Mar 2003 03:06:28 -0000 1.4
+++ ValidationException.java 14 Oct 2003 12:17:25 -0000 1.5
@@ -59,6 +59,7 @@
/**
* An Exception to mark a failed validation
*
+ * @deprecated Use the Fulcrum Intake component instead.
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
1.1 jakarta-turbine-2/src/test/org/apache/turbine/services/intake/LoginForm.java
Index: LoginForm.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.turbine.services.intake;
/**
* Test form for Intake
*
* @author <a href="mailto:epugh@upstate.com">epugh@upstate.com</a>
* @version $Id: LoginForm.java,v 1.1 2003/10/14 12:17:26 epugh Exp $
*/
public class LoginForm
{
private String username;
/**
* @return
*/
public String getUsername()
{
return username;
}
/**
* @param username
*/
public void setUsername(String username)
{
this.username = username;
}
}
1.1 jakarta-turbine-2/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
Index: IntakeToolTest.java
===================================================================
package org.apache.turbine.services.intake;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* AintakeToolernately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.io.File;
import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletResponse;
import org.apache.fulcrum.intake.model.Group;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.test.EnhancedMockHttpServletRequest;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockHttpSession;
import com.mockobjects.servlet.MockServletConfig;
/**
* Unit test for Localization Tool. Verifies that localization works the same using the
* deprecated Turbine localization service as well as the new Fulcrum Localization
* component.
*
* @author <a href="maiintakeToolo:epugh@upstate.com">Eric Pugh</a>
* @version $Id: IntakeToolTest.java,v 1.1 2003/10/14 12:17:26 epugh Exp $
*/
public class IntakeToolTest extends BaseTestCase
{
private static TurbineConfig tc = null;
public IntakeToolTest(String name) throws Exception
{
super(name);
}
public void testGet() throws Exception
{
IntakeTool intakeTool = new IntakeTool();
intakeTool.init(getRunData());
File file = new File("./target/appData.ser");
assertTrue(
"Make sure serialized data file exists:" + file,
file.exists());
Group group = intakeTool.get("LoginGroup","loginGroupKey");
assertNotNull(group);
assertEquals("loginGroupKey", group.getGID());
assertEquals("LoginGroup", group.getIntakeGroupName());
}
/**
* Make sure refresh DOESN'T do anything
* @throws Exception
*/
public void testRefresh() throws Exception
{
IntakeTool intakeTool = new IntakeTool();
intakeTool.init(getRunData());
int numberOfGroups = intakeTool.getGroups().size();
intakeTool.refresh();
assertEquals(numberOfGroups,intakeTool.getGroups().size());
}
private RunData getRunData() throws Exception
{
RunDataService rds =
(RunDataService) TurbineServices.getInstance().getService(
RunDataService.SERVICE_NAME);
EnhancedMockHttpServletRequest request =
new EnhancedMockHttpServletRequest();
request.setupServerName("bob");
request.setupGetProtocol("http");
request.setupScheme("scheme");
request.setupPathInfo("damn");
request.setupGetServletPath("damn2");
request.setupGetContextPath("wow");
request.setupGetContentType("html/text");
request.setupAddHeader("Content-type", "html/text");
request.setupAddHeader("Accept-Language", "en-US");
Vector v = new Vector();
request.setupGetParameterNames(v.elements());
MockHttpSession session = new MockHttpSession();
session.setupGetAttribute(User.SESSION_KEY, null);
request.setSession(session);
HttpServletResponse response = new MockHttpServletResponse();
ServletConfig config = new MockServletConfig();
RunData runData = rds.getRunData(request, response, config);
return runData;
}
public void setUp() throws Exception
{
tc = new TurbineConfig(".", "/conf/test/TestIntake.properties");
tc.initialize();
}
public void tearDown() throws Exception
{
if (tc != null)
{
tc.dispose();
}
}
}
1.71 +5 -0 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- changes.xml 30 Sep 2003 04:17:33 -0000 1.70
+++ changes.xml 14 Oct 2003 12:17:26 -0000 1.71
@@ -63,6 +63,11 @@
<p>
<ul>
<li>
+ The intake service within Turbine has been deprecated in favor
+ of the Fulcrum Intake service. The intake pull tool has
+ been updated to reflect this.
+ </li>
+ <li>
The localization service within Turbine has been deprecated in favor
of the Fulcrum Localization service. The localization pull tool has
been updated to reflect this.
1.140 +22 -2 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- project.xml 9 Sep 2003 15:04:51 -0000 1.139
+++ project.xml 14 Oct 2003 12:17:26 -0000 1.140
@@ -398,14 +398,33 @@
<url>http://jakarta.apache.org/avalon/</url>
</dependency>
<dependency>
- <id>fulcrum-localization</id>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-localization</artifactId>
<version>1.0-alpha-3</version>
- <url>http://jakarta.apache.org/turbine/fulcrum/</url>
+ <url>http://jakarta.apache.org/turbine/fulcrum/localization</url>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
<dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-intake</artifactId>
+ <version>1.0-alpha-1</version>
+ <url>http://jakarta.apache.org/turbine/fulcrum/intake</url>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-factory</artifactId>
+ <version>1.0-alpha-1</version>
+ <url>http://jakarta.apache.org/turbine/fulcrum/factory</url>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ <dependency>
<id>jaf:activation</id>
<version>1.0.2</version>
<url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url>
@@ -538,6 +557,7 @@
<report>maven-linkcheck-plugin</report>
-->
<report>maven-tasklist-plugin</report>
+ <report>maven-jcoverage-plugin</report>
</reports>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org