You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2005/08/29 16:05:26 UTC
svn commit: r264142 [2/6] - in
/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH: ./ conf/ conf/test/
src/dtd/ src/java/org/apache/turbine/ src/java/org/apache/turbine/modules/
src/java/org/apache/turbine/modules/actions/
src/java/org/apache/turbine/mo...
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/BooleanField.java Mon Aug 29 07:02:55 2005
@@ -78,12 +78,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -121,7 +121,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? getBoolean(inputs[i]).booleanValue()
+ ? getBoolean(inputs[i]).booleanValue()
: ((Boolean) getEmptyValue()).booleanValue();
}
setTestValue(values);
@@ -188,5 +188,5 @@
}
return result;
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DateStringField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DateStringField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DateStringField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DateStringField.java Mon Aug 29 07:02:55 2005
@@ -45,7 +45,7 @@
private static DateFormat df;
static
- {
+ {
df = DateFormat.getInstance();
df.setLenient(true);
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DoubleField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DoubleField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DoubleField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/DoubleField.java Mon Aug 29 07:02:55 2005
@@ -82,12 +82,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -99,7 +99,7 @@
}
else
{
- return (null == getEmptyValue())
+ return (null == getEmptyValue())
? new Double(0.0) : getEmptyValue();
}
}
@@ -126,7 +126,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Double(inputs[i]).doubleValue()
+ ? new Double(inputs[i]).doubleValue()
: ((Double) getEmptyValue()).doubleValue();
}
setTestValue(values);
@@ -134,9 +134,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Double(val) : (Double) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java Mon Aug 29 07:02:55 2005
@@ -590,7 +590,7 @@
}
}
-
+
if (validator != null)
{
// set the test value as a String[] which might be replaced by
@@ -945,12 +945,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -1001,7 +1001,7 @@
*/
public String getStringValue()
{
- return this.toString();
+ return this.toString();
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FieldFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FieldFactory.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FieldFactory.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FieldFactory.java Mon Aug 29 07:02:55 2005
@@ -75,12 +75,12 @@
}
);
fieldCtors.put("NumberKey", new FieldFactory.FieldCtor()
- {
+ {
public Field getInstance(XmlField f, Group g)
throws IntakeException
- {
+ {
return new NumberKeyField(f, g);
- }
+ }
}
);
fieldCtors.put("ComboKey", new FieldFactory.FieldCtor()
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FileItemField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FileItemField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FileItemField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FileItemField.java Mon Aug 29 07:02:55 2005
@@ -28,7 +28,7 @@
/**
* This Intake field is intended to represent a File input element in a HTML form.
- *
+ *
* @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>
@@ -127,7 +127,7 @@
validFlag = true;
FileItem [] fileItems = ((ParameterParser) parser).getFileItems(getKey());
-
+
if (fileItems != null)
{
setFlag = true;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FloatField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FloatField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FloatField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/FloatField.java Mon Aug 29 07:02:55 2005
@@ -86,12 +86,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -103,7 +103,7 @@
}
else
{
- return (null == getEmptyValue())
+ return (null == getEmptyValue())
? new Float(0.0) : getEmptyValue();
}
}
@@ -130,7 +130,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Float(inputs[i]).floatValue()
+ ? new Float(inputs[i]).floatValue()
: ((Float) getEmptyValue()).floatValue();
}
setTestValue(values);
@@ -138,9 +138,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Float(val) : getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/IntegerField.java Mon Aug 29 07:02:55 2005
@@ -85,12 +85,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -102,7 +102,7 @@
}
else
{
- return (null == getEmptyValue())
+ return (null == getEmptyValue())
? new Integer(0) : getEmptyValue();
}
}
@@ -129,7 +129,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Integer(inputs[i]).intValue()
+ ? new Integer(inputs[i]).intValue()
: ((Integer) getEmptyValue()).intValue();
}
setTestValue(values);
@@ -140,5 +140,5 @@
setTestValue(StringUtils.isNotEmpty(val) ? new Integer(val) : (Integer) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/LongField.java Mon Aug 29 07:02:55 2005
@@ -84,12 +84,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -127,7 +127,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Long(inputs[i]).longValue()
+ ? new Long(inputs[i]).longValue()
: ((Long) getEmptyValue()).longValue();
}
setTestValue(values);
@@ -135,9 +135,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Long(val) : (Long) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/ShortField.java Mon Aug 29 07:02:55 2005
@@ -83,12 +83,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -100,8 +100,8 @@
}
else
{
- return (null == getEmptyValue())
- ? new Short((short) 0) : getEmptyValue();
+ return (null == getEmptyValue())
+ ? new Short((short) 0) : getEmptyValue();
}
}
@@ -127,7 +127,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Short(inputs[i]).shortValue()
+ ? new Short(inputs[i]).shortValue()
: ((Short) getEmptyValue()).shortValue();
}
setTestValue(values);
@@ -135,9 +135,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Short(val) : (Short) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/BooleanValidator.java Mon Aug 29 07:02:55 2005
@@ -115,18 +115,18 @@
{
Boolean result = null;
- for (int cnt = 0;
+ for (int cnt = 0;
cnt < Math.max(trueValues.length, falseValues.length); cnt++)
{
// Short-cut evaluation or bust!
- if ((cnt < trueValues.length) &&
+ if ((cnt < trueValues.length) &&
stringValue.equalsIgnoreCase(trueValues[cnt]))
{
result = Boolean.TRUE;
break;
}
- if ((cnt < falseValues.length) &&
+ if ((cnt < falseValues.length) &&
stringValue.equalsIgnoreCase(falseValues[cnt]))
{
result = Boolean.FALSE;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DateStringValidator.java Mon Aug 29 07:02:55 2005
@@ -117,7 +117,7 @@
dateFormats.add(constraint.getValue());
setDateFormatMessage(constraint.getMessage());
- }
+ }
if (StringUtils.isEmpty(dateFormatMessage))
{
@@ -173,9 +173,9 @@
}
/**
- * 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
+ * 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.
*
@@ -213,7 +213,7 @@
// Now test the FORMAT pattern which is the first one in the array.
// if no format but just FORMATx has been given, all of the patterns
- // have been shifted "one down", e.g. tested as format2, format3, format4, format1
+ // have been shifted "one down", e.g. tested as format2, format3, format4, format1
// in sequence.
if (date == null)
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/DoubleValidator.java Mon Aug 29 07:02:55 2005
@@ -121,7 +121,7 @@
errorMessage = invalidNumberMessage;
throw new ValidationException(invalidNumberMessage);
}
-
+
if (d < minValue)
{
errorMessage = minValueMessage;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/FloatValidator.java Mon Aug 29 07:02:55 2005
@@ -120,7 +120,7 @@
errorMessage = invalidNumberMessage;
throw new ValidationException(invalidNumberMessage);
}
-
+
if (f < minValue)
{
errorMessage = minValueMessage;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/IntegerValidator.java Mon Aug 29 07:02:55 2005
@@ -120,7 +120,7 @@
errorMessage = invalidNumberMessage;
throw new ValidationException(invalidNumberMessage);
}
-
+
if (i < minValue)
{
errorMessage = minValueMessage;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/LongValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/LongValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/LongValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/LongValidator.java Mon Aug 29 07:02:55 2005
@@ -120,7 +120,7 @@
errorMessage = invalidNumberMessage;
throw new ValidationException(invalidNumberMessage);
}
-
+
if (l < minValue)
{
errorMessage = minValueMessage;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/ShortValidator.java Mon Aug 29 07:02:55 2005
@@ -120,7 +120,7 @@
errorMessage = invalidNumberMessage;
throw new ValidationException(invalidNumberMessage);
}
-
+
if (s < minValue)
{
errorMessage = minValueMessage;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/StringValidator.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/StringValidator.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/StringValidator.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/validator/StringValidator.java Mon Aug 29 07:02:55 2005
@@ -141,7 +141,7 @@
{
/** perl5 matcher */
Perl5Matcher patternMatcher = new Perl5Matcher();
-
+
boolean patternMatch =
patternMatcher.matches(testValue, maskPattern);
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/package.html
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/package.html?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/package.html (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/jsp/package.html Mon Aug 29 07:02:55 2005
@@ -4,7 +4,7 @@
</head>
<body>
-JSP Service is used to provide Turbine with a Java Server page (JSP) based view.
+JSP Service is used to provide Turbine with a Java Server page (JSP) based view.
<br>
<font size="-2">$Id$</font>
</body>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/Localization.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/Localization.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/Localization.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/Localization.java Mon Aug 29 07:02:55 2005
@@ -1,4 +1,3 @@
-
package org.apache.turbine.services.localization;
/*
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/package.html
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/package.html?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/package.html (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/package.html Mon Aug 29 07:02:55 2005
@@ -13,7 +13,7 @@
<h3>What is a service?</h3>
<ul>
-<li> Is a singleton - there is only one instance of it in the system
+<li> Is a singleton - there is only one instance of it in the system
i.e. memory or connections are allocated once only, and the internal
state is common to all requesting clients.
<li> Has pluggable implementation - you can use your own implementation
@@ -26,24 +26,24 @@
<li> Can initialize itself (allocate memory, make connctions)
just before the client requests it for the first time. Services that
are never used by the application will not allocate resources.
-<li> Can execute some action upon system shutdown e.g. close the
+<li> Can execute some action upon system shutdown e.g. close the
opened connections.
-</ul>
+</ul>
<h3>The life cycle of a Service</h3>
<p>
-A Service (or any other Initable, if we had any) is not supposed
+A Service (or any other Initable, if we had any) is not supposed
to do much in it's constructor. Especialy it should not allocate
any costly resources like large memory structures, DB or network
connections and the like. It may well happen that the Service
-is sitting in the config file, but the application does not
+is sitting in the config file, but the application does not
need it, so allocating all resources at system startup might
be a loss.
<p>
Early initialization is similar to the constructor. It is used
to pass some information that the Service will need in it's
-future operation.
+future operation.
UniqueId Service uses the HttpRequest object from the first Turbine
-invocation to determine URL this instance is runnign under, to
+invocation to determine URL this instance is runnign under, to
generate instance ID.
Early initialization method should process the configuration, store
some values, but NOT allocate resources. There is still a chance
@@ -56,13 +56,13 @@
Late initialization happens when the Service is requested by the
application for the first time. It should allocate any resources
needed and chnge the state so that getInit() returns true.
-If getInit() returns false after init() is executed, the Service
+If getInit() returns false after init() is executed, the Service
has malfunctioned.
<p>
After late initialization, the Service is ready to perform actions
on behalf of the application.
<p>
-When the Service is no longer needed (this usually happens when
+When the Service is no longer needed (this usually happens when
system is shutting down), the shutdown() method is called.
shutdown() should deallocate all resources. If any error conditions
occur they are ignored.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/PoolService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/PoolService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/PoolService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/PoolService.java Mon Aug 29 07:02:55 2005
@@ -39,13 +39,13 @@
{
/** The key under which this service is stored in TurbineServices. */
String SERVICE_NAME = "PoolService";
-
+
/** The default pool capacity. */
int DEFAULT_POOL_CAPACITY = 128;
-
+
/** The name of the pool capacity property */
String POOL_CAPACITY_KEY = "pool.capacity";
-
+
/** Are we running in debug mode? */
String POOL_DEBUG_KEY = "pool.debug";
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/TurbinePoolService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/TurbinePoolService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/TurbinePoolService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pool/TurbinePoolService.java Mon Aug 29 07:02:55 2005
@@ -175,7 +175,7 @@
// each pool fills up at least to half its capacity.
if (debugPool && (pool.size() < (pool.capacity() / 2)))
{
- log.debug("Size: " + pool.size()
+ log.debug("Size: " + pool.size()
+ ", capacity: " + pool.capacity());
return null;
}
@@ -339,20 +339,20 @@
debugPool = conf.getBoolean(POOL_DEBUG_KEY,
POOL_DEBUG_DEFAULT);
-
+
if (debugPool)
{
log.info("Activated Pool Debugging!");
}
factoryService = TurbineFactory.getService();
-
+
if (factoryService == null)
{
throw new InitializationException("Factory Service is not configured"
+ " but required for the Pool Service!");
}
-
+
setInit(true);
}
@@ -470,7 +470,7 @@
{
Object instance = pollInstance(clazz.getName(), null, null);
return (instance == null)
- ? factoryService.getInstance(clazz.getName())
+ ? factoryService.getInstance(clazz.getName())
: instance;
}
@@ -570,7 +570,7 @@
HashMap repository = poolRepository;
repository = (repository != null)
? (HashMap) repository.clone() : new HashMap();
-
+
capacity = (capacity <= 0) ? poolCapacity : capacity;
repository.put(className, new PoolBuffer(capacity));
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePull.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePull.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePull.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePull.java Mon Aug 29 07:02:55 2005
@@ -51,7 +51,7 @@
* Get the context containing global tools that will be
* use as part of the Turbine Pull Model.
*
- * @return A Context object which contains the
+ * @return A Context object which contains the
* Global Tool instances.
*/
public static final Context getGlobalContext()
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/TurbinePullService.java Mon Aug 29 07:02:55 2005
@@ -295,7 +295,7 @@
// Create and populate the global context right now
- // This is unholy, because it entwines the VelocityService and
+ // This is unholy, because it entwines the VelocityService and
// the Pull Service even further. However, there isn't much we can
// do for the 2.3 release. Expect this to go post-2.3
globalContext = velocity.getNewContext();
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/ContentTool.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/ContentTool.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/ContentTool.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/ContentTool.java Mon Aug 29 07:02:55 2005
@@ -26,7 +26,7 @@
/**
* Terribly simple tool to translate URIs into Turbine Links.
* Equivalent to URIUtils.getAbsoluteLink() in a pull tool.
- *
+ *
* <p>
* If you're missing any routines from the 'old' $content tool concerning
* path_info or query data, you did use the wrong tool then. You should've used
@@ -46,7 +46,7 @@
/** Prefix for Parameters for this tool */
public static final String CONTENT_TOOL_PREFIX = "tool.content";
- /**
+ /**
* Should this tool add Container Encoding to the URIs returned?
* True might cause trouble e.g. if you run with Apache HTTP Daemon / Tomcat Combo.
*
@@ -56,7 +56,7 @@
/** Default Value for CONTENT_TOOL_ENCODING_KEY */
public static final boolean CONTENT_TOOL_ENCODING_DEFAULT = false;
-
+
/** Should this tool return relative URIs or absolute? Default: Absolute. */
public static final String CONTENT_TOOL_RELATIVE_KEY = "want.relative";
@@ -65,13 +65,13 @@
/** Do we want the container to encode the response? */
boolean wantEncoding = false;
-
+
/** Do we want a relative link? */
boolean wantRelative = false;
-
+
/** Caches a DataURI object which provides the translation routines */
private DataURI dataURI = null;
-
+
/**
* C'tor
*/
@@ -102,7 +102,7 @@
// exception.
dataURI = new DataURI((RunData) data);
- Configuration conf =
+ Configuration conf =
Turbine.getConfiguration().subset(CONTENT_TOOL_PREFIX);
if (conf != null)
@@ -113,7 +113,7 @@
wantEncoding = conf.getBoolean(CONTENT_TOOL_ENCODING_KEY,
CONTENT_TOOL_ENCODING_DEFAULT);
}
-
+
if (!wantEncoding)
{
dataURI.clearResponse();
@@ -139,7 +139,7 @@
{
dataURI.setScriptName(path);
- return wantRelative ?
+ return wantRelative ?
dataURI.getRelativeLink() : dataURI.getAbsoluteLink();
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/RelativeTemplateLink.java Mon Aug 29 07:02:55 2005
@@ -17,10 +17,10 @@
*/
/**
- * This is exactly the same thing as TemplateLink but it returns a
+ * This is exactly the same thing as TemplateLink but it returns a
* relative link on toString(). Everything else is identical. This class is
* here for legacy purposes if you used the old org.apache.turbine.util.template.RelativeLink
- * class and have lots of templates which you don't want to rewrite.
+ * class and have lots of templates which you don't want to rewrite.
*
* <p>
* For new Code please use TemplateLink and get a relative Link with $link.RelativeLink and
@@ -50,9 +50,9 @@
{
super();
}
-
+
/**
- * Returns the URI. After rendering the URI, it clears the
+ * Returns the URI. After rendering the URI, it clears the
* pathInfo and QueryString portions of the TemplateURI. Equivalent
* to the getRelativeLink() method of this class.
*
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java Mon Aug 29 07:02:55 2005
@@ -66,7 +66,7 @@
/** Do we want a relative link? */
boolean wantRelative = false;
-
+
/** cache of the template name for getPage() */
private String template = null;
@@ -109,7 +109,7 @@
templateURI = new TemplateURI((RunData) data);
- Configuration conf =
+ Configuration conf =
Turbine.getConfiguration().subset(TEMPLATE_LINK_PREFIX);
if (conf != null)
@@ -551,14 +551,14 @@
/**
* Returns the URI. After rendering the URI, it clears the
- * pathInfo and QueryString portions of the TemplateURI.
+ * pathInfo and QueryString portions of the TemplateURI.
*
* @return A String with the URI in the form
* http://foo.com/Turbine/template/index.wm/hello/world
*/
public String getLink()
{
- return wantRelative ?
+ return wantRelative ?
getRelativeLink() : getAbsoluteLink();
}
@@ -580,7 +580,7 @@
/**
* Returns the absolute URI leaving the source intact. Use this
* if you need the path_info and query data multiple times.
- * This is equivalent to $link.AbsoluteLink but does not reset
+ * This is equivalent to $link.AbsoluteLink but does not reset
* the path_info and query data.
*
* @return A String with the URI in the form
@@ -609,7 +609,7 @@
* Same as getLink().
*
* @return A String with the URI represented by this object.
- *
+ *
*/
public String toString()
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/tools/TemplateLinkWithSlash.java Mon Aug 29 07:02:55 2005
@@ -17,12 +17,12 @@
*/
/**
- * This class allows one to specify paths in the setPage method
+ * This class allows one to specify paths in the setPage method
* using '/' slash as opposed to the ',' used in TemplateLink.
* It is less efficient as the '/' are converted to ',' to avoid
- * problems parsing the pathinfo after conversion in a web server.
- *
- * It is recommended that projects standardize on using the ','
+ * problems parsing the pathinfo after conversion in a web server.
+ *
+ * It is recommended that projects standardize on using the ','
* separator and use TemplateLink. But this class is available for
* those who do not mind the inefficiency.
*
@@ -48,7 +48,7 @@
{
super();
}
-
+
/**
* Sets the template variable used by the Template Service.
* This method allows slashes '/' as the path separator.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/DateFormatter.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/DateFormatter.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/DateFormatter.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/util/DateFormatter.java Mon Aug 29 07:02:55 2005
@@ -29,7 +29,7 @@
* <p>As this is designed to be used as a gloal scope pull tool it needs to be
* threadsafe.
*
- * <p>This is an application pull tool for the template system. You should
+ * <p>This is an application pull tool for the template system. You should
* <b>not</b> use it in a normal application.
*
* @author <a href="mailto:qmccombs@nequalsone.com">Quinton McCombs</a>
@@ -43,7 +43,7 @@
private static final String DATE_FORMAT_DEFAULT = "MM/dd/yyyy";
/**
- * Property tag for the date format that is to be used for the web
+ * Property tag for the date format that is to be used for the web
* application.
*/
private static final String DATE_FORMAT_KEY = "tool.dateTool.format";
@@ -67,8 +67,8 @@
}
/**
- * Refresh the application tool. This is necessary for development work
- * where you probably want the tool to refresh itself if it is using
+ * Refresh the application tool. This is necessary for development work
+ * where you probably want the tool to refresh itself if it is using
* configuration information that is typically cached after initialization.
*/
public void refresh()
@@ -91,7 +91,7 @@
* Formats the given date as a String.
*
* @param theDate date to format
- * @param dateFormatString format string to use. See
+ * @param dateFormatString format string to use. See
* java.text.SimpleDateFormat for details.
* @return String value of the date
*/
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java Mon Aug 29 07:02:55 2005
@@ -54,7 +54,7 @@
*/
void init(Configuration conf)
throws InitializationException;
-
+
/**
* Check whether a specified user's account exists.
*
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java Mon Aug 29 07:02:55 2005
@@ -905,7 +905,7 @@
{
return 0;
}
-
+
/**
* Not implemented.
* @return null
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java Mon Aug 29 07:02:55 2005
@@ -107,8 +107,8 @@
groupObject = Class.forName(groupObjectName); // Maybe the user set a new value...
- // If any of the following Field queries fails, the group subsystem
- // is unusable. So check this right here at init time, which saves
+ // If any of the following Field queries fails, the group subsystem
+ // is unusable. So check this right here at init time, which saves
// us much time and hassle if it fails...
nameColumn = (String) groupPeerClass.getField(conf
.getString(GROUP_NAME_COLUMN_KEY, GROUP_NAME_COLUMN_DEFAULT)
@@ -119,11 +119,11 @@
).get(null);
namePropDesc = new PropertyDescriptor(conf
- .getString(GROUP_NAME_PROPERTY_KEY,
+ .getString(GROUP_NAME_PROPERTY_KEY,
GROUP_NAME_PROPERTY_DEFAULT), groupObject);
idPropDesc = new PropertyDescriptor(conf
- .getString(GROUP_ID_PROPERTY_KEY,
+ .getString(GROUP_ID_PROPERTY_KEY,
GROUP_ID_PROPERTY_DEFAULT), groupObject);
}
catch (Exception e)
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java Mon Aug 29 07:02:55 2005
@@ -111,7 +111,7 @@
roleObject = getPersistenceClass();
- roleObjectName = conf.getString(ROLE_CLASS_KEY,
+ roleObjectName = conf.getString(ROLE_CLASS_KEY,
roleObject.getName());
// Maybe the user set a new value...
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueUser.java Mon Aug 29 07:02:55 2005
@@ -55,7 +55,7 @@
implements User
{
private static Log log = LogFactory.getLog(TorqueUser.class);
-
+
/** The date on which the user last accessed the application. */
private Date lastAccessDate = null;
@@ -172,7 +172,7 @@
}
catch (Exception e)
{
- throw new TurbineSecurityException("User object said "
+ throw new TurbineSecurityException("User object said "
+ e.getMessage(), e);
}
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateService.java Mon Aug 29 07:02:55 2005
@@ -275,7 +275,7 @@
* @param templatePaths An array of template paths.
* @return An array of translated template paths.
* @deprecated Each template engine service should know how to translate
- * a request onto a file.
+ * a request onto a file.
*/
String[] translateTemplatePaths(String[] templatePaths);
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplate.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplate.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplate.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplate.java Mon Aug 29 07:02:55 2005
@@ -315,7 +315,7 @@
* @param templatePaths An array of template paths.
* @return An array of translated template paths.
* @deprecated Each template engine service should know how to translate
- * a request onto a file.
+ * a request onto a file.
*/
public static final String[] translateTemplatePaths(String[] templatePaths)
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplateService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TurbineTemplateService.java Mon Aug 29 07:02:55 2005
@@ -592,13 +592,13 @@
/**
* Translates the supplied template paths into their Turbine-canonical
* equivalent (probably absolute paths). This is used if the templating
- * engine (e.g. JSP) does not provide any means to load a page but
+ * engine (e.g. JSP) does not provide any means to load a page but
* the page path is passed to the servlet container.
*
* @param templatePaths An array of template paths.
* @return An array of translated template paths.
* @deprecated Each template engine service should know how to translate
- * a request onto a file.
+ * a request onto a file.
*/
public String[] translateTemplatePaths(String[] templatePaths)
{
@@ -738,14 +738,14 @@
char [] mapperSeparator = new char [] { '.', '.', '.', '.', '/', '/', '/' };
- Loader [] mapperLoader = new Loader [] {
+ Loader [] mapperLoader = new Loader [] {
PageLoader.getInstance(),
ScreenLoader.getInstance(),
LayoutLoader.getInstance(),
NavigationLoader.getInstance(),
null, null, null};
- String [] mapperPrefix = new String [] {
+ String [] mapperPrefix = new String [] {
null, null, null, null,
TurbineConstants.LAYOUT_PREFIX,
TurbineConstants.SCREEN_PREFIX,
@@ -758,7 +758,7 @@
mapperProperty.append(mapperNames[i]);
mapperProperty.append(".class");
- String mapperClass =
+ String mapperClass =
conf.getString(mapperProperty.toString(), mapperClasses[i]);
log.info("Using " + mapperClass + " to map " + mapperNames[i] + " elements");
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/mapper/ScreenDefaultTemplateMapper.java Mon Aug 29 07:02:55 2005
@@ -33,7 +33,7 @@
* This is a pretty simple mapper which returns template pathes for
* a supplied template name. If the path does not exist, it looks for
* a templated called "Default" in the same package.
- * This path can be used by the TemplateEngine to access
+ * This path can be used by the TemplateEngine to access
* a certain resource to actually render the template.
*
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java Mon Aug 29 07:02:55 2005
@@ -75,11 +75,11 @@
//
// @todo This needs definitely further working.
String url = Turbine.getDefaultServerData().toString();
-
+
MessageDigest md = MessageDigest.getInstance("MD5");
byte [] bytesId = md.digest(url.getBytes("UTF-8"));
turbineId = new String(Base64.encodeBase64(bytesId));
-
+
log.info("This is Turbine instance running at: " + url);
log.info("The instance id is #" + turbineId);
setInit(true);
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/upload/TurbineUploadService.java Mon Aug 29 07:02:55 2005
@@ -219,7 +219,7 @@
try
{
List fileList = fileUpload
- .parseRequest(req,
+ .parseRequest(req,
getSizeThreshold(),
getSizeMax(),
path);
@@ -232,7 +232,7 @@
if (fi.isFormField())
{
log.debug("Found an simple form field: " + fi.getFieldName() +", adding value " + fi.getString());
-
+
String value = null;
try
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java Mon Aug 29 07:02:55 2005
@@ -168,7 +168,7 @@
*/
public Context getContext()
{
- Context globalContext =
+ Context globalContext =
pullModelActive ? pullService.getGlobalContext() : null;
Context ctx = new VelocityContext(globalContext);
@@ -484,12 +484,12 @@
Configuration conf = getConfiguration();
catchErrors = conf.getBoolean(CATCH_ERRORS_KEY, CATCH_ERRORS_DEFAULT);
-
+
conf.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS,
SimpleLog4JLogSystem.class.getName());
conf.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM
+ ".log4j.category", "velocity");
-
+
Velocity.setExtendedProperties(createVelocityProperties(conf));
Velocity.init();
}
@@ -530,7 +530,7 @@
// no longer returns a vector for multiple value-keys but a
// List object. Velocity will choke if we add this object because
// org.apache.commons.collections.ExtendedProperties expect a
- // Vector object. Ah, the joys of incompatible class changes,
+ // Vector object. Ah, the joys of incompatible class changes,
// unwritten assumptions and general Java JAR Hell... =8-O
if (value instanceof List)
{
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/package.html
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/package.html?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/package.html (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/package.html Mon Aug 29 07:02:55 2005
@@ -4,7 +4,7 @@
</head>
<body>
-Velocity Service is used to provide Turbine with a Velocity based view.
+Velocity Service is used to provide Turbine with a Velocity based view.
<br>
<font size="-2">$Id$</font>
</body>
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java Mon Aug 29 07:02:55 2005
@@ -155,7 +155,7 @@
}
// Set the XML driver to the correct SAX parser class
- String saxParserClass =
+ String saxParserClass =
conf.getString("parser", SAXParser.class.getName());
XmlRpc.setDriver(saxParserClass);
@@ -306,10 +306,10 @@
}
server.addHandler(handlerName, handler);
-
- log.debug("Registered Handler " + handlerName + " as "
- + handler.getClass().getName()
- + ", Server: " + server
+
+ log.debug("Registered Handler " + handlerName + " as "
+ + handler.getClass().getName()
+ + ", Server: " + server
+ ", Webserver: " + webserver);
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java Mon Aug 29 07:02:55 2005
@@ -187,7 +187,7 @@
String agentSubstring = null;
if (versionEndIndex < 0)
{
- agentSubstring
+ agentSubstring
= userAgentString.substring(versionStartIndex + 1);
}
else
@@ -206,7 +206,7 @@
if (userAgentString.indexOf(MSIE) != -1)
{
// Ex: Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)
- versionStartIndex = (userAgentString.indexOf(MSIE)
+ versionStartIndex = (userAgentString.indexOf(MSIE)
+ MSIE.length() + 1);
versionEndIndex = userAgentString.indexOf(";", versionStartIndex);
@@ -233,7 +233,7 @@
if (userAgentString.indexOf(OPERA) != -1)
{
//Ex: Mozilla/4.0 (Windows NT 4.0;US) Opera 3.61 [en]
- versionStartIndex = (userAgentString.indexOf(OPERA)
+ versionStartIndex = (userAgentString.indexOf(OPERA)
+ OPERA.length() + 1);
versionEndIndex = userAgentString.indexOf(" ", versionStartIndex);
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/DataStreamParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/DataStreamParser.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/DataStreamParser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/DataStreamParser.java Mon Aug 29 07:02:55 2005
@@ -44,7 +44,7 @@
* @version $Id$
* @deprecated Use org.apache.turbine.util.parser.DataStreamParser instead.
*/
-public abstract class DataStreamParser
+public abstract class DataStreamParser
extends org.apache.turbine.util.parser.DataStreamParser
{
/**
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ObjectUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ObjectUtils.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ObjectUtils.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ObjectUtils.java Mon Aug 29 07:02:55 2005
@@ -146,7 +146,7 @@
ObjectInputStream in = null;
ByteArrayInputStream bin = new ByteArrayInputStream(objectData);
BufferedInputStream bufin = new BufferedInputStream(bin);
-
+
try
{
in = new ObjectInputStream(bufin);
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServerData.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServerData.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServerData.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServerData.java Mon Aug 29 07:02:55 2005
@@ -253,7 +253,7 @@
url.append("://");
url.append(getServerName());
if ((getServerScheme().equals(URIConstants.HTTP)
- && getServerPort() != URIConstants.HTTP_PORT)
+ && getServerPort() != URIConstants.HTTP_PORT)
||
(getServerScheme().equals(URIConstants.HTTPS)
&& getServerPort() != URIConstants.HTTPS_PORT)
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServletUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServletUtils.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServletUtils.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/ServletUtils.java Mon Aug 29 07:02:55 2005
@@ -55,7 +55,7 @@
/**
* The part of the URI which separates the protocol indicator (i.e. the
- * scheme) from the rest of the URI.
+ * scheme) from the rest of the URI.
* @deprecated use URIConstants.URI_SCHEME_SEPARATOR;
*/
public static final String URI_SCHEME_SEPARATOR = URIConstants.URI_SCHEME_SEPARATOR;
@@ -92,21 +92,21 @@
sb.append(text);
text = sb.toString();
}
-
+
ServletContext context = config.getServletContext();
String base = context.getRealPath("/");
-
+
base = (StringUtils.isEmpty(base))
- ? config.getInitParameter(Turbine.BASEDIR_KEY)
+ ? config.getInitParameter(Turbine.BASEDIR_KEY)
: base;
-
+
if (StringUtils.isEmpty(base))
{
return text;
}
String separator = System.getProperty("path.separator");
-
+
StringTokenizer tokenizer = new StringTokenizer(text,
separator);
StringBuffer buffer = new StringBuffer();
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TSVParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TSVParser.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TSVParser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TSVParser.java Mon Aug 29 07:02:55 2005
@@ -45,7 +45,7 @@
* @version $Id$
* @deprecated Use org.apache.turbine.util.parser.TSVParser instead.
*/
-public class TSVParser
+public class TSVParser
extends org.apache.turbine.util.parser.TSVParser
{
/**
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TurbineConfig.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TurbineConfig.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TurbineConfig.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/TurbineConfig.java Mon Aug 29 07:02:55 2005
@@ -78,7 +78,7 @@
* Servlet initialization parameter name for the path to
* TurbineConfiguration.xml file used by Turbine
*/
- public static final String CONFIGURATION_PATH_KEY = "configuration";
+ public static final String CONFIGURATION_PATH_KEY = "configuration";
/**
* Servlet initialization parameter name for the path to
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java Mon Aug 29 07:02:55 2005
@@ -169,7 +169,7 @@
String enc = request.getCharacterEncoding();
setCharacterEncoding(enc != null
- ? enc
+ ? enc
: TurbineConstants.PARAMETER_ENCODING_DEFAULT);
// String object re-use at its best.
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/PermissionSet.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/PermissionSet.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/PermissionSet.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/PermissionSet.java Mon Aug 29 07:02:55 2005
@@ -180,7 +180,7 @@
*/
public Permission getPermissionById(int permissionId)
{
- return (permissionId != 0)
+ return (permissionId != 0)
? (Permission) idMap.get(new Integer(permissionId)) : null;
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/RoleSet.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/RoleSet.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/RoleSet.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/RoleSet.java Mon Aug 29 07:02:55 2005
@@ -178,7 +178,7 @@
*/
public Role getRoleById(int roleId)
{
- return (roleId != 0)
+ return (roleId != 0)
? (Role) idMap.get(new Integer(roleId)) : null;
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java Mon Aug 29 07:02:55 2005
@@ -624,16 +624,16 @@
}
}
-
+
/**
- * Retrieve the default Doctype as configured by the
- * TurbineResources.peoperties
+ * Retrieve the default Doctype as configured by the
+ * TurbineResources.peoperties
* default.doctype.root.element, default.doctype.identifier and
- * default.doctype.url properties (defaults are "HTML",
- * "-//W3C//DTD HTML 4.01 Transitional//EN" and
+ * default.doctype.url properties (defaults are "HTML",
+ * "-//W3C//DTD HTML 4.01 Transitional//EN" and
* "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd" respectively).
- *
- * @return the DOCTYPE tag constructed from the properties in
+ *
+ * @return the DOCTYPE tag constructed from the properties in
* TurbineResources.properties.
*/
public String getDefaultDoctype()
@@ -664,10 +664,10 @@
}
return doctype;
}
-
+
/**
* Build the doctype element.
- *
+ *
* @param tag the tag whose DTD is being declared.
* @param identifier the identifier for the doctype declaration.
* @param uri the uri for the doctype declaration.
@@ -694,5 +694,5 @@
return doctypeBuf.toString();
}
-
+
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateInfo.java Mon Aug 29 07:02:55 2005
@@ -87,7 +87,7 @@
/**
* Get the value of screen for the RunData parameters. This
- * information comes from PathInfo or a QueryString.
+ * information comes from PathInfo or a QueryString.
*
* @return A String with the value of screen.
*/
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateNavigation.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateNavigation.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateNavigation.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateNavigation.java Mon Aug 29 07:02:55 2005
@@ -50,7 +50,7 @@
private RunData data;
/* The name of the navigation template. */
- private String template = null;
+ private String template = null;
/**
* Constructor
@@ -96,14 +96,14 @@
data.getTemplateInfo().setNavigationTemplate(template);
module = TurbineTemplate.getNavigationName(template);
-
+
if (module == null)
{
returnValue = "Template Service returned null for Navigation Template " + template;
throw new Exception(returnValue);
}
-
- ConcreteElement results =
+
+ ConcreteElement results =
NavigationLoader.getInstance().eval(data, module);
returnValue = results.toString();
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/uri/URIParam.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/uri/URIParam.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/uri/URIParam.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/uri/URIParam.java Mon Aug 29 07:02:55 2005
@@ -19,7 +19,7 @@
import org.apache.commons.lang.StringUtils;
/**
- * Helper Class to keep a key and a value together in
+ * Helper Class to keep a key and a value together in
* one object. Used for URI Parameters
*
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
@@ -30,10 +30,10 @@
{
/** Key */
private String key = null;
-
+
/** Value */
private Object value = null;
-
+
/**
* Creates a new Object from Key and Value
*
@@ -46,7 +46,7 @@
this.key = key;
this.value = value;
}
-
+
/**
* Returns the key.
*
@@ -57,7 +57,7 @@
{
return (StringUtils.isNotEmpty(key)) ? key : "";
}
-
+
/**
* Returns the value.
*
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java Mon Aug 29 07:02:55 2005
@@ -140,7 +140,7 @@
// Attempt to execute things the old way..
if (log.isDebugEnabled())
{
- log.debug("Couldn't locate the Event ( " + theButton
+ log.debug("Couldn't locate the Event ( " + theButton
+ "), running executeEvents() in "
+ super.getClass().getName());
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/macros/TurbineMacros.vm
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/macros/TurbineMacros.vm?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/macros/TurbineMacros.vm (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/macros/TurbineMacros.vm Mon Aug 29 07:02:55 2005
@@ -19,7 +19,7 @@
##
## Build the <head> ... </head> tag of a web page with VelocityOnly Layout
-##
+##
#macro (TurbineHtmlHead)
<head>
@@ -63,7 +63,7 @@
##
## Build the Tags for the Body start tag of a web page with VelocityOnly Layout
## <body #TurbineHtmlBodyAttributes() >
-##
+##
#macro (TurbineHtmlBodyAttributes)
#if ($page.BodyAttributes.size() > 0)
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/cactus/web.xml
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/cactus/web.xml?rev=264142&r1=264141&r2=264142&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/cactus/web.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/cactus/web.xml Mon Aug 29 07:02:55 2005
@@ -40,7 +40,7 @@
<param-value>value1 used for testing</param-value>
</init-param>
</servlet>
-
+
<servlet-mapping>
<servlet-name>ServletRedirector</servlet-name>
<url-pattern>/ServletRedirector/</url-pattern>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org