svn commit: r154021 - in jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator: Field.java Form.java ValidatorResources.java util/ValidatorUtils.java
Author: dgraham
Date: Wed Feb 16 06:38:37 2005
New Revision: 154021
URL: http://svn.apache.org/viewcvs?view=revrev=154021
Log:
Deprecated all FastHashMap usage and provided protected
get methods that return generic Maps to be used by subclasses.
Removed:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Field.java
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Form.java
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/ValidatorResources.java
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Field.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Field.java?view=diffr1=154020r2=154021
==
---
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Field.java
(original)
+++
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Field.java
Wed Feb 16 06:38:37 2005
@@ -41,10 +41,10 @@
* message information and variables to perform the validations and generate
* error messages. Instances of this class are configured with a
* lt;fieldgt; xml element.
- *
+ * p
* The use of FastHashMap is deprecated and will be replaced in a future
* release.
- *
+ * /p
* @see org.apache.commons.validator.Form
*/
public class Field implements Cloneable, Serializable {
@@ -87,8 +87,14 @@
*/
private List dependencyList = Collections.synchronizedList(new
ArrayList());
+/**
+ * @deprecated Subclasses should use getVarMap() instead.
+ */
protected FastHashMap hVars = new FastHashMap();
-
+
+/**
+ * @deprecated Subclasses should use getMsgMap() instead.
+ */
protected FastHashMap hMsgs = new FastHashMap();
/**
@@ -223,7 +229,7 @@
* @since Validator 1.1.4
*/
public Msg getMessage(String key) {
-return (Msg)hMsgs.get(key);
+return (Msg) hMsgs.get(key);
}
/**
@@ -246,8 +252,7 @@
}
determineArgPosition(arg);
-
-this.ensureArgsCapacity(arg);
+ensureArgsCapacity(arg);
Map argMap = this.args[arg.getPosition()];
if (argMap == null) {
@@ -796,11 +801,24 @@
* @throws ValidatorException
*/
private void handleMissingAction(String name) throws ValidatorException {
-throw new ValidatorException(
-No ValidatorAction named
-+ name
-+ found for field
-+ this.getProperty());
+throw new ValidatorException(No ValidatorAction named + name
++ found for field + this.getProperty());
+}
+
+/**
+ * Returns a Map of String Msg names to Msg objects.
+ * @since Validator 1.2.0
+ */
+protected Map getMsgMap() {
+return hMsgs;
+}
+
+/**
+ * Returns a Map of String Var names to Var objects.
+ * @since Validator 1.2.0
+ */
+protected Map getVarMap() {
+return hVars;
}
}
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Form.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Form.java?view=diffr1=154020r2=154021
==
---
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Form.java
(original)
+++
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/Form.java
Wed Feb 16 06:38:37 2005
@@ -44,8 +44,7 @@
public class Form implements Serializable {
/**
- * The name/key the set of validation rules is
- * stored under.
+ * The name/key the set of validation rules is stored under.
*/
protected String name = null;
@@ -59,6 +58,7 @@
/**
* Map of codeField/codes keyed on their property value.
+ * @deprecated Subclasses should use getFieldMap() instead.
*/
protected FastHashMap hFields = new FastHashMap();
@@ -228,8 +228,8 @@
* Sets the name/key of the parent set of validation rules.
* @since Validator 1.2.0
*/
-public void setExtends(String string) {
-inherit = string;
+public void setExtends(String inherit) {
+this.inherit = inherit;
}
/**
@@ -238,5 +238,13 @@
*/
public boolean isExtending() {
return inherit != null;
+}
+
+/**
+ * Returns a Map of String field keys to Field objects.
+ * @since Validator 1.2.0
+ */
+protected Map getFieldMap() {
+return hFields;
}
}
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator
svn commit: r154025 - jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java
Author: dgraham
Date: Wed Feb 16 06:50:57 2005
New Revision: 154025
URL: http://svn.apache.org/viewcvs?view=revrev=154025
Log:
Add ValidatorUtils class back after Subclipse somehow deleted it.
This includes a new copyMap() method to deprecate
FastHashMap usage.
Added:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java
Added:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java?view=autorev=154025
==
---
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java
(added)
+++
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/util/ValidatorUtils.java
Wed Feb 16 06:50:57 2005
@@ -0,0 +1,189 @@
+/*
+ * $Id: ValidatorUtils.java 153692 2005-02-14 01:33:31Z niallp $
+ * $Rev$
+ * $Date: 2005-02-13 18:33:31 -0700 (Sun, 13 Feb 2005) $
+ *
+ *
+ * Copyright 2001-2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.validator.util;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.FastHashMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.validator.Arg;
+import org.apache.commons.validator.Msg;
+import org.apache.commons.validator.Var;
+
+/**
+ * Basic utility methods.
+ * p
+ * The use of FastHashMap is deprecated and will be replaced in a future
+ * release.
+ * /p
+ */
+public class ValidatorUtils {
+
+private static final Log log = LogFactory.getLog(ValidatorUtils.class);
+
+/**
+ * pReplace part of a codeString/code with another value./p
+ *
+ * @param value codeString/code to perform the replacement on.
+ * @param key The name of the constant.
+ * @param replaceValue The value of the constant.
+ */
+public static String replace(String value, String key, String
replaceValue) {
+
+if (value == null || key == null || replaceValue == null) {
+return value;
+}
+
+int pos = value.indexOf(key);
+
+if (pos 0) {
+return value;
+}
+
+int length = value.length();
+int start = pos;
+int end = pos + key.length();
+
+if (length == key.length()) {
+value = replaceValue;
+
+} else if (end == length) {
+value = value.substring(0, start) + replaceValue;
+
+} else {
+value =
+value.substring(0, start)
++ replaceValue
++ replace(value.substring(end), key, replaceValue);
+}
+
+return value;
+}
+
+/**
+ * Convenience method for getting a value from a bean property as a
+ * codeString/code. If the property is a codeString[]/code or
+ * codeCollection/code and it is empty, an empty codeString/code
+ * is returned. Otherwise, property.toString() is returned. This
method
+ * may return codenull/code if there was an error retrieving the
+ * property.
+ */
+public static String getValueAsString(Object bean, String property) {
+Object value = null;
+
+try {
+value = PropertyUtils.getProperty(bean, property);
+
+} catch(IllegalAccessException e) {
+log.error(e.getMessage(), e);
+} catch(InvocationTargetException e) {
+log.error(e.getMessage(), e);
+} catch(NoSuchMethodException e) {
+log.error(e.getMessage(), e);
+}
+
+if (value == null) {
+return null;
+}
+
+if (value instanceof String[]) {
+return ((String[]) value).length 0 ? value.toString() : ;
+
+} else if (value instanceof Collection) {
+return ((Collection) value).isEmpty() ? : value.toString();
+
+} else {
+return value.toString();
+}
+
+}
+
+/**
+ * Makes a deep copy
cvs commit: jakarta-commons/validator project.xml
dgraham 2005/01/01 13:03:41 Modified:validator project.xml Log: Use mail-archives.apache.org url. Revision ChangesPath 1.59 +2 -2 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- project.xml 31 Dec 2004 16:31:17 - 1.58 +++ project.xml 1 Jan 2005 21:03:41 - 1.59 @@ -63,13 +63,13 @@ nameCommons Dev List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList mailingList nameCommons User List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList /mailingLists - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2005/01/01 13:03:41 Modified:dbutils project.xml Log: Use mail-archives.apache.org url. Revision ChangesPath 1.21 +2 -2 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- project.xml 31 Dec 2004 16:31:17 - 1.20 +++ project.xml 1 Jan 2005 21:03:41 - 1.21 @@ -58,13 +58,13 @@ nameCommons Dev List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList mailingList nameCommons User List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList /mailingLists - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/12/31 08:31:17 Modified:validator/xdocs faq.fml community.xml validator project.xml Log: Removed references to nagoya since that machine is going away. Revision ChangesPath 1.3 +1 -1 jakarta-commons/validator/xdocs/faq.fml Index: faq.fml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/faq.fml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- faq.fml 29 Feb 2004 09:48:28 - 1.2 +++ faq.fml 31 Dec 2004 16:31:16 - 1.3 @@ -26,7 +26,7 @@ section name=Frequently Asked Questions p This document will be derived from the FAQ maintained in the - a href='http://nagoya.apache.org/wiki/apachewiki.cgi?ValidatorProjectPages' + a href='http://wiki.apache.org/jakarta-commons/Validator' Validator Wiki/a.So these questions and answers are user provided. and should be searched before posting to the mailing lists. /p 1.4 +1 -1 jakarta-commons/validator/xdocs/community.xml Index: community.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/community.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- community.xml 28 Mar 2004 00:12:04 - 1.3 +++ community.xml 31 Dec 2004 16:31:16 - 1.4 @@ -24,7 +24,7 @@ section name=On The Apache Wiki p The Apache Wiki is a Wiki run by Apache for the Apache community. The Validator Wiki home page is - a href='http://nagoya.apache.org/wiki/apachewiki.cgi?ValidatorProjectPages'here/a. + a href='http://wiki.apache.org/jakarta-commons/Validator'here/a. /p p Anyone is welcome to create new content about Validator providing that they 1.58 +2 -2 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- project.xml 26 Nov 2004 21:16:05 - 1.57 +++ project.xml 31 Dec 2004 16:31:17 - 1.58 @@ -63,13 +63,13 @@ nameCommons Dev List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList mailingList nameCommons User List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList /mailingLists - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/12/31 08:31:17 Modified:dbutils project.xml Log: Removed references to nagoya since that machine is going away. Revision ChangesPath 1.20 +2 -2 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- project.xml 19 Dec 2004 02:59:49 - 1.19 +++ project.xml 31 Dec 2004 16:31:17 - 1.20 @@ -58,13 +58,13 @@ nameCommons Dev List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList mailingList nameCommons User List/name subscribe[EMAIL PROTECTED]/subscribe unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]/archive + archivehttp://issues.apache.org/eyebrowse/[EMAIL PROTECTED]/archive /mailingList /mailingLists - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs examples.xml
dgraham 2004/12/18 17:15:33 Modified:dbutils/xdocs examples.xml Log: Added tips for mapping strange column names to bean properties. PR: 32414 Revision ChangesPath 1.7 +20 -0 jakarta-commons/dbutils/xdocs/examples.xml Index: examples.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/examples.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- examples.xml 19 Mar 2004 00:25:39 - 1.6 +++ examples.xml 19 Dec 2004 01:15:33 - 1.7 @@ -149,6 +149,26 @@ your application. The provided implementation delegates datatype conversion to the JDBC driver. /p +p +BeanProcessor maps columns to bean properties as documented in the +a href=apidocs/org/apache/commons/dbutils/BeanProcessor.html#toBean(java.sql.ResultSet,%20java.lang.Class)BeanProcessor.toBean()/a javadoc. +Column names must match the bean's property names case insensitively. +For example, the codefirstname/code column would be stored in the bean +by calling its codesetFirstName()/code method. However, many database +column names include characters that either can't be used or are not typically +used in Java method names. You can do one of the following to map +these columns to bean properties: +ol +li +Alias the column names in the SQL so they match the Java names: +codeselect social_sec# as socialSecurityNumber from person/code +/li +li +Subclass BeanProcessor and override the a href=apidocs/org/apache/commons/dbutils/BeanProcessor.html#mapColumnsToProperties(java.sql.ResultSetMetaData,%20java.beans.PropertyDescriptor[])mapColumnsToProperties()/a +method to strip out the offending characters. +/li +/ol +/p /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/12/18 17:22:55 Modified:dbutils project.xml Log: Added Markus Khouri to list of contributors for bug 32414. Revision ChangesPath 1.18 +9 -0 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- project.xml 1 Nov 2004 03:08:11 - 1.17 +++ project.xml 19 Dec 2004 01:22:55 - 1.18 @@ -136,6 +136,15 @@ /roles /contributor contributor + nameMarkus Khouri/name + id/id + email[EMAIL PROTECTED]/email + organization/organization + roles +roleDocumentation/role + /roles +/contributor +contributor nameCorby Page/name id/id email/email - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/handlers ScalarHandlerTest.java
dgraham 2004/12/18 18:38:19
Modified:dbutils/src/test/org/apache/commons/dbutils/handlers
ScalarHandlerTest.java
Log:
Removed unnecessary casts to Object.
Revision ChangesPath
1.4 +31 -41
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java
Index: ScalarHandlerTest.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/handlers/ScalarHandlerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScalarHandlerTest.java28 Feb 2004 00:12:23 - 1.3
+++ ScalarHandlerTest.java19 Dec 2004 02:38:19 - 1.4
@@ -20,47 +20,37 @@
import org.apache.commons.dbutils.BaseTestCase;
import org.apache.commons.dbutils.ResultSetHandler;
-/**
- * ScalarHandlerTest
- */
public class ScalarHandlerTest extends BaseTestCase {
- /**
- * Constructor for ScalarHandlerTest.
- */
- public ScalarHandlerTest(String name) {
- super(name);
- }
-
- public void testHandle() throws SQLException {
- ResultSetHandler h = new ScalarHandler();
- Object results = (Object) h.handle(this.rs);
-
- assertNotNull(results);
- assertEquals(1, results);
- }
-
- public void testColumnIndexHandle() throws SQLException {
- ResultSetHandler h = new ScalarHandler(2);
- Object results = (Object) h.handle(this.rs);
-
- assertNotNull(results);
- assertEquals(2, results);
- }
-
- public void testColumnNameHandle() throws SQLException {
- ResultSetHandler h = new ScalarHandler(THree);
- Object results = (Object) h.handle(this.rs);
-
- assertNotNull(results);
- assertEquals(3, results);
- }
-
- public void testEmptyResultSetHandle() throws SQLException {
- ResultSetHandler h = new ScalarHandler();
- Object results = (Object) h.handle(this.emptyResultSet);
+public ScalarHandlerTest(String name) {
+super(name);
+}
+
+public void testHandle() throws SQLException {
+ResultSetHandler h = new ScalarHandler();
+Object results = h.handle(this.rs);
+assertNotNull(results);
+assertEquals(1, results);
+}
+
+public void testColumnIndexHandle() throws SQLException {
+ResultSetHandler h = new ScalarHandler(2);
+Object results = h.handle(this.rs);
+assertNotNull(results);
+assertEquals(2, results);
+}
+
+public void testColumnNameHandle() throws SQLException {
+ResultSetHandler h = new ScalarHandler(THree);
+Object results = h.handle(this.rs);
+assertNotNull(results);
+assertEquals(3, results);
+}
+
+public void testEmptyResultSetHandle() throws SQLException {
+ResultSetHandler h = new ScalarHandler();
+Object results = h.handle(this.emptyResultSet);
+assertNull(results);
+}
- assertNull(results);
- }
-
-}
+}
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/wrappers SqlNullCheckedResultSetTest.java
dgraham 2004/12/18 18:42:24
Modified:dbutils/src/test/org/apache/commons/dbutils/wrappers
SqlNullCheckedResultSetTest.java
Log:
Removed unnecessary casts.
Revision ChangesPath
1.5 +13 -29
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
Index: SqlNullCheckedResultSetTest.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SqlNullCheckedResultSetTest.java 28 Feb 2004 00:12:24 - 1.4
+++ SqlNullCheckedResultSetTest.java 19 Dec 2004 02:42:24 - 1.5
@@ -290,24 +290,21 @@
* Tests the getFloat implementation.
*/
public void testGetFloat() throws SQLException {
-
-assertEquals((float) 0, rs.getFloat(1), 0.0);
+assertEquals(0, rs.getFloat(1), 0.0);
assertTrue(rs.wasNull());
-assertEquals((float) 0, rs.getFloat(column), 0.0);
+assertEquals(0, rs.getFloat(column), 0.0);
assertTrue(rs.wasNull());
// Set what gets returned to something other than the default
-float f = (float) 10.0;
+float f = 10;
rs2.setNullFloat(f);
assertEquals(f, rs.getFloat(1), 0.0);
assertEquals(f, rs.getFloat(column), 0.0);
-
}
/**
* Tests the getInt implementation.
*/
public void testGetInt() throws SQLException {
-
assertEquals(0, rs.getInt(1));
assertTrue(rs.wasNull());
assertEquals(0, rs.getInt(column));
@@ -317,24 +314,21 @@
rs2.setNullInt(i);
assertEquals(i, rs.getInt(1));
assertEquals(i, rs.getInt(column));
-
}
/**
* Tests the getLong implementation.
*/
public void testGetLong() throws SQLException {
-
-assertEquals((long) 0, rs.getLong(1));
+assertEquals(0, rs.getLong(1));
assertTrue(rs.wasNull());
-assertEquals((long) 0, rs.getLong(column));
+assertEquals(0, rs.getLong(column));
assertTrue(rs.wasNull());
// Set what gets returned to something other than the default
-long l = (long) 10;
+long l = 10;
rs2.setNullLong(l);
assertEquals(l, rs.getLong(1));
assertEquals(l, rs.getLong(column));
-
}
/**
@@ -648,67 +642,58 @@
* Tests the setNullDouble implementation.
*/
public void testSetNullDouble() throws SQLException {
-
-assertEquals((double) 0.0, rs2.getNullDouble(), 0.0);
+assertEquals(0.0, rs2.getNullDouble(), 0.0);
// Set what gets returned to something other than the default
-double d = (double) 10.0;
+double d = 10.0;
rs2.setNullDouble(d);
assertEquals(d, rs.getDouble(1), 0.0);
assertEquals(d, rs.getDouble(column), 0.0);
-
}
/**
* Tests the setNullFloat implementation.
*/
public void testSetNullFloat() throws SQLException {
-
assertEquals((float) 0.0, rs2.getNullFloat(), 0.0);
// Set what gets returned to something other than the default
float f = (float) 10.0;
rs2.setNullFloat(f);
assertEquals(f, rs.getFloat(1), 0.0);
assertEquals(f, rs.getFloat(column), 0.0);
-
}
/**
* Tests the setNullInt implementation.
*/
public void testSetNullInt() throws SQLException {
-
assertEquals(0, rs2.getNullInt());
-assertEquals((int) 0, rs.getInt(1));
+assertEquals(0, rs.getInt(1));
assertTrue(rs.wasNull());
-assertEquals((int) 0, rs.getInt(column));
+assertEquals(0, rs.getInt(column));
assertTrue(rs.wasNull());
// Set what gets returned to something other than the default
-int i = (int) 10;
+int i = 10;
rs2.setNullInt(i);
assertEquals(i, rs.getInt(1));
assertEquals(i, rs.getInt(column));
-
}
/**
* Tests the setNullLong implementation.
*/
public void testSetNullLong() throws SQLException {
-
-assertEquals((long) 0, rs2.getNullLong());
+assertEquals(0, rs2.getNullLong());
// Set what gets returned to something other than the default
-long l = (long) 10;
+long l = 10;
rs2.setNullLong(l);
assertEquals(l, rs.getLong(1));
assertEquals(l, rs.getLong(column));
-
}
/**
* Tests the setNullObject implementation.
*/
public void testSetNullObject() throws SQLException
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/12/18 18:59:49
Modified:dbutils/xdocs changes.xml
dbutils/src/test/org/apache/commons/dbutils
BaseTestCase.java
dbutils project.xml
Added: dbutils/src/test/org/apache/commons/dbutils/handlers
KeyedHandlerTest.java
dbutils/src/java/org/apache/commons/dbutils/handlers
KeyedHandler.java
Log:
Added KeyedHandler to create a Map of Maps from a ResultSet.
PR: 31446
Revision ChangesPath
1.1
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/handlers/KeyedHandlerTest.java
Index: KeyedHandlerTest.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.dbutils.handlers;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.Map;
import org.apache.commons.dbutils.BaseTestCase;
import org.apache.commons.dbutils.ResultSetHandler;
public class KeyedHandlerTest extends BaseTestCase {
public KeyedHandlerTest(String name) {
super(name);
}
public void testHandle() throws SQLException {
ResultSetHandler h = new KeyedHandler();
Map results = (Map) h.handle(this.rs);
assertNotNull(results);
assertEquals(ROWS, results.size());
Iterator iter = results.keySet().iterator();
Map row = null;
while (iter.hasNext()) {
Object key = iter.next();
assertNotNull(key);
row = (Map) results.get(key);
assertNotNull(row);
assertEquals(COLS, row.keySet().size());
}
row = (Map) results.get(1);
assertEquals(1, row.get(one));
assertEquals(2, row.get(TWO));
assertEquals(3, row.get(Three));
}
public void testColumnIndexHandle() throws SQLException {
ResultSetHandler h = new KeyedHandler(2);
Map results = (Map) h.handle(this.rs);
assertNotNull(results);
assertEquals(ROWS, results.size());
Iterator iter = results.keySet().iterator();
Map row = null;
while (iter.hasNext()) {
Object key = iter.next();
assertNotNull(key);
row = (Map) results.get(key);
assertNotNull(row);
assertEquals(COLS, row.keySet().size());
}
row = (Map) results.get(5);
assertEquals(4, row.get(one));
assertEquals(5, row.get(TWO));
assertEquals(6, row.get(Three));
}
public void testColumnNameHandle() throws SQLException {
ResultSetHandler h = new KeyedHandler(three);
Map results = (Map) h.handle(this.rs);
assertNotNull(results);
assertEquals(ROWS, results.size());
Iterator iter = results.keySet().iterator();
Map row = null;
while (iter.hasNext()) {
Object key = iter.next();
assertNotNull(key);
row = (Map) results.get(key);
assertNotNull(row);
assertEquals(COLS, row.keySet().size());
}
row = (Map) results.get(6);
assertEquals(4, row.get(one));
assertEquals(5, row.get(TWO));
assertEquals(6, row.get(Three));
}
public void testEmptyResultSetHandle() throws SQLException {
ResultSetHandler h = new KeyedHandler();
Map results = (Map) h.handle(this.emptyResultSet);
assertNotNull(results);
assertTrue(results.isEmpty());
}
}
1.1
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Index: KeyedHandler.java
===
/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils ResultSetIterator.java
dgraham 2004/12/18 19:25:06
Modified:dbutils/src/java/org/apache/commons/dbutils
ResultSetIterator.java
Log:
Removed TODOs.
Revision ChangesPath
1.5 +0 -9
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/ResultSetIterator.java
Index: ResultSetIterator.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/ResultSetIterator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultSetIterator.java28 Feb 2004 00:12:23 - 1.4
+++ ResultSetIterator.java19 Dec 2004 03:25:06 - 1.5
@@ -66,10 +66,7 @@
public boolean hasNext() {
try {
return !rs.isLast();
-
} catch (SQLException e) {
-// TODO Logging?
-//e.printStackTrace();
return false;
}
}
@@ -84,10 +81,7 @@
try {
rs.next();
return this.convert.toArray(rs);
-
} catch (SQLException e) {
-// TODO Logging?
-//e.printStackTrace();
return null;
}
}
@@ -99,10 +93,7 @@
public void remove() {
try {
this.rs.deleteRow();
-
} catch (SQLException e) {
-// TODO Logging?
-//e.printStackTrace();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/11/26 12:55:49 Modified:validator project.xml Log: Updated dependency versions to latest releases for commons-logging, commons-beanutils, commons-digester, and commons-collections. Updated version number to 1.2.0-dev and alphabetized the developer list. Revision ChangesPath 1.55 +23 -23jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- project.xml 12 Nov 2004 17:53:07 - 1.54 +++ project.xml 26 Nov 2004 20:55:49 - 1.55 @@ -20,7 +20,7 @@ nameValidator/name idcommons-validator/id - currentVersion1.1.4/currentVersion + currentVersion1.2.0-dev/currentVersion inceptionYear2002/inceptionYear shortDescriptionCommons Validator/shortDescription description @@ -75,6 +75,12 @@ developers developer + nameDon Brown/name + idmrdon/id + email[EMAIL PROTECTED]/email + organization/organization +/developer +developer nameMartin Cooper/name idmartinc/id email[EMAIL PROTECTED]/email @@ -105,24 +111,6 @@ organization/organization /developer developer - nameJames Turner/name - idturner/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer - nameDavid Winterfeldt/name - iddwinterfeldt/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer - nameDon Brown/name - idmrdon/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer nameJames Mitchell/name idjmitchell/id emailjmitchell NOSPAM apache.org/email @@ -134,6 +122,18 @@ emailniallp NOSPAM apache.org/email organization/organization /developer +developer + nameJames Turner/name + idturner/id + email[EMAIL PROTECTED]/email + organization/organization +/developer +developer + nameDavid Winterfeldt/name + iddwinterfeldt/id + email[EMAIL PROTECTED]/email + organization/organization +/developer /developers contributors @@ -270,25 +270,25 @@ dependency idcommons-beanutils/id - version1.6.1/version + version1.7.0/version urlhttp://jakarta.apache.org/commons/beanutils.html/url /dependency dependency idcommons-collections/id - version2.1/version + version3.1/version urlhttp://jakarta.apache.org/commons/collections.html/url /dependency dependency idcommons-digester/id - version1.5/version + version1.6/version urlhttp://jakarta.apache.org/commons/digester.html/url /dependency dependency idcommons-logging/id - version1.0.3/version + version1.0.4/version urlhttp://jakarta.apache.org/commons/logging.html/url /dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/11/26 13:08:27 Modified:validator project.xml Log: Removed the commons-collections dependency because we only use FastHashMap which is included in the commons-beanutils 1.7.0 release. Our usage of FastHashMap has been deprecated for some time so we could remove those references soon anyways. Revision ChangesPath 1.56 +0 -6 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- project.xml 26 Nov 2004 20:55:49 - 1.55 +++ project.xml 26 Nov 2004 21:08:27 - 1.56 @@ -275,12 +275,6 @@ /dependency dependency - idcommons-collections/id - version3.1/version - urlhttp://jakarta.apache.org/commons/collections.html/url -/dependency - -dependency idcommons-digester/id version1.6/version urlhttp://jakarta.apache.org/commons/digester.html/url - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/11/26 13:16:05 Modified:validator project.xml Log: Fixed beanutils, logging, and digester dependency urls. Revision ChangesPath 1.57 +4 -4 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- project.xml 26 Nov 2004 21:08:27 - 1.56 +++ project.xml 26 Nov 2004 21:16:05 - 1.57 @@ -271,19 +271,19 @@ dependency idcommons-beanutils/id version1.7.0/version - urlhttp://jakarta.apache.org/commons/beanutils.html/url + urlhttp://jakarta.apache.org/commons/beanutils//url /dependency dependency idcommons-digester/id version1.6/version - urlhttp://jakarta.apache.org/commons/digester.html/url + urlhttp://jakarta.apache.org/commons/digester//url /dependency dependency idcommons-logging/id version1.0.4/version - urlhttp://jakarta.apache.org/commons/logging.html/url + urlhttp://jakarta.apache.org/commons/logging//url /dependency dependency @@ -302,7 +302,7 @@ dependency idjunit/id version3.8.1/version - urlhttp://www.junit.org/url + urlhttp://www.junit.org//url /dependency /dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator GenericTypeValidator.java
dgraham 2004/11/26 13:25:12
Modified:validator/src/share/org/apache/commons/validator/util
ValidatorUtils.java
validator/src/share/org/apache/commons/validator
GenericTypeValidator.java
Log:
Made Log instance final.
Revision ChangesPath
1.9 +5 -11
jakarta-commons/validator/src/share/org/apache/commons/validator/util/ValidatorUtils.java
Index: ValidatorUtils.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/util/ValidatorUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ValidatorUtils.java 8 Jun 2004 17:17:44 - 1.8
+++ ValidatorUtils.java 26 Nov 2004 21:25:12 - 1.9
@@ -41,10 +41,7 @@
*/
public class ValidatorUtils {
-/**
- * Logger.
- */
-private static Log log = LogFactory.getLog(ValidatorUtils.class);
+private static final Log log = LogFactory.getLog(ValidatorUtils.class);
/**
* pReplace part of a codeString/code with another value./p
@@ -53,10 +50,7 @@
* @param key The name of the constant.
* @param replaceValue The value of the constant.
*/
-public static String replace(
-String value,
-String key,
-String replaceValue) {
+public static String replace(String value, String key, String
replaceValue) {
if (value == null || key == null || replaceValue == null) {
return value;
1.15 +4 -4
jakarta-commons/validator/src/share/org/apache/commons/validator/GenericTypeValidator.java
Index: GenericTypeValidator.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/GenericTypeValidator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- GenericTypeValidator.java 9 Apr 2004 00:16:39 - 1.14
+++ GenericTypeValidator.java 26 Nov 2004 21:25:12 - 1.15
@@ -36,7 +36,7 @@
*/
public class GenericTypeValidator implements Serializable {
- private static Log log = LogFactory.getLog(GenericTypeValidator.class);
+ private static final Log log =
LogFactory.getLog(GenericTypeValidator.class);
/**
* Checks if the value can safely be converted to a byte primitive.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/test/org/apache/commons/validator TestCommon.java TestNumber.java ExtensionTest.java
dgraham 2004/11/26 13:35:19
Modified:validator/src/test/org/apache/commons/validator
TestCommon.java TestNumber.java ExtensionTest.java
Log:
Removed logging from tests. They should either pass or fail without
requiring us to look through log messages.
Revision ChangesPath
1.7 +5 -21
jakarta-commons/validator/src/test/org/apache/commons/validator/TestCommon.java
Index: TestCommon.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/TestCommon.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestCommon.java 21 Feb 2004 17:10:30 - 1.6
+++ TestCommon.java 26 Nov 2004 21:35:19 - 1.7
@@ -25,8 +25,6 @@
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.xml.sax.SAXException;
/**
@@ -38,11 +36,6 @@
* Resources used for validation tests.
*/
protected ValidatorResources resources = null;
-
-/**
- * Commons Logging instance.
- */
-protected Log log = LogFactory.getLog(this.getClass());
public TestCommon(String string) {
super(string);
@@ -59,19 +52,10 @@
try {
in = this.getClass().getResourceAsStream(file);
resources = new ValidatorResources(in);
-
-} catch (IOException e) {
-log.error(e.getMessage(), e);
-throw e;
-
} finally {
if (in != null) {
-try {
-in.close();
-} catch (IOException e) {
-log.error(e.getMessage(), e);
-}
-}
+ in.close();
+ }
}
}
}
1.5 +4 -10
jakarta-commons/validator/src/test/org/apache/commons/validator/TestNumber.java
Index: TestNumber.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/TestNumber.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestNumber.java 21 Feb 2004 17:10:30 - 1.4
+++ TestNumber.java 26 Nov 2004 21:35:19 - 1.5
@@ -18,7 +18,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.commons.validator;
import java.io.IOException;
@@ -65,9 +65,6 @@
// Create bean to run test on.
ValueBean info = new ValueBean();
info.setValue(0);
-if (log.isDebugEnabled()) {
-log.debug(testNumberFailure Action= + ACTION + , FORM_KEY= +
FORM_KEY);
-}
valueTest(info, true);
}
@@ -77,9 +74,6 @@
public void testNumberFailure() throws ValidatorException {
// Create bean to run test on.
ValueBean info = new ValueBean();
-if (log.isDebugEnabled()) {
-log.debug(testNumberFailure Action= + ACTION + , FORM_KEY= +
FORM_KEY);
-}
valueTest(info, false);
}
1.2 +15 -27
jakarta-commons/validator/src/test/org/apache/commons/validator/ExtensionTest.java
Index: ExtensionTest.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/ExtensionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionTest.java4 Apr 2004 13:53:25 - 1.1
+++ ExtensionTest.java26 Nov 2004 21:35:19 - 1.2
@@ -27,9 +27,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* pPerforms tests for extension in form definitions. Performs the same
tests
* RequiredNameTest does but with an equivalent validation definition with
extension
@@ -61,12 +58,6 @@
*/
protected static String ACTION = required;
-
-/**
- * Commons Logging instance.
-*/
-private Log log = LogFactory.getLog(this.getClass());
-
/**
* Resources used for validation tests.
*/
@@ -103,21 +94,18 @@
* validator-extension.xml.
*/
protected void setUp() throws Exception {
- // Load resources
- InputStream in = null;
+ // Load resources
+ InputStream in = null;
- try {
- in =
this.getClass().getResourceAsStream(validator-extension.xml);
- resources = new
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/wrappers StringTrimmedResultSet.java
dgraham 2004/10/31 12:56:12
Modified:dbutils/src/java/org/apache/commons/dbutils/wrappers
StringTrimmedResultSet.java
Log:
Removed reference to deprecated BasicRowProcessor.instance() from
javadoc.
Revision ChangesPath
1.4 +1 -1
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java
Index: StringTrimmedResultSet.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/wrappers/StringTrimmedResultSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringTrimmedResultSet.java 28 Feb 2004 00:12:24 - 1.3
+++ StringTrimmedResultSet.java 31 Oct 2004 20:56:12 - 1.4
@@ -39,7 +39,7 @@
* rs = StringTrimmedResultSet.wrap(rs);
*
* // Pass wrapped ResultSet to processor
- * List list = BasicRowProcessor.instance().toBeanList(rs);
+ * List list = new BasicRowProcessor().toBeanList(rs);
* /pre
*/
public class StringTrimmedResultSet implements InvocationHandler {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/test/org/apache/commons/dbutils MockResultSet.java MockResultSetMetaData.java
dgraham 2004/10/31 19:08:12
Modified:dbutils project.xml
dbutils/src/test/org/apache/commons/dbutils
MockResultSet.java MockResultSetMetaData.java
Log:
Implemented hashCode, toString, and equals for proxies. PR: 31786
Revision ChangesPath
1.17 +9 -4 jakarta-commons/dbutils/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 10 Apr 2004 19:49:12 - 1.16
+++ project.xml 1 Nov 2004 03:08:11 - 1.17
@@ -144,21 +144,26 @@
roleJava Developer/role
/roles
/contributor
+contributor
+ nameMichael Schuerig/name
+ id/id
+ email[EMAIL PROTECTED]/email
+ organization/organization
+ roles
+roleJava Developer/role
+ /roles
+/contributor
/contributors
dependencies
-
dependency
idjunit/id
version3.8.1/version
urlhttp://www.junit.org//url
/dependency
-
/dependencies
-
build
-
nagEmailAddress[EMAIL PROTECTED]/nagEmailAddress
sourceDirectorysrc/java/sourceDirectory
unitTestSourceDirectorysrc/test/unitTestSourceDirectory
1.5 +12 -7
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSet.java
Index: MockResultSet.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockResultSet.java28 Feb 2004 00:12:22 - 1.4
+++ MockResultSet.java1 Nov 2004 03:08:12 - 1.5
@@ -37,12 +37,9 @@
*
* @param metaData
* @param rows A null value indicates an empty codeResultSet/code.
- * @return
*/
-public static ResultSet create(
-ResultSetMetaData metaData,
-Object[][] rows) {
-
+public static ResultSet create(ResultSetMetaData metaData,
+Object[][] rows) {
return ProxyFactory.instance().createResultSet(
new MockResultSet(metaData, rows));
}
@@ -63,8 +60,7 @@
public MockResultSet(ResultSetMetaData metaData, Object[][] rows) {
super();
this.metaData = metaData;
-this.iter =
-(rows == null)
+this.iter = (rows == null)
? Collections.EMPTY_LIST.iterator()
: Arrays.asList(rows).iterator();
}
@@ -308,6 +304,15 @@
} else if (methodName.equals(isLast)) {
return this.isLast();
+
+} else if (methodName.equals(hashCode)) {
+return new Integer(System.identityHashCode(proxy));
+
+} else if (methodName.equals(toString)) {
+return MockResultSet + System.identityHashCode(proxy);
+
+} else if (methodName.equals(equals)) {
+return Boolean.valueOf(proxy == args[0]);
}
return null;
1.4 +9 -0
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java
Index: MockResultSetMetaData.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/MockResultSetMetaData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockResultSetMetaData.java28 Feb 2004 00:12:22 - 1.3
+++ MockResultSetMetaData.java1 Nov 2004 03:08:12 - 1.4
@@ -63,6 +63,15 @@
int col = ((Integer) args[0]).intValue() - 1;
return this.columnNames[col];
+} else if (methodName.equals(hashCode)) {
+return new Integer(System.identityHashCode(proxy));
+
+} else if (methodName.equals(toString)) {
+return MockResultSetMetaData + System.identityHashCode(proxy);
+
+} else if (methodName.equals(equals)) {
+return Boolean.valueOf(proxy == args[0]);
+
// stub out other methods for now
} else {
Class returnType = method.getReturnType();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator UrlValidator.java
dgraham 2004/10/31 19:28:25
Modified:validator/src/share/org/apache/commons/validator
UrlValidator.java
Log:
Simplified PATH_PATTERN regex with \w. PR: 30686
Revision ChangesPath
1.20 +6 -7
jakarta-commons/validator/src/share/org/apache/commons/validator/UrlValidator.java
Index: UrlValidator.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/UrlValidator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- UrlValidator.java 21 Feb 2004 17:10:29 - 1.19
+++ UrlValidator.java 1 Nov 2004 03:28:25 - 1.20
@@ -77,8 +77,8 @@
public class UrlValidator implements Serializable {
/**
- * Allows all validly formatted schemes to pass validation instead of supplying
a
- * set of valid schemes.
+ * Allows all validly formatted schemes to pass validation instead of
+ * supplying a set of valid schemes.
*/
public static final int ALLOW_ALL_SCHEMES = 1 0;
@@ -148,8 +148,7 @@
*/
private static final int PARSE_AUTHORITY_EXTRA = 3;
-private static final String PATH_PATTERN =
-/^(/[-a-zA-Z0-9_:@?=+,.!/~*'%$]*)$/;
+private static final String PATH_PATTERN = /^(/[-\\w:@?=+,.!/~*'%$]*)$/;
private static final String QUERY_PATTERN = /^(.*)$/;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/10/03 08:58:17
Modified:dbutils/src/java/org/apache/commons/dbutils QueryRunner.java
dbutils/xdocs changes.xml
Log:
Changed QueryRunner to call getDataSource() internally instead of
using instance variable directly.
Revision ChangesPath
1.15 +6 -7
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java
Index: QueryRunner.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- QueryRunner.java 23 Aug 2004 01:51:50 - 1.14
+++ QueryRunner.java 3 Oct 2004 15:58:17 - 1.15
@@ -55,7 +55,7 @@
*/
public QueryRunner(DataSource ds) {
super();
-this.ds = ds;
+setDataSource(ds);
}
/**
@@ -144,7 +144,10 @@
}
/**
- * Returns the codeDataSource/code this runner is using.
+ * Returns the codeDataSource/code this runner is using.
+ * codeQueryRunner/code methods always call this method to get the
+ * codeDataSource/code so subclasses can provide specialized
+ * behavior.
*/
public DataSource getDataSource() {
return this.ds;
@@ -183,7 +186,7 @@
* @since DbUtils 1.1
*/
protected Connection prepareConnection() throws SQLException {
-return this.ds.getConnection();
+return this.getDataSource().getConnection();
}
/**
@@ -224,9 +227,7 @@
try {
stmt = this.prepareStatement(conn, sql);
this.fillStatement(stmt, params);
-
rs = this.wrap(stmt.executeQuery());
-
result = rsh.handle(rs);
} catch (SQLException e) {
@@ -300,7 +301,6 @@
try {
return this.query(conn, sql, params, rsh);
-
} finally {
close(conn);
}
@@ -415,7 +415,6 @@
try {
stmt = this.prepareStatement(conn, sql);
this.fillStatement(stmt, params);
-
rows = stmt.executeUpdate();
} catch (SQLException e) {
1.6 +4 -0 jakarta-commons/dbutils/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 3 Sep 2004 13:14:07 - 1.5
+++ changes.xml 3 Oct 2004 15:58:17 - 1.6
@@ -39,6 +39,10 @@
body
release version=1.1-dev date=in CVS
+ action dev=dgraham type=update
+QueryRunner now calls getDataSource() internally any time it needs access
+to its DataSource object to allow subclasses to provide different behavior.
+ /action
action dev=dgraham type=add
Added DbUtils.rollbackAndClose() and DbUtils.rollbackAndCloseQuietly().
/action
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/10/03 09:14:44
Modified:dbutils/src/java/org/apache/commons/dbutils QueryLoader.java
dbutils/xdocs changes.xml
Log:
Made loadQueries() protected. PR: 31460
Revision ChangesPath
1.4 +10 -6
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryLoader.java
Index: QueryLoader.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QueryLoader.java 28 Feb 2004 00:12:23 - 1.3
+++ QueryLoader.java 3 Oct 2004 16:14:44 - 1.4
@@ -22,10 +22,10 @@
import java.util.Properties;
/**
- * codeQueryLoader/code loads properties files filled with query name to
- * SQL mappings. It acts as a registry for sets of queries so that multiple
- * copies of the same queries aren't loaded into memory. This class is thread
- * safe.
+ * codeQueryLoader/code is a registry for sets of queries so
+ * that multiple copies of the same queries aren't loaded into memory.
+ * This implementation loads properties files filled with query name to
+ * SQL mappings. This class is thread safe.
*/
public class QueryLoader {
@@ -80,11 +80,15 @@
}
/**
- * Loads a properties file into a Map object.
+ * Loads a set of named queries into a Map object. This implementation
+ * reads a properties file at the given path.
* @param path The path that the ClassLoader will use to find the file.
* @throws IOException
+ * @throws IllegalArgumentException if the ClassLoader can't find a file at
+ * the given path.
+ * @since DbUtils 1.1
*/
-private Map loadQueries(String path) throws IOException {
+protected Map loadQueries(String path) throws IOException {
InputStream in = QueryLoader.class.getResourceAsStream(path);
if (in == null) {
1.7 +4 -0 jakarta-commons/dbutils/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 3 Oct 2004 15:58:17 - 1.6
+++ changes.xml 3 Oct 2004 16:14:44 - 1.7
@@ -40,6 +40,10 @@
release version=1.1-dev date=in CVS
action dev=dgraham type=update
+Made QueryLoader.loadQueries() protected so subclasses can use query
+repositories other than properties files. PR: 31460
+ /action
+ action dev=dgraham type=update
QueryRunner now calls getDataSource() internally any time it needs access
to its DataSource object to allow subclasses to provide different behavior.
/action
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/10/03 09:43:44
Modified:dbutils/src/java/org/apache/commons/dbutils QueryLoader.java
dbutils/xdocs changes.xml
Log:
Use current class' ClassLoader in loadQueries(). PR: 31169
Revision ChangesPath
1.5 +1 -1
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryLoader.java
Index: QueryLoader.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- QueryLoader.java 3 Oct 2004 16:14:44 - 1.4
+++ QueryLoader.java 3 Oct 2004 16:43:44 - 1.5
@@ -89,7 +89,7 @@
* @since DbUtils 1.1
*/
protected Map loadQueries(String path) throws IOException {
-InputStream in = QueryLoader.class.getResourceAsStream(path);
+InputStream in = getClass().getResourceAsStream(path);
if (in == null) {
throw new IllegalArgumentException(path + not found.);
1.8 +4 -0 jakarta-commons/dbutils/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 3 Oct 2004 16:14:44 - 1.7
+++ changes.xml 3 Oct 2004 16:43:44 - 1.8
@@ -40,6 +40,10 @@
release version=1.1-dev date=in CVS
action dev=dgraham type=update
+Use current class' ClassLoader instead of QueryLoader's ClassLoader
+in loadQueries(). PR: 31169
+ /action
+ action dev=dgraham type=update
Made QueryLoader.loadQueries() protected so subclasses can use query
repositories other than properties files. PR: 31460
/action
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/10/03 20:54:46
Modified:validator/src/test/org/apache/commons/validator
ValidatorTestSuite.java
validator/xdocs changes.xml
validator project.xml
Added: validator/src/share/org/apache/commons/validator
ISBNValidator.java
validator/src/test/org/apache/commons/validator
ISBNValidatorTest.java
Log:
Added ISBNValidator. PR: 31489
Revision ChangesPath
1.1
jakarta-commons/validator/src/share/org/apache/commons/validator/ISBNValidator.java
Index: ISBNValidator.java
===
/*
* $Header:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/ISBNValidator.java,v
1.1 2004/10/04 03:54:46 dgraham Exp $
* $Revision: 1.1 $
* $Date: 2004/10/04 03:54:46 $
*
*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.validator;
import org.apache.oro.text.perl.Perl5Util;
/**
* A class for validating 10 digit ISBN codes.
* Based on this
* a href=http://www.isbn.org/standards/home/isbn/international/html/usm4.htm;
* algorithm/a
*
* @since Validator 1.2.0
*/
public class ISBNValidator {
private static final String SEP = (\\-|\\s);
private static final String GROUP = (\\d{1,5});
private static final String PUBLISHER = (\\d{1,7});
private static final String TITLE = (\\d{1,6});
private static final String CHECK = ([0-9X]);
/**
* ISBN consists of 4 groups of numbers separated by either dashes (-)
* or spaces. The first group is 1-5 characters, second 1-7, third 1-6,
* and fourth is 1 digit or an X.
*/
private static final String ISBN_PATTERN =
/^ + GROUP + SEP + PUBLISHER + SEP + TITLE + SEP + CHECK + $/;
public ISBNValidator() {
super();
}
/**
* If the ISBN is formatted with space or dash separators its format is
* validated. Then the digits in the number are weighted, summed, and
* divided by 11 according to the ISBN algorithm. If the result is zero,
* the ISBN is valid. This method accepts formatted or raw ISBN codes.
*
* @param isbn Candidate ISBN number to be validated. codenull/code is
* considered invalid.
* @return true if the string is a valid ISBN code.
*/
public boolean isValid(String isbn) {
if (isbn == null || isbn.length() 10 || isbn.length() 13) {
return false;
}
if (isFormatted(isbn) !isValidPattern(isbn)) {
return false;
}
isbn = clean(isbn);
if (isbn.length() != 10) {
return false;
}
return (sum(isbn) % 11) == 0;
}
/**
* Returns the sum of the weighted ISBN characters.
*/
private int sum(String isbn) {
int total = 0;
for (int i = 0; i 9; i++) {
int weight = 10 - i;
total += (weight * toInt(isbn.charAt(i)));
}
total += toInt(isbn.charAt(9)); // add check digit
return total;
}
/**
* Removes all non-digit characters except for 'X' which is a valid ISBN
* character.
*/
private String clean(String isbn) {
StringBuffer buf = new StringBuffer(10);
for (int i = 0; i isbn.length(); i++) {
char digit = isbn.charAt(i);
if (Character.isDigit(digit) || (digit == 'X')) {
buf.append(digit);
}
}
return buf.toString();
}
/**
* Returns the numeric value represented by the character. If the
* character is not a digit but an 'X', 10 is returned.
*/
private int toInt(char ch) {
return (ch == 'X') ? 10 : Character.getNumericValue(ch);
}
/**
* Returns true if the ISBN contains one of the separator characters space
* or dash.
*/
private boolean isFormatted(String isbn) {
return ((isbn.indexOf('-') != -1) || (isbn.indexOf(' ') != -1
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils DbUtils.java
dgraham 2004/09/03 06:01:58
Modified:dbutils/src/java/org/apache/commons/dbutils DbUtils.java
Log:
Minor cleanup.
Revision ChangesPath
1.5 +17 -26
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java
Index: DbUtils.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DbUtils.java 28 Feb 2004 00:12:23 - 1.4
+++ DbUtils.java 3 Sep 2004 13:01:58 - 1.5
@@ -70,24 +70,22 @@
* codeResultSet/code. Avoid closing if null and hide any
* SQLExceptions that occur.
*/
-public static void closeQuietly(
-Connection conn,
-Statement stmt,
-ResultSet rs) {
-
+public static void closeQuietly(Connection conn, Statement stmt,
+ResultSet rs) {
+
closeQuietly(rs);
closeQuietly(stmt);
closeQuietly(conn);
}
/**
- * Close a codeResultSet/code, avoid closing if null and hide
- * any SQLExceptions that occur.
+ * Close a codeResultSet/code, avoid closing if null and hide any
+ * SQLExceptions that occur.
*/
public static void closeQuietly(ResultSet rs) {
try {
close(rs);
-} catch (SQLException sqle) {
+} catch (SQLException e) {
// quiet
}
}
@@ -99,7 +97,7 @@
public static void closeQuietly(Statement stmt) {
try {
close(stmt);
-} catch (SQLException sqle) {
+} catch (SQLException e) {
// quiet
}
}
@@ -121,7 +119,7 @@
public static void commitAndCloseQuietly(Connection conn) {
try {
commitAndClose(conn);
-} catch (SQLException sqle) {
+} catch (SQLException e) {
// quiet
}
}
@@ -136,34 +134,27 @@
return true;
} catch (ClassNotFoundException e) {
-// TODO Logging?
-//e.printStackTrace();
return false;
} catch (IllegalAccessException e) {
-// TODO Logging?
-//e.printStackTrace();
-
// Constructor is private, OK for DriverManager contract
return true;
} catch (InstantiationException e) {
-// TODO Logging?
-//e.printStackTrace();
return false;
-} catch (Throwable t) {
+} catch (Throwable e) {
return false;
}
}
-public static void printStackTrace(SQLException sqle) {
-printStackTrace(sqle, new PrintWriter(System.err));
+public static void printStackTrace(SQLException e) {
+printStackTrace(e, new PrintWriter(System.err));
}
-public static void printStackTrace(SQLException sqle, PrintWriter pw) {
+public static void printStackTrace(SQLException e, PrintWriter pw) {
-SQLException next = sqle;
+SQLException next = e;
while (next != null) {
next.printStackTrace(pw);
next = next.getNextException();
@@ -173,16 +164,16 @@
}
}
-public static void printWarnings(Connection connection) {
-printWarnings(connection, new PrintWriter(System.err));
+public static void printWarnings(Connection conn) {
+printWarnings(conn, new PrintWriter(System.err));
}
public static void printWarnings(Connection conn, PrintWriter pw) {
if (conn != null) {
try {
printStackTrace(conn.getWarnings(), pw);
-} catch (SQLException sqle) {
-printStackTrace(sqle, pw);
+} catch (SQLException e) {
+printStackTrace(e, pw);
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils DbUtils.java
dgraham 2004/09/03 06:04:32
Modified:dbutils/src/java/org/apache/commons/dbutils DbUtils.java
Log:
Added a try/finally block in commitAndClose() to ensure the connection is always
closed.
Revision ChangesPath
1.6 +6 -3
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java
Index: DbUtils.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DbUtils.java 3 Sep 2004 13:01:58 - 1.5
+++ DbUtils.java 3 Sep 2004 13:04:32 - 1.6
@@ -60,7 +60,7 @@
public static void closeQuietly(Connection conn) {
try {
close(conn);
-} catch (SQLException sqle) {
+} catch (SQLException e) {
// quiet
}
}
@@ -107,8 +107,11 @@
*/
public static void commitAndClose(Connection conn) throws SQLException {
if (conn != null) {
-conn.commit();
-conn.close();
+try {
+conn.commit();
+} finally {
+conn.close();
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils DbUtils.java
dgraham 2004/09/03 06:07:30
Modified:dbutils/src/java/org/apache/commons/dbutils DbUtils.java
Log:
Added a try/finally block in closeQuietly() to ensure the connection is always
closed.
Revision ChangesPath
1.7 +10 -3
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java
Index: DbUtils.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DbUtils.java 3 Sep 2004 13:04:32 - 1.6
+++ DbUtils.java 3 Sep 2004 13:07:30 - 1.7
@@ -73,9 +73,16 @@
public static void closeQuietly(Connection conn, Statement stmt,
ResultSet rs) {
-closeQuietly(rs);
-closeQuietly(stmt);
-closeQuietly(conn);
+try {
+closeQuietly(rs);
+} finally {
+try {
+closeQuietly(stmt);
+} finally {
+closeQuietly(conn);
+}
+}
+
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/09/03 06:14:07
Modified:dbutils/src/java/org/apache/commons/dbutils DbUtils.java
dbutils/xdocs changes.xml
Log:
Added rollbackAndClose() and rollbackAndCloseQuietly() to DbUtils.
Revision ChangesPath
1.8 +28 -0
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java
Index: DbUtils.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/DbUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DbUtils.java 3 Sep 2004 13:07:30 - 1.7
+++ DbUtils.java 3 Sep 2004 13:14:07 - 1.8
@@ -198,5 +198,33 @@
conn.rollback();
}
}
+
+/**
+ * Performs a rollback on the codeConnection/code then closes it,
+ * avoid closing if null.
+ * @since DbUtils 1.1
+ */
+public static void rollbackAndClose(Connection conn) throws SQLException {
+if (conn != null) {
+try {
+conn.rollback();
+} finally {
+conn.close();
+}
+}
+}
+
+/**
+ * Performs a rollback on the codeConnection/code then closes it,
+ * avoid closing if null and hide any SQLExceptions that occur.
+ * @since DbUtils 1.1
+ */
+public static void rollbackAndCloseQuietly(Connection conn) {
+try {
+rollbackAndClose(conn);
+} catch (SQLException e) {
+// quiet
+}
+}
}
1.5 +3 -0 jakarta-commons/dbutils/xdocs/changes.xml
Index: changes.xml
===
RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 23 Aug 2004 02:10:32 - 1.4
+++ changes.xml 3 Sep 2004 13:14:07 - 1.5
@@ -39,6 +39,9 @@
body
release version=1.1-dev date=in CVS
+ action dev=dgraham type=add
+Added DbUtils.rollbackAndClose() and DbUtils.rollbackAndCloseQuietly().
+ /action
action dev=dgraham type=update
Call ResultSet.getTimestamp() in BeanProcessor.processColumn() if
the bean property is a java.sql.Timestamp. Oracle's getObject()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/test/org/apache/commons/dbutils BeanProcessorTest.java
dgraham 2004/09/01 19:44:18
Modified:dbutils/src/test/org/apache/commons/dbutils
BeanProcessorTest.java
Log:
javadoc changes only.
Revision ChangesPath
1.2 +0 -7
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BeanProcessorTest.java
Index: BeanProcessorTest.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BeanProcessorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanProcessorTest.java14 Mar 2004 23:03:54 - 1.1
+++ BeanProcessorTest.java2 Sep 2004 02:44:18 - 1.2
@@ -18,17 +18,10 @@
import java.sql.SQLException;
-/**
- * BeanProcessorTest
- */
public class BeanProcessorTest extends BaseTestCase {
private static final BeanProcessor beanProc = new BeanProcessor();
-/**
- * Constructor for BasicColumnProcessorTest.
- * @param name
- */
public BeanProcessorTest(String name) {
super(name);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java
dgraham 2004/09/01 19:51:40
Modified:dbutils/src/java/org/apache/commons/dbutils
BeanProcessor.java
Log:
Fill array with PROPERTY_NOT_FOUND in mapColumnsToProperties() instead of
setting it multiple times within the for loop. This gives us a small performance
improvement and makes the logic clearer.
Revision ChangesPath
1.5 +2 -3
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java
Index: BeanProcessor.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BeanProcessor.java23 Aug 2004 02:07:36 - 1.4
+++ BeanProcessor.java2 Sep 2004 02:51:40 - 1.5
@@ -27,6 +27,7 @@
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -363,6 +364,7 @@
int cols = rsmd.getColumnCount();
int columnToProperty[] = new int[cols + 1];
+Arrays.fill(columnToProperty, PROPERTY_NOT_FOUND);
for (int col = 1; col = cols; col++) {
String columnName = rsmd.getColumnName(col);
@@ -371,9 +373,6 @@
if (columnName.equalsIgnoreCase(props[i].getName())) {
columnToProperty[col] = i;
break;
-
-} else {
-columnToProperty[col] = PROPERTY_NOT_FOUND;
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java
dgraham 2004/09/01 20:06:29
Modified:dbutils/src/java/org/apache/commons/dbutils
BeanProcessor.java
Log:
Removed unneeded cols parameter to createBean().
Revision ChangesPath
1.6 +9 -17
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java
Index: BeanProcessor.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BeanProcessor.java2 Sep 2004 02:51:40 - 1.5
+++ BeanProcessor.java2 Sep 2004 03:06:29 - 1.6
@@ -115,12 +115,9 @@
PropertyDescriptor[] props = this.propertyDescriptors(type);
ResultSetMetaData rsmd = rs.getMetaData();
-
int[] columnToProperty = this.mapColumnsToProperties(rsmd, props);
-int cols = rsmd.getColumnCount();
-
-return this.createBean(rs, type, props, columnToProperty, cols);
+return this.createBean(rs, type, props, columnToProperty);
}
/**
@@ -160,14 +157,10 @@
PropertyDescriptor[] props = this.propertyDescriptors(type);
ResultSetMetaData rsmd = rs.getMetaData();
-
int[] columnToProperty = this.mapColumnsToProperties(rsmd, props);
-
-int cols = rsmd.getColumnCount();
do {
-results.add(this.createBean(rs, type, props, columnToProperty, cols));
-
+results.add(this.createBean(rs, type, props, columnToProperty));
} while (rs.next());
return results;
@@ -176,21 +169,20 @@
/**
* Creates a new object and initializes its fields from the ResultSet.
*
- * @param rs The result set
- * @param type The bean type (the return type of the object)
- * @param props The property descriptors
- * @param columnToProperty The column indices in the result set
- * @param cols The number of columns
+ * @param rs The result set.
+ * @param type The bean type (the return type of the object).
+ * @param props The property descriptors.
+ * @param columnToProperty The column indices in the result set.
* @return An initialized object.
- * @throws SQLException If a database error occurs
+ * @throws SQLException If a database error occurs.
*/
private Object createBean(ResultSet rs, Class type,
-PropertyDescriptor[] props, int[] columnToProperty, int cols)
+PropertyDescriptor[] props, int[] columnToProperty)
throws SQLException {
Object bean = this.newInstance(type);
-for (int i = 1; i = cols; i++) {
+for (int i = 1; i columnToProperty.length; i++) {
if (columnToProperty[i] == PROPERTY_NOT_FOUND) {
continue;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java
dgraham 2004/09/01 20:19:01
Modified:dbutils/src/java/org/apache/commons/dbutils
BeanProcessor.java
Log:
Made newInstance() protected so subclasses can provide custom behavior.
Revision ChangesPath
1.7 +5 -2
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java
Index: BeanProcessor.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BeanProcessor.java2 Sep 2004 03:06:29 - 1.6
+++ BeanProcessor.java2 Sep 2004 03:19:01 - 1.7
@@ -292,13 +292,16 @@
}
/**
- * Returns a new instance of the given Class.
+ * Factory method that returns a new instance of the given Class. This
+ * is called at the start of the bean creation process and may be
+ * overridden to provide custom behavior like returning a cached bean
+ * instance.
*
* @param c The Class to create an object from.
* @return A newly created object of the Class.
* @throws SQLException if creation failed.
*/
-private Object newInstance(Class c) throws SQLException {
+protected Object newInstance(Class c) throws SQLException {
try {
return c.newInstance();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs changes.xml
dgraham 2004/08/24 20:42:30 Modified:validator/xdocs changes.xml Log: Added date of 1.1.2 release. Revision ChangesPath 1.4 +1 -1 jakarta-commons/validator/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/changes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- changes.xml 28 Mar 2004 22:04:43 - 1.3 +++ changes.xml 25 Aug 2004 03:42:30 - 1.4 @@ -38,7 +38,7 @@ /properties body -release version=1.1.2 (alpha) date=in CVS +release version=1.1.2 (alpha) date=2004-04-03 action dev=rleland type=update Allow multiple forms to be on the same page by generating a unique variable name based on form name. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs changes.xml
dgraham 2004/08/24 21:27:03 Modified:validator/xdocs changes.xml Log: Added notes for 1.1.3 and 1.2.0. Revision ChangesPath 1.5 +35 -0 jakarta-commons/validator/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changes.xml 25 Aug 2004 03:42:30 - 1.4 +++ changes.xml 25 Aug 2004 04:27:03 - 1.5 @@ -38,7 +38,42 @@ /properties body +release version=1.2.0 (alpha) date=in CVS + action dev=husted type=add +Add support for min or max numeric values. +PR# 29015 + /action + action dev=husted type=add +Allow validators to register errors for multiple fields. +PR# 29151 + /action + action dev=husted type=add +Fixed EmailValidator failing on valid email addresses. +PR# 23990 + /action + action dev=rleland type=add +Allow forms to inherit validation rules from other forms. +PR# 27870 + /action +/release + +release version=1.1.3 date=2004-08-25 + action dev=dgraham type=fix +Fixed javascript file reading in Java WebStart environment. +PR# 28257 + /action + action dev=mrdon type=fix +Fixed javascript email domain length limited to 2 or 3 chars. +PR# 29532 + /action +/release + release version=1.1.2 (alpha) date=2004-04-03 + action dev=rleland type=fix +Javascript validation doesn't work if a form field is +called name. +PR# 27899 + /action action dev=rleland type=update Allow multiple forms to be on the same page by generating a unique variable name based on form name. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/08/22 18:57:33 Modified:dbutils/xdocs changes.xml Log: Changed null handling in fillStatement() to use Types.VARCHAR instead of Types.OTHER. PR: 29212 Revision ChangesPath 1.3 +8 -0 jakarta-commons/dbutils/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/changes.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- changes.xml 19 Jul 2004 01:41:26 - 1.2 +++ changes.xml 23 Aug 2004 01:57:33 - 1.3 @@ -39,6 +39,14 @@ body release version=1.1-dev date=in CVS + action dev=dgraham type=update +Changed QueryRunner.fillStatement() null handling +to use Types.VARCHAR instead of Types.OTHER. This works for the +following tested drivers: Firebird 1.5/firebirdsql 1.5RC3, +Oracle 9/ Thin driver, MySQL 4.0/Msql Connecttor 3.0 and mm.mysql +2.0.4 MaxDB 7.5, HSQLDB 1.7.1, and MS Access/ODBC Bridge. +PR# 29212 + /action action dev=dgraham type=add Added a protected QueryRunner.prepareConnection() method to allow subclasses to customize the Connections retrieved from - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java
dgraham 2004/08/22 19:07:36
Modified:dbutils/src/java/org/apache/commons/dbutils
BeanProcessor.java
Log:
Call ResultSet.getTimestamp() if the bean property is a java.sql.Timestamp.
Oracle's getObject() implementation returns its own incompatible Timestamp class.
PR: 30749
Revision ChangesPath
1.4 +12 -17
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java
Index: BeanProcessor.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanProcessor.java14 Mar 2004 23:30:15 - 1.3
+++ BeanProcessor.java23 Aug 2004 02:07:36 - 1.4
@@ -25,6 +25,7 @@
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -182,13 +183,9 @@
* @return An initialized object.
* @throws SQLException If a database error occurs
*/
-private Object createBean(
-ResultSet rs,
-Class type,
-PropertyDescriptor[] props,
-int[] columnToProperty,
-int cols)
-throws SQLException {
+private Object createBean(ResultSet rs, Class type,
+PropertyDescriptor[] props, int[] columnToProperty, int cols)
+throws SQLException {
Object bean = this.newInstance(type);
@@ -221,11 +218,8 @@
* @param value The value to pass into the setter.
* @throws SQLException if an error occurs setting the property.
*/
-private void callSetter(
-Object target,
-PropertyDescriptor prop,
-Object value)
-throws SQLException {
+private void callSetter(Object target, PropertyDescriptor prop, Object value)
+throws SQLException {
Method setter = prop.getWriteMethod();
@@ -364,10 +358,8 @@
*
* @throws SQLException
*/
-protected int[] mapColumnsToProperties(
-ResultSetMetaData rsmd,
-PropertyDescriptor[] props)
-throws SQLException {
+protected int[] mapColumnsToProperties(ResultSetMetaData rsmd,
+PropertyDescriptor[] props) throws SQLException {
int cols = rsmd.getColumnCount();
int columnToProperty[] = new int[cols + 1];
@@ -447,7 +439,10 @@
} else if (propType.equals(Byte.TYPE) || propType.equals(Byte.class)) {
return new Byte(rs.getByte(index));
-
+
+} else if (propType.equals(Timestamp.class)) {
+return rs.getTimestamp(index);
+
} else {
return rs.getObject(index);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/08/22 19:10:32 Modified:dbutils/xdocs changes.xml Log: Call ResultSet.getTimestamp() if the bean property is a java.sql.Timestamp. Oracle's getObject() implementation returns its own incompatible Timestamp class. PR: 30749 Revision ChangesPath 1.4 +6 -0 jakarta-commons/dbutils/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/changes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- changes.xml 23 Aug 2004 01:57:33 - 1.3 +++ changes.xml 23 Aug 2004 02:10:32 - 1.4 @@ -40,6 +40,12 @@ release version=1.1-dev date=in CVS action dev=dgraham type=update +Call ResultSet.getTimestamp() in BeanProcessor.processColumn() if +the bean property is a java.sql.Timestamp. Oracle's getObject() +implementation returns its own incompatible Timestamp class. +PR: 30749 + /action + action dev=dgraham type=update Changed QueryRunner.fillStatement() null handling to use Types.VARCHAR instead of Types.OTHER. This works for the following tested drivers: Firebird 1.5/firebirdsql 1.5RC3, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs index.xml
dgraham 2004/08/22 20:16:27 Modified:dbutils/xdocs index.xml Log: Added note about DbUtils' ability to populate beans with column values. Revision ChangesPath 1.8 +6 -0 jakarta-commons/dbutils/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/index.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- index.xml 15 Mar 2004 05:31:40 - 1.7 +++ index.xml 23 Aug 2004 03:16:26 - 1.8 @@ -47,6 +47,12 @@ code clearly expresses your intention without being cluttered with resource cleanup. /li + li + Automatically populate JavaBean properties from ResultSets. You + don't need to manually copy column values into bean instances + by calling setter methods. Each row of the ResultSet can be + represented by one fully populated bean instance. + /li /ul /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/07/18 18:41:26
Modified:dbutils/src/java/org/apache/commons/dbutils QueryRunner.java
dbutils/xdocs changes.xml
Log:
Added QueryRunner.prepareConnection(). PR: 30032
Revision ChangesPath
1.12 +35 -20
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java
Index: QueryRunner.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- QueryRunner.java 6 Jun 2004 14:35:39 - 1.11
+++ QueryRunner.java 19 Jul 2004 01:41:26 - 1.12
@@ -107,7 +107,7 @@
* @since DbUtils 1.1
*/
public int[] batch(String sql, Object[][] params) throws SQLException {
-Connection conn = this.ds.getConnection();
+Connection conn = this.prepareConnection();
try {
return this.batch(conn, sql, params);
@@ -166,24 +166,40 @@
return conn.prepareStatement(sql);
}
+
+/**
+ * Factory method that creates and initializes a
+ * codeConnection/code object. codeQueryRunner/code methods
+ * always call this method to retrieve connections from its DataSource.
+ * Subclasses can override this method to provide
+ * special codeConnection/code configuration if needed. This
+ * implementation simply calls codeds.getConnection()/code.
+ *
+ * @return An initialized codeConnection/code.
+ * @throws SQLException
+ * @since DbUtils 1.1
+ */
+protected Connection prepareConnection() throws SQLException {
+return this.ds.getConnection();
+}
/**
- * Execute an SQL SELECT query with a single replacement parameter. The
+ * Execute an SQL SELECT query with a single replacement parameter. The
* caller is responsible for closing the connection.
*
- * @param conn The connection to execute the query in.
- * @param sql The query to execute.
- * @param param The replacement parameter.
- * @param rsh The handler that converts the results into an object.
+ * @param conn
+ *The connection to execute the query in.
+ * @param sql
+ *The query to execute.
+ * @param param
+ *The replacement parameter.
+ * @param rsh
+ *The handler that converts the results into an object.
* @return The object returned by the handler.
* @throws SQLException
*/
-public Object query(
-Connection conn,
-String sql,
-Object param,
-ResultSetHandler rsh)
-throws SQLException {
+public Object query(Connection conn, String sql, Object param,
+ResultSetHandler rsh) throws SQLException {
return this.query(conn, sql, new Object[] { param }, rsh);
}
@@ -199,12 +215,8 @@
* @return The object returned by the handler.
* @throws SQLException
*/
-public Object query(
-Connection conn,
-String sql,
-Object[] params,
-ResultSetHandler rsh)
-throws SQLException {
+public Object query(Connection conn, String sql, Object[] params,
+ResultSetHandler rsh) throws SQLException {
PreparedStatement stmt = null;
ResultSet rs = null;
@@ -285,7 +297,7 @@
public Object query(String sql, Object[] params, ResultSetHandler rsh)
throws SQLException {
-Connection conn = this.ds.getConnection();
+Connection conn = this.prepareConnection();
try {
return this.query(conn, sql, params, rsh);
@@ -461,7 +473,7 @@
* @return The number of rows updated.
*/
public int update(String sql, Object[] params) throws SQLException {
-Connection conn = this.ds.getConnection();
+Connection conn = this.prepareConnection();
try {
return this.update(conn, sql, params);
@@ -499,6 +511,7 @@
* Close a codeConnection/code. This implementation avoids closing if
* null and does strongnot/strong suppress any exceptions. Subclasses
* can override to provide special handling like logging.
+ * @throws SQLException
* @since DbUtils 1.1
*/
protected void close(Connection conn) throws SQLException {
@@ -509,6 +522,7 @@
* Close a codeStatement/code. This implementation avoids closing if
* null and does strongnot/strong suppress any exceptions. Subclasses
* can override to provide special handling like logging.
+ * @throws SQLException
* @since DbUtils 1.1
*/
protected void close
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils QueryRunner.java
dgraham 2004/07/18 18:44:42 Modified:dbutils/src/java/org/apache/commons/dbutils QueryRunner.java Log: javadoc changes only. Revision ChangesPath 1.13 +4 -8 jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java Index: QueryRunner.java === RCS file: /home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- QueryRunner.java 19 Jul 2004 01:41:26 - 1.12 +++ QueryRunner.java 19 Jul 2004 01:44:42 - 1.13 @@ -187,14 +187,10 @@ * Execute an SQL SELECT query with a single replacement parameter. The * caller is responsible for closing the connection. * - * @param conn - *The connection to execute the query in. - * @param sql - *The query to execute. - * @param param - *The replacement parameter. - * @param rsh - *The handler that converts the results into an object. + * @param conn The connection to execute the query in. + * @param sql The query to execute. + * @param param The replacement parameter. + * @param rsh The handler that converts the results into an object. * @return The object returned by the handler. * @throws SQLException */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils QueryRunner.java
dgraham 2004/06/06 07:35:39
Modified:dbutils/src/java/org/apache/commons/dbutils QueryRunner.java
Log:
Added protected close() methods so subclasses can provide specialized
error handling.
PR: 29393
Revision ChangesPath
1.11 +38 -7
jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java
Index: QueryRunner.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- QueryRunner.java 15 Mar 2004 05:31:40 - 1.10
+++ QueryRunner.java 6 Jun 2004 14:35:39 - 1.11
@@ -20,6 +20,7 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Types;
import java.util.Arrays;
@@ -86,7 +87,7 @@
} catch (SQLException e) {
this.rethrow(e, sql, params);
} finally {
-DbUtils.close(stmt);
+close(stmt);
}
return rows;
@@ -111,7 +112,7 @@
try {
return this.batch(conn, sql, params);
} finally {
-DbUtils.close(conn);
+close(conn);
}
}
@@ -222,9 +223,9 @@
} finally {
try {
-DbUtils.close(rs);
+close(rs);
} finally {
-DbUtils.close(stmt);
+close(stmt);
}
}
@@ -290,7 +291,7 @@
return this.query(conn, sql, params, rsh);
} finally {
-DbUtils.close(conn);
+close(conn);
}
}
@@ -410,7 +411,7 @@
this.rethrow(e, sql, params);
} finally {
-DbUtils.close(stmt);
+close(stmt);
}
return rows;
@@ -465,7 +466,7 @@
try {
return this.update(conn, sql, params);
} finally {
-DbUtils.close(conn);
+close(conn);
}
}
@@ -492,6 +493,36 @@
*/
protected ResultSet wrap(ResultSet rs) {
return rs;
+}
+
+/**
+ * Close a codeConnection/code. This implementation avoids closing if
+ * null and does strongnot/strong suppress any exceptions. Subclasses
+ * can override to provide special handling like logging.
+ * @since DbUtils 1.1
+ */
+protected void close(Connection conn) throws SQLException {
+DbUtils.close(conn);
+}
+
+/**
+ * Close a codeStatement/code. This implementation avoids closing if
+ * null and does strongnot/strong suppress any exceptions. Subclasses
+ * can override to provide special handling like logging.
+ * @since DbUtils 1.1
+ */
+protected void close(Statement stmt) throws SQLException {
+DbUtils.close(stmt);
+}
+
+/**
+ * Close a codeResultSet/code. This implementation avoids closing if
+ * null and does strongnot/strong suppress any exceptions. Subclasses
+ * can override to provide special handling like logging.
+ * @since DbUtils 1.1
+ */
+protected void close(ResultSet rs) throws SQLException {
+DbUtils.close(rs);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/test/org/apache/commons/dbutils BasicRowProcessorTest.java
dgraham 2004/05/31 05:54:01 Modified:dbutils/src/test/org/apache/commons/dbutils BasicRowProcessorTest.java Log: Specify US locale in SimpleDateFormat so english characters will be recognized on non-english JVMs. Revision ChangesPath 1.8 +2 -1 jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BasicRowProcessorTest.java Index: BasicRowProcessorTest.java === RCS file: /home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BasicRowProcessorTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- BasicRowProcessorTest.java14 Mar 2004 23:03:54 - 1.7 +++ BasicRowProcessorTest.java31 May 2004 12:54:01 - 1.8 @@ -20,6 +20,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.List; +import java.util.Locale; import java.util.Map; /** @@ -34,7 +35,7 @@ * Sun Mar 14 15:19:15 MST 2004 */ private static final DateFormat datef = -new SimpleDateFormat(EEE MMM dd HH:mm:ss zzz ); +new SimpleDateFormat(EEE MMM dd HH:mm:ss zzz , Locale.US); /** * Constructor for BasicRowProcessorTest. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper project.xml
dgraham 2004/05/31 05:59:06 Modified:mapper project.xml Log: Fixed logo image location. Revision ChangesPath 1.6 +1 -1 jakarta-commons-sandbox/mapper/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 30 May 2004 20:57:13 - 1.5 +++ project.xml 31 May 2004 12:59:06 - 1.6 @@ -5,7 +5,7 @@ idcommons-mapper/id currentVersion0.7-dev/currentVersion - logo/images/mapper-logo-white.png/logo + logo/images/logo.png/logo inceptionYear2003/inceptionYear packageorg.apache.commons.mapper/package - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper project.properties
dgraham 2004/05/31 05:59:40
Modified:mapper project.properties
Log:
Remove maven logo and put date back to upper left corner.
Revision ChangesPath
1.4 +2 -2 jakarta-commons-sandbox/mapper/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons-sandbox/mapper/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties30 May 2004 20:57:13 - 1.3
+++ project.properties31 May 2004 12:59:40 - 1.4
@@ -17,7 +17,7 @@
# commons site LF
##
maven.xdoc.jsl=../../jakarta-commons/commons-build/commons-site.jsl
-maven.xdoc.date=bottom
-maven.xdoc.poweredby.image=maven-feather.png
+maven.xdoc.date=left
+maven.xdoc.poweredby.image=
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources project.properties
dgraham 2004/05/31 05:59:41
Modified:resources project.properties
Log:
Remove maven logo and put date back to upper left corner.
Revision ChangesPath
1.6 +2 -2 jakarta-commons-sandbox/resources/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons-sandbox/resources/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties30 May 2004 20:55:57 - 1.5
+++ project.properties31 May 2004 12:59:41 - 1.6
@@ -17,8 +17,8 @@
# commons site LF
##
maven.xdoc.jsl=../../jakarta-commons/commons-build/commons-site.jsl
-maven.xdoc.date=bottom
-maven.xdoc.poweredby.image=maven-feather.png
+maven.xdoc.date=left
+maven.xdoc.poweredby.image=
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/conf/share validator_1_2_0.dtd
dgraham 2004/04/11 09:53:16 Modified:validator/conf/share validator_1_2_0.dtd Log: Remove arg0-3 from field ELEMENT definition. Revision ChangesPath 1.6 +2 -2 jakarta-commons/validator/conf/share/validator_1_2_0.dtd Index: validator_1_2_0.dtd === RCS file: /home/cvs/jakarta-commons/validator/conf/share/validator_1_2_0.dtd,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- validator_1_2_0.dtd 8 Apr 2004 23:20:52 - 1.5 +++ validator_1_2_0.dtd 11 Apr 2004 16:53:15 - 1.6 @@ -129,7 +129,7 @@ validations for this field. -- -!ELEMENT field (msg|arg|arg0|arg1|arg2|arg3|var)* +!ELEMENT field (msg|arg|var)* !ATTLIST field property CDATA #REQUIRED !ATTLIST field depends CDATA #IMPLIED !ATTLIST field page CDATA #IMPLIED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/conf/share validator_1_2_0.dtd
dgraham 2004/04/11 10:16:17 Modified:validator/conf/share validator_1_2_0.dtd Log: Split form extends into its own ATTLIST element. Revision ChangesPath 1.7 +12 -13jakarta-commons/validator/conf/share/validator_1_2_0.dtd Index: validator_1_2_0.dtd === RCS file: /home/cvs/jakarta-commons/validator/conf/share/validator_1_2_0.dtd,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- validator_1_2_0.dtd 11 Apr 2004 16:53:15 - 1.6 +++ validator_1_2_0.dtd 11 Apr 2004 17:16:17 - 1.7 @@ -30,7 +30,7 @@ !-- - The validator element defines what validator objects can be used with + Defines what validator objects can be used with the fields referenced by the formset elements. elements: validator Defines a new validatior @@ -61,14 +61,14 @@ !-- - The javascript element defines a JavaScript that can be used to perform + Defines a JavaScript that can be used to perform client-side validators. -- !ELEMENT javascript (#PCDATA) !-- - The constant element defines a static value that can be used as + Defines a static value that can be used as replacement parameters within field elements. The constant-name and constant-value elements define the constant's reference id and replacement value. @@ -79,7 +79,7 @@ !-- - The formset element defines a set of forms for a locale. Formsets for + Defines a set of forms for a locale. Formsets for specific locales can override only those fields that change. The localization is properly scoped, so that a formset can override just the language, or just the country, or both. @@ -91,17 +91,17 @@ !-- - The form element defines a set of fields to be validated. The name + Defines a set of fields to be validated. The name corresponds to the identifier the application assigns to the form. -- !ELEMENT form (field+) -!ATTLIST form name CDATA #REQUIRED -extends CDATA #IMPLIED +!ATTLIST form name CDATA #REQUIRED +!ATTLIST form extends CDATA #IMPLIED !-- - The field element defines the properties to be validated. In a + Defines the properties to be validated. In a web application, a field would also correspond to a control on a HTML form. To validate the properties, the validator works through a JavaBean representation. The field element accepts these @@ -137,7 +137,7 @@ !-- - The msg element defines a custom message key to use when one of the + Defines a custom message key to use when one of the validators for this field fails. Each validator has a default message property that is used when a corresponding field msg is not specified. Each validator applied to a field may have its own msg element. @@ -163,7 +163,7 @@ !-- - The arg element defines a replacement value to use with the + Defines a replacement value to use with the message template for this validator or this field. The arg element accepts these attributes. @@ -214,8 +214,7 @@ !ELEMENT var-value (#PCDATA) !-- - The java script type, Possible Values [int| string | regexp] - + The javascript type. Possible Values [int|string|regexp] -- !ELEMENT var-jstype (#PCDATA) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs validator_2_0_0_proposal.dtd tasks.xml
dgraham 2004/04/11 21:20:36 Modified:validator/xdocs tasks.xml Added: validator/xdocs validator_2_0_0_proposal.dtd Log: Added a proposal for the Validator 2.0 DTD so we can start talking about specific changes. Revision ChangesPath 1.13 +1 -1 jakarta-commons/validator/xdocs/tasks.xml Index: tasks.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/tasks.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tasks.xml 8 Apr 2004 23:40:54 - 1.12 +++ tasks.xml 12 Apr 2004 04:20:36 - 1.13 @@ -39,7 +39,7 @@ Currently, the lt;form-validationgt;, lt;formsetgt;, lt;formgt;, and lt;fieldgt; elements require a form-centric view of validations. Changing these to lt;bean-validationgt; or lt;validator-configgt;, lt;beansgt;, lt;beangt;, and lt;propertygt; respectively would allow Validator to be used more easily in - non-form based environments. + non-form based environments. See the 2.0 DTD a href=validator_2_0_0_proposal.dtdproposal/a for specifics. /li li The above changes to validation.xml could only apply to Validator's native configuration format. We 1.1 jakarta-commons/validator/xdocs/validator_2_0_0_proposal.dtd Index: validator_2_0_0_proposal.dtd === !-- Proposed DTD for the Validator Rules Configuration File, Version 2.0.0 To allow for XML validation of your rules configuration file, include the following DOCTYPE element at the beginning (after the xml declaration): !DOCTYPE form-validation PUBLIC -//Apache Software Foundation//DTD Commons Validator Rules Configuration 2.0.0//EN http://jakarta.apache.org/commons/dtds/validator_2_0_0.dtd; $Id: validator_2_0_0_proposal.dtd,v 1.1 2004/04/12 04:20:36 dgraham Exp $ -- !-- This is a proposal for what Validator's 2.0 XML configuration file will look like. Comments and suggestions are highly appreciated. The goal is to simplify the configuration as much as possible and use bean semantics rather than HTML form terminology. Some changes include: - The following elements were renamed (old name == new name): form-validation == validator-config formset == bean-set form == bean field == property javascript == script - The global element has been removed. It provided no real value so constant and validator elements are now declared directly inside validator-config. - The validator name attribute was renamed to id and is now defined as an ID type so that other attributes can be defined as IDREF or IDREFS. This allows Digester to more strictly validate the XML and notify users of errors. Note that IDREFS attributes are whitespace separated rather than comma separated. - The old validator jsFunction and jsFunctionName attributes were moved to the script element as src and function-name. This will require a new Script class for Digester to populate this info with. This has a nice side effect of refactoring the javascript loading code out of ValidatorAction and into Script. ValidatorAction will have a getScript() method to get at this object. - The validator element's classname and methodParams attributes were renamed to class and params for simplicity. - While JavaScript is likely to remain the primary scripting language, we can treat scripts more generically by leaving out all js references; hence the renaming of javascript to script. Thick clients (ie. Swing/SWT) may want to use Python, Ruby, etc. as their scripting language. - The msg and arg elements' name attribute was renamed to validator to make it clear that you're not naming the msg but specifying which validator the msg applies to. -- !-- The root of the configuration file hierarchy; contains nested elements for all of the other configuration settings. -- !ELEMENT validator-config (constant*, validator*, bean-set*) !-- Defines what validator objects can be used with the objects referenced by the bean-set elements. elements: validator Defines a new validatior scriptThe scripting source code for client side validation. attributes: id The unique name of this validation class The java class name that handles server side validation method The java method that handles server side validation paramsThe java class types passed to the serverside method msg a generic message key to use when this validator fails
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/04/10 12:39:10 Modified:dbutils project.xml Log: Use standard Jakarta logo image. Revision ChangesPath 1.15 +1 -1 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- project.xml 9 Apr 2004 19:58:05 - 1.14 +++ project.xml 10 Apr 2004 19:39:10 - 1.15 @@ -31,7 +31,7 @@ organization nameThe Apache Software Foundation/name urlhttp://jakarta.apache.org/url -logohttp://jakarta.apache.org/images/original-jakarta-logo.gif/logo +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo /organization licenses - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/04/10 12:39:11 Modified:validator project.xml Log: Use standard Jakarta logo image. Revision ChangesPath 1.44 +2 -15 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- project.xml 9 Apr 2004 19:58:05 - 1.43 +++ project.xml 10 Apr 2004 19:39:10 - 1.44 @@ -36,7 +36,7 @@ organization nameThe Apache Software Foundation/name urlhttp://jakarta.apache.org/url -logohttp://jakarta.apache.org/images/original-jakarta-logo.gif/logo +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo /organization licenses @@ -262,7 +262,6 @@ urlhttp://jakarta.apache.org/commons/logging.html/url /dependency - dependency idoro/id version2.0.8/version @@ -306,17 +305,6 @@ /build reports -!-- - | - | These should all be completely self contained. You should be able - | to generate each of them individually without needing the final - | xdoc transformation. - | - | Each report plugin with it's POM and plugin.jelly logic should - | contain everything needed to produced the report. - | --- - reportmaven-jdepend-plugin/report reportmaven-checkstyle-plugin/report reportmaven-changes-plugin/report @@ -326,11 +314,10 @@ reportmaven-javadoc-plugin/report reportmaven-jxr-plugin/report reportmaven-junit-report-plugin/report -!-- reportmaven-tasklist-plugin/report -- reportmaven-pmd-plugin/report reportmaven-simian-plugin/report reportmaven-faq-plugin/report -!-- reportmaven-clover-plugin/report -- +!-- reportmaven-tasklist-plugin/report -- /reports /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/04/10 12:49:12 Modified:dbutils project.xml Log: Removed unneeded resources section. Revision ChangesPath 1.16 +0 -9 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 10 Apr 2004 19:39:10 - 1.15 +++ project.xml 10 Apr 2004 19:49:12 - 1.16 @@ -169,13 +169,6 @@ include**/BaseTestCase.java/include /includes /unitTest - -!-- Resources that are packaged up inside the JAR file -- -resources - includes -include**/*.properties/include - /includes -/resources /build @@ -189,8 +182,6 @@ reportmaven-junit-report-plugin/report reportmaven-jxr-plugin/report reportmaven-license-plugin/report - !--reportmaven-linkcheck-plugin/report-- - !--reportmaven-tasklist-plugin/report-- /reports /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources/xdocs index.xml
dgraham 2004/04/10 12:55:33 Modified:resources/xdocs index.xml Log: Cleaned up sections. Revision ChangesPath 1.2 +0 -5 jakarta-commons-sandbox/resources/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons-sandbox/resources/xdocs/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.xml 17 Jul 2002 07:54:45 - 1.1 +++ index.xml 10 Apr 2004 19:55:33 - 1.2 @@ -11,8 +11,6 @@ section name=Resources : Resource bundle component -section name=Rationale - pMany Java applications must support internationalization (i18n) of message strings presented as part of the user interface, or in messages written to log files. The standard Java APIs offer the @@ -79,9 +77,6 @@ codeorg.apache.commons.resources/code./p /section - -/section - /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper/xdocs index.xml
dgraham 2004/04/10 12:55:33 Modified:mapper/xdocs index.xml Log: Cleaned up sections. Revision ChangesPath 1.6 +0 -5 jakarta-commons-sandbox/mapper/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/xdocs/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 14 Mar 2004 23:50:36 - 1.5 +++ index.xml 10 Apr 2004 19:55:33 - 1.6 @@ -10,8 +10,6 @@ section name=Mapper: Data Mapping Abstraction Component -section name=Purpose - p Most Java applications must store data to a data store whether it's XML files or a relational database. Changes to the mapping technology should be transparent @@ -116,9 +114,6 @@ /source /section - -/section - /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator ValidatorAction.java
dgraham 2004/04/10 14:01:59
Modified:validator/src/share/org/apache/commons/validator
ValidatorAction.java
Log:
Simplified IO in readJavascriptFile() which should also fix PR: 28257.
Revision ChangesPath
1.22 +16 -19
jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorAction.java
Index: ValidatorAction.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ValidatorAction.java 8 Apr 2004 23:29:31 - 1.21
+++ ValidatorAction.java 10 Apr 2004 21:01:59 - 1.22
@@ -21,8 +21,10 @@
package org.apache.commons.validator;
+import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -403,32 +405,27 @@
return null;
}
-StringBuffer function = new StringBuffer();
+StringBuffer buffer = new StringBuffer();
+BufferedReader reader = new BufferedReader(new InputStreamReader(is));
try {
-int bufferSize = is.available();
-int bytesRead;
-while (bufferSize 0) {
-byte[] buffer = new byte[bufferSize];
-bytesRead = is.read(buffer, 0, bufferSize);
-if (bytesRead 0) {
-String functionPart = new String(buffer,0,bytesRead);
-function.append(functionPart);
-}
-bufferSize = is.available();
+String line = null;
+while ((line = reader.readLine()) != null) {
+buffer.append(line + \n);
}
} catch(IOException e) {
-log.error(readJavascriptFile(), e);
+log.error(Error reading javascript file., e);
} finally {
try {
-is.close();
+reader.close();
} catch(IOException e) {
-log.error(readJavascriptFile(), e);
+log.error(Error closing stream to javascript file., e);
}
}
-String strFunction = function.toString();
-return strFunction.equals() ? null : strFunction;
+
+String function = buffer.toString();
+return function.equals() ? null : function;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper/xdocs/images mapper-logo-white.xcf mapper-logo-white.png
dgraham 2004/04/08 15:08:33 Removed: mapper/xdocs/images mapper-logo-white.xcf mapper-logo-white.png Log: Use logo.png instead of other images. Using logo.png as the name also allows us to use the logo definition from sandbox-build/project.xml. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources/xdocs/images resources-logo-white.png resources-logo-white.xcf
dgraham 2004/04/08 15:15:01 Removed: resources/xdocs/images resources-logo-white.png resources-logo-white.xcf Log: Use logo.png instead of other images. Using logo.png as the name also allows us to use the logo definition from sandbox-build/project.xml. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator GenericValidator.java
dgraham 2004/04/08 15:51:17
Modified:validator/src/share/org/apache/commons/validator
GenericValidator.java
Log:
Removed items deprecated in 1.1.x series.
Revision ChangesPath
1.30 +3 -36
jakarta-commons/validator/src/share/org/apache/commons/validator/GenericValidator.java
Index: GenericValidator.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/GenericValidator.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- GenericValidator.java 21 Feb 2004 17:10:29 - 1.29
+++ GenericValidator.java 8 Apr 2004 22:51:17 - 1.30
@@ -32,12 +32,6 @@
public class GenericValidator implements Serializable {
/**
- * Delimiter to put around a regular expression following Perl 5 syntax.
- * @deprecated Use ValidatorUtils.REGEXP_DELIMITER instead.
- */
-public final static String REGEXP_DELIM = ValidatorUtil.REGEXP_DELIMITER;
-
-/**
* UrlValidator used in wrapper method.
*/
private static final UrlValidator urlValidator = new UrlValidator();
@@ -236,26 +230,6 @@
}
/**
- * Checks for a valid credit card number.
- *
- * @param cardNumber Credit Card Number.
- * @deprecated This functionality has moved to CreditCardValidator.
- */
-protected static boolean validateCreditCardLuhnCheck(String cardNumber) {
-return (new CreditCardValidator()).luhnCheck(cardNumber);
-}
-
-/**
- * Checks for a valid credit card number.
- *
- * @param cardNumber Credit Card Number.
- * @deprecated This functionality has move to CreditCardValidator.
- */
-protected boolean validateCreditCardPrefixCheck(String cardNumber) {
-return (new CreditCardValidator()).isValidPrefix(cardNumber);
-}
-
-/**
* pChecks if a field has a valid e-mail address./p
*
* @param value The value validation is being performed on.
@@ -295,11 +269,4 @@
return (value.length() = min);
}
-/**
- * Adds a '/' on either side of the regular expression.
- * @deprecated use ValidatorUtils.getDelimitedRegExp() instead.
- */
-protected static String getDelimittedRegexp(String regexp) {
-return ValidatorUtil.getDelimitedRegExp(regexp);
-}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator ValidatorUtil.java
dgraham 2004/04/08 15:52:02 Removed: validator/src/share/org/apache/commons/validator ValidatorUtil.java Log: Removed deprecated ValidatorUtil class. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator Arg.java ValidatorResources.java ValidatorResults.java ValidatorResult.java Validator.java
dgraham 2004/04/08 16:05:39
Modified:validator/src/share/org/apache/commons/validator Arg.java
ValidatorResources.java ValidatorResults.java
ValidatorResult.java Validator.java
Log:
Removed items deprecated in 1.1.x series.
Revision ChangesPath
1.18 +3 -12
jakarta-commons/validator/src/share/org/apache/commons/validator/Arg.java
Index: Arg.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/Arg.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Arg.java 21 Feb 2004 17:10:29 - 1.17
+++ Arg.java 8 Apr 2004 23:05:39 - 1.18
@@ -117,15 +117,6 @@
}
/**
- * Gets whether or not the key is a resource.
- * @return Returns true if key is a resource.
- * @deprecated Use isResource() instead.
- */
-public boolean getResource() {
-return this.isResource();
-}
-
-/**
* Tests whether or not the key is a resource key or literal value.
* @return codetrue/code if key is a resource key.
*/
1.32 +8 -96
jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorResources.java
Index: ValidatorResources.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorResources.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ValidatorResources.java 4 Apr 2004 13:53:25 - 1.31
+++ ValidatorResources.java 8 Apr 2004 23:05:39 - 1.32
@@ -71,9 +71,8 @@
/**
* Logger.
- * @deprecated Subclasses should use their own logging instance.
- */
-protected static Log log = LogFactory.getLog(ValidatorResources.class);
+ */
+private static final Log log = LogFactory.getLog(ValidatorResources.class);
/**
* codeFastHashMap/code of codeFormSet/codes stored under
@@ -161,16 +160,6 @@
* Add a codeFormSet/code to this codeValidatorResources/code
* object. It will be associated with the codeLocale/code of the
* codeFormSet/code.
- * @deprecated Use addFormSet() instead.
- */
-public void put(FormSet fs) {
-this.addFormSet(fs);
-}
-
-/**
- * Add a codeFormSet/code to this codeValidatorResources/code
- * object. It will be associated with the codeLocale/code of the
- * codeFormSet/code.
* @since Validator 1.1
*/
public void addFormSet(FormSet fs) {
@@ -192,32 +181,6 @@
/**
* Add a global constant to the resource.
- * @deprecated Use addConstant(String, String) instead.
- */
-public void addConstant(Constant c) {
-this.addConstantParam(c.getName(), c.getValue());
-}
-
-/**
- * Add a global constant to the resource.
- * @deprecated Use addConstant(String, String) instead.
- */
-public void addConstantParam(String name, String value) {
-if (name != null
- name.length() 0
- value != null
- value.length() 0) {
-
-if (log.isDebugEnabled()) {
-log.debug(Adding Global Constant: + name + , + value);
-}
-
-this.hConstants.put(name, value);
-}
-}
-
-/**
- * Add a global constant to the resource.
*/
public void addConstant(String name, String value) {
if (log.isDebugEnabled()) {
@@ -283,23 +246,6 @@
}
/**
- * pGets a codeForm/code based on the name of the form and the
codeLocale/code that
- * most closely matches the codeLocale/code passed in. The order of
codeLocale/code
- * matching is:/p
- * ol
- *lilanguage + country + variant/li
- *lilanguage + country/li
- *lilanguage/li
- *lidefault locale/li
- * /ol
- * @deprecated Use getForm() instead.
- */
-public Form get(Locale locale, Object formKey) {
-String key = (formKey == null) ? null : formKey.toString();
-return this.getForm(locale, key);
-}
-
-/**
* pGets a codeForm/code based on the name of the form and the
* codeLocale/code that most closely matches the codeLocale/code
* passed in. The order of codeLocale/code matching is:/p
@@ -329,28 +275,6 @@
*lilanguage/li
*lidefault locale/li
* /ol
- * @deprecated Use getForm() instead.
- */
-public Form get(
-String language,
-String country,
-String variant,
-Object formKey
cvs commit: jakarta-commons/validator/src/test/org/apache/commons/validator validator-extension.xml validator-multipletest.xml
dgraham 2004/04/08 16:19:31 Modified:validator/src/test/org/apache/commons/validator validator-extension.xml validator-multipletest.xml Log: Replaced arg0 with arg. Revision ChangesPath 1.2 +3 -3 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-extension.xml Index: validator-extension.xml === RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-extension.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- validator-extension.xml 4 Apr 2004 13:53:25 - 1.1 +++ validator-extension.xml 8 Apr 2004 23:19:31 - 1.2 @@ -15,7 +15,7 @@ form name=nameForm extends=baseForm field property=lastName depends=required - arg0 key=nameForm.lastname.displayname/ + arg key=nameForm.lastname.displayname/ /field /form @@ -25,13 +25,13 @@ field property=lastName depends=/ !--override rule with different message-- field property=firstName depends=required -arg0 key=nameForm.lastname.displayname/ +arg key=nameForm.lastname.displayname/ /field /form form name=baseForm field property=firstName depends=required -arg0 key=nameForm.firstname.displayname/ +arg key=nameForm.firstname.displayname/ /field /form 1.6 +1 -1 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-multipletest.xml Index: validator-multipletest.xml === RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-multipletest.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- validator-multipletest.xml17 Jan 2004 19:46:16 - 1.5 +++ validator-multipletest.xml8 Apr 2004 23:19:31 - 1.6 @@ -29,7 +29,7 @@ arg key=nameForm.firstname.displayname/ /field field property=middleName depends=positive - arg0 key=nameForm.middlename.displayname/ + arg key=nameForm.middlename.displayname/ /field field property=lastName depends=required,int arg key=nameForm.lastname.displayname/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator digester-rules.xml
dgraham 2004/04/08 16:20:52 Modified:validator/conf/share validator_1_2_0.dtd validator/src/share/org/apache/commons/validator digester-rules.xml Log: Removed deprecated arg0-3 elements. Revision ChangesPath 1.5 +1 -95 jakarta-commons/validator/conf/share/validator_1_2_0.dtd Index: validator_1_2_0.dtd === RCS file: /home/cvs/jakarta-commons/validator/conf/share/validator_1_2_0.dtd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- validator_1_2_0.dtd 6 Apr 2004 22:19:58 - 1.4 +++ validator_1_2_0.dtd 8 Apr 2004 23:20:52 - 1.5 @@ -191,100 +191,6 @@ !ATTLIST arg resource CDATA #IMPLIED !ATTLIST arg position CDATA #IMPLIED - - -!-- - - DEPRECATED Use arg position=0/ instead. - - The arg0 element defines the first replacement value to use with the - message template for this validator or this field. - The arg0 element accepts these attributes. - - nameThe name of the validator corresponding to this msg. - - key The key that will return the message template from a - resource bundle. - - resourceIf set to false, the key is taken to be a literal - value rather than a bundle key. - [true] --- -!ELEMENT arg0 EMPTY -!ATTLIST arg0 name CDATA #IMPLIED -!ATTLIST arg0 key CDATA #IMPLIED -!ATTLIST arg0 resource CDATA #IMPLIED - - -!-- - - DEPRECATED Use arg position=1/ instead. - - The arg1 element defines the second replacement value to use with the - message template for this validator or this field. - The arg1 element accepts these attributes. - - nameThe name of the validator corresponding to this msg. - - key The key that will return the message template from a - resource bundle. - - resourceIf set to false, the key is taken to be a literal - value rather than a bundle key. - [true] --- -!ELEMENT arg1 EMPTY -!ATTLIST arg1 name CDATA #IMPLIED -!ATTLIST arg1 key CDATA #IMPLIED -!ATTLIST arg1 resource CDATA #IMPLIED - - -!-- - - DEPRECATED Use arg position=2/ instead. - - The arg2 element defines the third replacement value to use with the - message template for this validator or this field. - The arg2 element accepts these attributes. - - nameThe name of the validator corresponding to this msg. - - key The key that will return the message template from a - resource bundle. - - resourceIf set to false, the key is taken to be a literal - value rather than a bundle key. - [true] --- -!ELEMENT arg2 EMPTY -!ATTLIST arg2 name CDATA #IMPLIED -!ATTLIST arg2 key CDATA #IMPLIED -!ATTLIST arg2 resource CDATA #IMPLIED - - -!-- - - DEPRECATED Use arg position=3/ instead. - - The arg3 element defines the fourth replacement value to use with the - message template for this validator or this field. - The arg0 element accepts these attributes. - - nameThe name of the validator corresponding to this msg. - - key The key that will return the message template from a - resource bundle. - - resourceIf set to false, the key is taken to be a literal - value rather than a bundle key. - [true] --- -!ELEMENT arg3 EMPTY -!ATTLIST arg3 name CDATA #IMPLIED -!ATTLIST arg3 key CDATA #IMPLIED -!ATTLIST arg3 resource CDATA #IMPLIED - - !-- The var element can set parameters that a field may need to pass to one of its validators, such as the minimum and maximum values in a 1.5 +1 -23 jakarta-commons/validator/src/share/org/apache/commons/validator/digester-rules.xml Index: digester-rules.xml === RCS file: /home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/digester-rules.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- digester-rules.xml28 May 2003 04:14:32 - 1.4 +++ digester-rules.xml8 Apr 2004 23:20:52 - 1.5 @@ -70,28 +70,6 @@ set-properties-rule/ set-next-rule methodname=addArg paramtype=org.apache.commons.validator.Arg / /pattern - - !-- The arg0, etc. elements are deprecated. We can remove these definitions after 1.1
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator Field.java Form.java FormSet.java
dgraham 2004/04/08 16:22:03
Modified:validator/src/share/org/apache/commons/validator Field.java
Form.java FormSet.java
Log:
Removed items deprecated in 1.1.x series.
Revision ChangesPath
1.32 +5 -176
jakarta-commons/validator/src/share/org/apache/commons/validator/Field.java
Index: Field.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/Field.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Field.java21 Feb 2004 17:10:29 - 1.31
+++ Field.java8 Apr 2004 23:22:03 - 1.32
@@ -54,13 +54,6 @@
org.apache.commons.validator.Field.DEFAULT;
/**
- * This is the value that will be used as a key if the codeArg/code
- * name field has no value.
- * @deprecated
- */
-public static final String ARG_DEFAULT = DEFAULT_ARG;
-
-/**
* This indicates an indexed property is being referenced.
*/
public static final String TOKEN_INDEXED = [];
@@ -84,11 +77,6 @@
protected int fieldOrder = 0;
/**
- * @deprecated This is no longer used.
- */
-protected FastHashMap hDependencies = new FastHashMap();
-
-/**
* Internal representation of this.depends String as a List. This List
* gets updated whenever setDepends() gets called. This List is
* synchronized so a call to setDepends() (which clears the List) won't
@@ -109,26 +97,6 @@
protected Map[] args = new Map[0];
/**
- * @deprecated This variable is no longer used, use args instead.
- */
-protected FastHashMap hArg0 = new FastHashMap();
-
-/**
- * @deprecated This variable is no longer used, use args instead.
- */
-protected FastHashMap hArg1 = new FastHashMap();
-
-/**
- * @deprecated This variable is no longer used, use args instead.
- */
-protected FastHashMap hArg2 = new FastHashMap();
-
-/**
- * @deprecated This variable is no longer used, use args instead.
- */
-protected FastHashMap hArg3 = new FastHashMap();
-
-/**
* Gets the page value that the Field is associated with for
* validation.
*/
@@ -339,111 +307,6 @@
}
/**
- * Add a codeArg/code to the arg0 list.
- * @deprecated Use addArg(Arg) instead.
- */
-public void addArg0(Arg arg) {
-arg.setPosition(0);
-this.addArg(arg);
-}
-
-/**
- * Gets the default arg0 codeArg/code object.
- * @deprecated Use getArg(0) instead.
- */
-public Arg getArg0() {
-return this.getArg(0);
-}
-
-/**
- * Gets the arg0 codeArg/code object based on the key passed in. If
- * the key finds a codenull/code value then the default value will
- * be retrieved.
- * @deprecated Use getArg(String, 0) instead.
- */
-public Arg getArg0(String key) {
-return this.getArg(key, 0);
-}
-
-/**
- * Add a codeArg/code to the arg1 list.
- * @deprecated Use addArg(Arg) instead.
- */
-public void addArg1(Arg arg) {
-arg.setPosition(1);
-this.addArg(arg);
-}
-
-/**
- * Gets the default arg1 codeArg/code object.
- * @deprecated Use getArg(1) instead.
- */
-public Arg getArg1() {
-return this.getArg(1);
-}
-
-/**
- * Gets the arg1 codeArg/code object based on the key passed in. If the key
- * finds a codenull/code value then the default value will try to be
retrieved.
- * @deprecated Use getArg(String, 1) instead.
- */
-public Arg getArg1(String key) {
-return this.getArg(key, 1);
-}
-
-/**
- * Add a codeArg/code to the arg2 list.
- * @deprecated Use addArg(Arg) instead.
- */
-public void addArg2(Arg arg) {
-arg.setPosition(2);
-this.addArg(arg);
-}
-
-/**
- * Gets the default arg2 codeArg/code object.
- * @deprecated Use getArg(2) instead.
- */
-public Arg getArg2() {
-return this.getArg(2);
-}
-
-/**
- * Gets the arg2 codeArg/code object based on the key passed in. If the key
- * finds a codenull/code value then the default value will try to be
retrieved.
- * @deprecated Use getArg(String, 2) instead.
- */
-public Arg getArg2(String key) {
-return this.getArg(key, 2);
-}
-
-/**
- * Add a codeArg/code to the arg3 list.
- * @deprecated Use addArg(Arg) instead.
- */
-public void addArg3(Arg arg) {
-arg.setPosition(3);
-this.addArg(arg
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator CreditCardValidator.java ValidatorAction.java Constant.java
dgraham 2004/04/08 16:29:31
Modified:validator/src/share/org/apache/commons/validator
CreditCardValidator.java ValidatorAction.java
Removed: validator/src/share/org/apache/commons/validator
Constant.java
Log:
Removed items deprecated in 1.1.x series.
Revision ChangesPath
1.17 +3 -20
jakarta-commons/validator/src/share/org/apache/commons/validator/CreditCardValidator.java
Index: CreditCardValidator.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/CreditCardValidator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CreditCardValidator.java 21 Feb 2004 17:10:29 - 1.16
+++ CreditCardValidator.java 8 Apr 2004 23:29:31 - 1.17
@@ -182,23 +182,6 @@
return (sum == 0) ? false : (sum % 10 == 0);
}
-
-/**
- * Checks for a valid credit card number.
- * @param card Credit Card Number.
- * @deprecated This will be removed in a future release.
- */
-protected boolean isValidPrefix(String card) {
-
-if (card.length() 13) {
-return false;
-}
-
-return new Visa().matches(card)
-|| new Amex().matches(card)
-|| new Mastercard().matches(card)
-|| new Discover().matches(card);
-}
/**
* CreditCardType implementations define how validation is performed
1.21 +3 -46
jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorAction.java
Index: ValidatorAction.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorAction.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ValidatorAction.java 21 Feb 2004 17:10:29 - 1.20
+++ ValidatorAction.java 8 Apr 2004 23:29:31 - 1.21
@@ -28,7 +28,6 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -226,14 +225,6 @@
}
/**
- * Gets the method parameters for the method as an unmodifiable List.
- * @deprecated This will be removed after Validator 1.1.2
- */
-public List getMethodParamsList() {
-return Collections.unmodifiableList(this.methodParameterList);
-}
-
-/**
* Gets the dependencies of the validator action as a comma separated list
* of validator names.
*/
@@ -346,22 +337,6 @@
}
/**
- * Gets an instance based on the validator action's classname.
- * @deprecated This will be removed after Validator 1.1.2
- */
-public Object getClassnameInstance() {
-return instance;
-}
-
-/**
- * Sets an instance based on the validator action's classname.
- * @deprecated This will be removed after Validator 1.1.2
- */
-public void setClassnameInstance(Object instance) {
-this.instance = instance;
-}
-
-/**
* Initialize based on set.
*/
protected void init() {
@@ -492,28 +467,10 @@
}
/**
- * Creates a codeFastHashMap/code for the isDependency method
- * based on depends.
- * @deprecated This functionality has been moved to other methods. It's no
- * longer required to call this method to initialize this object.
- */
-public synchronized void process(Map globalConstants) {
-// do nothing
-}
-
-/**
* Checks whether or not the value passed in is in the depends field.
*/
public boolean isDependency(String validatorName) {
return this.dependencyList.contains(validatorName);
-}
-
-/**
- * Gets the dependencies as a codeCollection/code.
- * @deprecated Use getDependencyList() instead.
- */
-public Collection getDependencies() {
-return this.getDependencyList();
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs tasks.xml
dgraham 2004/04/08 16:40:54 Modified:validator/xdocs tasks.xml Log: Removed completed tasks. Revision ChangesPath 1.12 +1 -15 jakarta-commons/validator/xdocs/tasks.xml Index: tasks.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/tasks.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tasks.xml 28 Mar 2004 19:32:40 - 1.11 +++ tasks.xml 8 Apr 2004 23:40:54 - 1.12 @@ -27,15 +27,6 @@ Validator. Contributions are welcome! /p -subsection name=High priority - ul - li - Remove functionality deprecated in 1.1.0 release in 1.2.0 release. - /li - /ul -/subsection - -subsection name=Medium priority ul li Integrate the creation of javascript javadocs into the maven build. What will need to happen @@ -92,12 +83,7 @@ conditions. /li /ul -/subsection - -subsection name=Low priority - ul - /ul -/subsection + /section /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator GenericTypeValidator.java
dgraham 2004/04/08 17:16:39
Modified:validator/src/share/org/apache/commons/validator
GenericTypeValidator.java
Log:
javadoc changes only.
Revision ChangesPath
1.14 +4 -6
jakarta-commons/validator/src/share/org/apache/commons/validator/GenericTypeValidator.java
Index: GenericTypeValidator.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/GenericTypeValidator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GenericTypeValidator.java 21 Feb 2004 17:10:29 - 1.13
+++ GenericTypeValidator.java 9 Apr 2004 00:16:39 - 1.14
@@ -35,9 +35,7 @@
* correctly typed class based on the validation performed.
*/
public class GenericTypeValidator implements Serializable {
-/*
-* Logger.
-*/
+
private static Log log = LogFactory.getLog(GenericTypeValidator.class);
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator Form.java
dgraham 2004/04/04 12:38:45
Modified:validator/src/share/org/apache/commons/validator Form.java
Log:
Added @since javadoc tags for new methods and properties.
Revision ChangesPath
1.16 +14 -8
jakarta-commons/validator/src/share/org/apache/commons/validator/Form.java
Index: Form.java
===
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/Form.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Form.java 4 Apr 2004 13:53:25 - 1.15
+++ Form.java 4 Apr 2004 19:38:45 - 1.16
@@ -61,13 +61,14 @@
/**
* The name/key of the form which this form extends from.
- */
+ * @since Validator 1.2.0
+ */
protected String inherit = null;
/**
* Whether or not the this codeForm/code was processed
* for replacing variables in strings with their values.
- */
+ */
private boolean processed = false;
/**
@@ -143,12 +144,13 @@
/**
* Processes all of the codeForm/code's codeField/codes.
- */
+ * @since Validator 1.2.0
+ */
protected void process(Map globalConstants, Map constants, Map forms) {
-
if (isProcessed()) {
return;
}
+
int n = 0; //we want the fields from its parent first
if (isExtending()) {
Form parent = (Form) forms.get(inherit);
@@ -228,13 +230,15 @@
/**
* Whether or not the this codeForm/code was processed
* for replacing variables in strings with their values.
- */
+ * @since Validator 1.2.0
+ */
public boolean isProcessed() {
return processed;
}
/**
* Gets the name/key of the parent set of validation rules.
+ * @since Validator 1.2.0
*/
public String getExtends() {
return inherit;
@@ -242,6 +246,7 @@
/**
* Sets the name/key of the parent set of validation rules.
+ * @since Validator 1.2.0
*/
public void setExtends(String string) {
inherit = string;
@@ -249,6 +254,7 @@
/**
* Get extends flag.
+ * @since Validator 1.2.0
*/
public boolean isExtending() {
return inherit != null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/share/org/apache/commons/validator ValidatorResourcesInitializer.java
dgraham 2004/04/04 12:40:30 Removed: validator/src/share/org/apache/commons/validator ValidatorResourcesInitializer.java Log: Removed deprecated ValidatorResourcesInitializer class. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator maven.xml
dgraham 2004/04/03 13:19:14
Modified:validator maven.xml
Log:
Simplified copying validator dtd files.
Revision ChangesPath
1.5 +9 -11 jakarta-commons/validator/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/validator/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 29 Feb 2004 09:48:28 - 1.4
+++ maven.xml 3 Apr 2004 21:19:14 - 1.5
@@ -13,6 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
+
project default=java:jar
preGoal name=xdoc:jelly-transform
@@ -21,25 +22,22 @@
postGoal name=java:compile
-copytodir=${maven.build.dir}/classes/
+copy todir=${maven.build.dir}/classes/
fileset dir=${pom.build.sourceDirectory}
excludes=**/*.java/
/copy
-copy
todir=${maven.build.dir}/classes/org/apache/commons/validator/resources/
- file=${basedir}/conf/share/validator_1_0.dtd/
-
-copy
todir=${maven.build.dir}/classes/org/apache/commons/validator/resources/
- file=${basedir}/conf/share/validator_1_0_1.dtd/
-
-copy
todir=${maven.build.dir}/classes/org/apache/commons/validator/resources/
- file=${basedir}/conf/share/validator_1_1.dtd/
+copy
todir=${maven.build.dir}/classes/org/apache/commons/validator/resources/
+ fileset dir=${basedir}/conf/share
+ includes=validator*.dtd/
+/copy
-copytodir=${maven.build.dir}/classes/
+copy todir=${maven.build.dir}/classes/
fileset dir=${javascript.home}
includes=**/*.js/
/copy
/postGoal
-/project
\ No newline at end of file
+/project
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator maven.xml
dgraham 2004/04/03 13:35:31
Modified:validator maven.xml
Log:
Use src/javacript directory to copy js files. Using ${javascript.home}
copied them to the wrong directory for some reason.
Revision ChangesPath
1.6 +1 -1 jakarta-commons/validator/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/validator/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 3 Apr 2004 21:19:14 - 1.5
+++ maven.xml 3 Apr 2004 21:35:31 - 1.6
@@ -33,7 +33,7 @@
/copy
copy todir=${maven.build.dir}/classes/
- fileset dir=${javascript.home}
+ fileset dir=src/javascript
includes=**/*.js/
/copy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/04/03 14:00:10 Modified:validator project.xml Log: Run ValidatorTestSuite instead of all test classes individually. Revision ChangesPath 1.39 +2 -12 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- project.xml 3 Apr 2004 06:10:50 - 1.38 +++ project.xml 3 Apr 2004 22:00:10 - 1.39 @@ -236,14 +236,13 @@ /dependencies build - nagEmailAddress[EMAIL PROTECTED]/nagEmailAddress - sourceDirectorysrc/share/sourceDirectory +unitTestSourceDirectorysrc/test/unitTestSourceDirectory unitTest includes -include**/*Test.java/include +include**/ValidatorTestSuite.java/include /includes resources resource @@ -254,15 +253,6 @@ /resource /resources /unitTest - -resources - resource -excludes - exclude**/*.java/exclude -/excludes - /resource -/resources - /build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/conf/share validator_1_1_2.dtd
dgraham 2004/04/03 15:02:51 Removed: validator/conf/share validator_1_1_2.dtd Log: Removed the 1.1.2 dtd because it has no new changes since 1.1. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/04/02 21:05:32 Modified:dbutils project.xml Log: Removed some commented reports we don't need. Revision ChangesPath 1.12 +0 -3 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 15 Mar 2004 05:31:40 - 1.11 +++ project.xml 3 Apr 2004 05:05:32 - 1.12 @@ -143,16 +143,13 @@ reportmaven-changelog-plugin/report reportmaven-changes-plugin/report !--reportmaven-checkstyle-plugin/report-- - !--reportmaven-clover-plugin/report-- reportmaven-developer-activity-plugin/report reportmaven-file-activity-plugin/report reportmaven-javadoc-plugin/report - !--reportmaven-jellydoc-plugin/report-- reportmaven-junit-report-plugin/report reportmaven-jxr-plugin/report reportmaven-license-plugin/report !--reportmaven-linkcheck-plugin/report-- - !--reportmaven-statcvs-plugin/report-- !--reportmaven-tasklist-plugin/report-- /reports - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs changes.xml
dgraham 2004/04/02 21:19:13 Added: dbutils/xdocs changes.xml Log: Added changes.xml file for the maven-changes-plugin to generate release notes with. Revision ChangesPath 1.1 jakarta-commons/dbutils/xdocs/changes.xml Index: changes.xml === ?xml version=1.0? !-- Copyright 2004 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -- !-- This file is used by the maven-changes-plugin to generate the release notes. Useful ways of finding items to add to this file are: 1. Add items when you fix a bug or add a feature (this makes the release process easy :-). 2. Do a bugzilla search for tickets closed since the previous release. 3. Use the report generated by the maven-changelog-plugin to see all CVS commits. Set the project.properties' maven.changelog.range property to the number of days since the last release. The action type attribute can be add,update,fix,remove. -- document properties titleRelease Notes/title /properties body release version=1.1-dev date=in CVS action dev=dgraham type=add Refactored bean handling from BasicRowProcessor into new BeanProcessor class. This also fixes the common problem with Oracle NUMERIC fields not being set into bean properties. /action action dev=dgraham type=add Added QueryRunner.batch() methods for batch updates. PR# 27530 /action action dev=dgraham type=add Added new ResultSetHandler implementation, ColumnListHandler, that converts one ResultSet column into a List of Objects. PR# 27377 /action /release release version=1.0 date=2003-11-10 action type=add This is the first release of the Commons DbUtils package. DbUtils is a small set of classes designed to make working with JDBC easier. /action action type=add QueryRunner class with ResultSetHandler interface allow you to easily query or update a database and handle the ResultSet. Several useful implementations of the ResultSetHandler interface are located in the org.apache.commons.dbutils.handlers.* package. /action action type=add ResultSet wrappers that decorate ResultSets with specialized behavior. See the classes in the org.apache.commons.dbutils.wrappers.* package for details. /action action type=add Dynamic JDBC API interface implementations via the standard java.lang.reflect.Proxy class. This allows you to implement JDBC interfaces such as ResultSet at runtime to avoid API version incompatibilities. See org.apache.commons.dbutils.ProxyFactory for details. /action /release /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils RELEASE-NOTES.txt
dgraham 2004/04/02 21:22:17 Modified:dbutils RELEASE-NOTES.txt Log: Point to the website for release notes. Revision ChangesPath 1.4 +5 -23 jakarta-commons/dbutils/RELEASE-NOTES.txt Index: RELEASE-NOTES.txt === RCS file: /home/cvs/jakarta-commons/dbutils/RELEASE-NOTES.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RELEASE-NOTES.txt 12 Nov 2003 03:07:34 - 1.3 +++ RELEASE-NOTES.txt 3 Apr 2004 05:22:17 - 1.4 @@ -1,30 +1,12 @@ $Id$ - Commons DbUtils Package -Version 1.0 - Release Notes +Commons DbUtils Package +Release Notes -INTRODUCTION: +You can find release notes for this and past releases online at -This is the first release of the Commons DbUtils package. DbUtils -is a small set of classes designed to make working with JDBC easier. More -information can be found at http://jakarta.apache.org/commons/dbutils/. - -FEATURES: - -* QueryRunner class with ResultSetHandler interface allow you to easily query or -update a database and handle the ResultSet. Several useful implementations -of the ResultSetHandler interface are located in the -org.apache.commons.dbutils.handlers.* package. - -* ResultSet wrappers that decorate ResultSets with specialized behavior. See -the classes in the org.apache.commons.dbutils.wrappers.* package for details. - -* Dynamic JDBC API interface implementations via the standard -java.lang.reflect.Proxy class. This allows you to implement JDBC interfaces -such as ResultSet at runtime to avoid API version incompatibilities. See -org.apache.commons.dbutils.ProxyFactory for details. +http://jakarta.apache.org/commons/validator/changes-report.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/04/02 22:10:50 Modified:validator project.xml Added: validator/xdocs/images logo.png Removed: validator/xdocs/images validator-logo-blue.png Log: Changed logo to match other commons components. Revision ChangesPath 1.1 jakarta-commons/validator/xdocs/images/logo.png Binary file 1.38 +0 -1 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- project.xml 30 Mar 2004 06:22:54 - 1.37 +++ project.xml 3 Apr 2004 06:10:50 - 1.38 @@ -20,7 +20,6 @@ nameValidator/name idcommons-validator/id currentVersion1.1.3-dev/currentVersion - logo/images/validator-logo-blue.png/logo inceptionYear2002/inceptionYear packageorg.apache.commons.validator/package - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.xml
dgraham 2004/04/02 22:11:53 Modified:dbutils project.xml Added: dbutils/xdocs/images logo.png Removed: dbutils/xdocs/images dbutils-logo-blue.png Log: Changed logo to match other commons components. Revision ChangesPath 1.1 jakarta-commons/dbutils/xdocs/images/logo.png Binary file 1.13 +0 -1 jakarta-commons/dbutils/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/dbutils/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- project.xml 3 Apr 2004 05:05:32 - 1.12 +++ project.xml 3 Apr 2004 06:11:53 - 1.13 @@ -21,7 +21,6 @@ currentVersion1.1-dev/currentVersion inceptionYear2002/inceptionYear - logo/images/dbutils-logo-blue.png/logo shortDescriptionCommons DbUtils/shortDescription descriptionA package of Java utility classes for easing JDBC development/description - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.properties
dgraham 2004/03/28 11:30:16
Modified:validator project.properties
Log:
Added maven.changelog.range property.
Revision ChangesPath
1.7 +6 -16 jakarta-commons/validator/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons/validator/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties29 Feb 2004 09:48:28 - 1.6
+++ project.properties28 Mar 2004 19:30:16 - 1.7
@@ -12,26 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# ---
-# P R O J E C T P R O P E R T I E S - Modeled after Turbine project.properties
-#
-# $Id$
-#
-# Do not change this file. Please use build.properties in this directory
-# to do site or installation specific changes to the project build.
-# ---
-#
# You can uncomment this if you're willing to use the unofficial
# Validator-specific jar repository at the Validator site. This will
# contain all the jars needed to build Validator, even if a jar
# is missing on ibiblio
-#
+
#maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/commons/validator/repo
maven.checkstyle.properties = conf/share/ValidatorCheckStyle.xml
-#keep ant maven directories seperate.
+# Keep ant and maven directories seperate.
maven.build.dir=m-target
# Include legacy javadoc in build
@@ -39,19 +30,18 @@
# commons site LF
maven.xdoc.jsl=../commons-build/commons-site.jsl
-
-# No powered by Image
maven.xdoc.poweredby.image=
-
-# display the date on the site
maven.xdoc.date = left
-# Display the version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
compile.debug = on
compile.optimize = off
compile.deprecation = on
maven.compile.deprecation = on
+
+#maven.test.skip = true
+#maven.test.failure.ignore = true
+maven.changelog.range = 120
# ---
# N I G H T L Y B U I L D P R O P E R T I E S
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/03/28 11:31:20 Modified:validator project.xml Log: Commented maven-tasklist-plugin report because it has no output. Revision ChangesPath 1.35 +2 -2 jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- project.xml 27 Mar 2004 23:49:42 - 1.34 +++ project.xml 28 Mar 2004 19:31:20 - 1.35 @@ -288,11 +288,11 @@ reportmaven-javadoc-plugin/report reportmaven-jxr-plugin/report reportmaven-junit-report-plugin/report -reportmaven-tasklist-plugin/report +!-- reportmaven-tasklist-plugin/report -- reportmaven-pmd-plugin/report reportmaven-simian-plugin/report reportmaven-faq-plugin/report -!--reportmaven-clover-plugin/report-- +!-- reportmaven-clover-plugin/report -- /reports /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs changes.xml tasks.xml
dgraham 2004/03/28 11:32:40 Modified:validator/xdocs tasks.xml Added: validator/xdocs changes.xml Log: Moved release note info from tasks.xml to new changes.xml file used by the maven-changes-plugin. Revision ChangesPath 1.11 +0 -208jakarta-commons/validator/xdocs/tasks.xml Index: tasks.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/tasks.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tasks.xml 28 Mar 2004 00:07:53 - 1.10 +++ tasks.xml 28 Mar 2004 19:32:40 - 1.11 @@ -99,214 +99,6 @@ /ul /subsection /section -section name='Completed' -subsection name='Since 1.1.0 Release' -ul - li -Add javadoc to javascript, and use - a href=http://jsdoc.sf.net; jsdoc/a to process it. - /li - li -Ignore validation criteria when field is disabled for all field types. - /li - li - Add required check for single checkbox. - /li - li - Let max/min length also cover passwords fields. Don't use these for checking login pages, - only when the user is modifying the password. - /li - li - Added Field.getArgs(String) to make it easier to retrieve all of the Args for a given validator. - /li - li - Modify javascript to honor datapattern option. - /li - li - Add ability of required to handle checkboxes, radio,select-one, and select-multiple field types. - /li - li - Add ability to use required condition on array types like checkboxes. - /li -/ul -/subsection -subsection name='Since 1.0.2 Release' -ul - li - Move Digester rule configuration to XML file and remove ValidatorResourcesInitializer. - ValidatorResources now knows how to initialize itself. - /li - li - Clean up scopes of methods and variables. - /li - li - Make Arg system more flexible to allow any number of args in a message. - /li - li - Validate validation.xml files while initializing a Validator to alert developers to configuration - errors. - /li - li - Refactored codeGenericValidator/code methods into reusable objects. These include: - CreditCardValidator, EmailValidator, DateValidator, and UrlValidator. - /li - /ul -/subsection -/section -section name='Deprecated' -subsection name='Since 1.0.2 Release' - pSee the javadoc for details and replacements./p -ul -li - The lt;arg0-3gt; elements have been replaced with a single lt;arggt; element - with a new codeposition/code attribute. Setting position to 0 is the equivalent - of an lt;arg0gt; element. - /li - li - codeArg.getResource()/code - /li - li - codeCreditCardValidator.isValidPrefix()/code - /li - li - codeField.ARG_DEFAULT/code - /li - li - codeField.hDependencies/code - /li - li - codeField.hArg0 - Field.hArg3/code - /li - li - codeField.addArg0() - Field.addArg3()/code - /li - li - codeField.getArg0() - Field.getArg3()/code - /li - li - codeField.addVarParam()/code - /li - li - codeField.process()/code - /li - li - codeField.processMessageComponents()/code - /li - li - codeField.getDependencies()/code - /li - li - codeForm.getFieldMap()/code - /li - li - codeForm.process()/code - /li - li - codeFormSet.addConstant()/code - /li - li - codeFormSet.addConstantParam()/code - /li - li - codeFormSet.getForm(Object)/code - /li - li
cvs commit: jakarta-commons/validator RELEASE-NOTES.readme
dgraham 2004/03/28 11:34:14 Modified:validator RELEASE-NOTES.readme Log: Point to changes-report.html for release notes. Revision ChangesPath 1.2 +1 -1 jakarta-commons/validator/RELEASE-NOTES.readme Index: RELEASE-NOTES.readme === RCS file: /home/cvs/jakarta-commons/validator/RELEASE-NOTES.readme,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- RELEASE-NOTES.readme 15 Dec 2003 06:10:51 - 1.1 +++ RELEASE-NOTES.readme 28 Mar 2004 19:34:14 - 1.2 @@ -4,4 +4,4 @@ and - http://jakarta.apache.org/commons/validator/tasks.html \ No newline at end of file + http://jakarta.apache.org/commons/validator/changes-report.html \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs changes.xml
dgraham 2004/03/28 11:48:28 Modified:validator/xdocs changes.xml Log: Added 1.1.2 release notes. Revision ChangesPath 1.2 +33 -2 jakarta-commons/validator/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/changes.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- changes.xml 28 Mar 2004 19:32:40 - 1.1 +++ changes.xml 28 Mar 2004 19:48:28 - 1.2 @@ -40,8 +40,39 @@ release version=1.1.2 (alpha) date=in CVS action dev=rleland type=update - - /action +Allow multiple forms to be on the same page by +generating a unique variable name based on form name. +PR# 17667 + /action + action dev=rleland type=add +Validate file extensions for file uploads. PR# 26585 + /action + action dev=rleland type=add +Add Support for hidden fields in javascript +validations. PR# 26584 + /action + action dev=dgraham type=update +The framework will convert checked exceptions into +ValidatorExceptions so any ValidatorException thrown out +of the framework indicates a 'system' exception that +stops validation processing. If a pluggable validation +method throws a ValidatorException it will be rethrown +and passed out of the framework. Any other exception from +a pluggable validation method is still considered a validation +failure rather than a system exception to maintain backwards +compatibility. PR# 24369 + /action + action dev=dgraham type=add +Added a more flexible card validation system that doesn't +require CreditCardValidator to support every brand of +credit card. PR# 25869 + /action + action dev=dgraham type=update +Throw RuntimeException if clone fails instead of InternalError. + /action + action dev=dgraham type=add + Added Flags.clear(). + /action /release release version=1.1.1 (alpha) date=2003-12-15 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs changes.xml
dgraham 2004/03/28 14:04:43 Modified:validator/xdocs changes.xml Log: Blame me instead of Rob for a change in 1.1.1 :-). Revision ChangesPath 1.3 +1 -1 jakarta-commons/validator/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/changes.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- changes.xml 28 Mar 2004 19:48:28 - 1.2 +++ changes.xml 28 Mar 2004 22:04:43 - 1.3 @@ -91,7 +91,7 @@ these for checking login pages, only when the user is modifying the password. /action - action dev=rleland type=add + action dev=dgraham type=add Added Field.getArgs(String) to make it easier to retrieve all of the Args for a given validator. /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources/src/java/org/apache/commons/resources MessageList.java Messages.java ResourcesFactoryFinder.java ResourcesFactory.java Resources.java ResourcesException.java Message.java ResourcesKeyException.java
dgraham 2004/03/27 13:34:10
Modified:resources/src/test/org/apache/commons/resources/impl
TestResourcesFactory.java
ResourceBundleResourcesTestCase.java
XMLResourcesTestCase.java
ResourcesFactoryBaseTestCase.java
PropertyResourcesTestCase.java
BasicMessageListTestCase.java
CollectionResourcesBaseTestCase.java
CollResources.java ResourcesBaseTestCase.java
TestResources.java CollResourcesFactory.java
BasicMessageTestCase.java
ResourceBundleResourcesFactoryTestCase.java
resources/src/java/org/apache/commons/resources/impl
WebappPropertyResourcesFactory.java
PropertyResources.java WebappPropertyResources.java
ResourcesFactoryBase.java
WebappXMLResourcesFactory.java XMLResources.java
WebappXMLResources.java
ResourceBundleResources.java ResourcesBase.java
CollectionResourcesBase.java BasicMessageList.java
ResourceBundleResourcesFactory.java
PropertyResourcesFactory.java BasicMessage.java
XMLResourcesFactory.java
resources/src/test/org/apache/commons/resources
MessagesTestCase.java
resources/src/java/org/apache/commons/resources
MessageList.java Messages.java
ResourcesFactoryFinder.java ResourcesFactory.java
Resources.java ResourcesException.java Message.java
ResourcesKeyException.java
Log:
Removed @author javadoc tags.
Revision ChangesPath
1.8 +3 -14
jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/TestResourcesFactory.java
Index: TestResourcesFactory.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/TestResourcesFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestResourcesFactory.java 18 Feb 2004 01:37:38 - 1.7
+++ TestResourcesFactory.java 27 Mar 2004 21:34:09 - 1.8
@@ -28,19 +28,8 @@
/**
* pConcrete implementation of [EMAIL PROTECTED] ResourcesFactory} for unit
tests./p
- *
- * @author Craig R. McClanahan
- * @version $Revision$ $Date$
*/
-
public class TestResourcesFactory extends ResourcesFactoryBase {
-
-
-// - Public Methods
-
-
-// -- Protected Methods
-
/**
* pCreate and return a new [EMAIL PROTECTED] Resources} instance with the
1.9 +3 -7
jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourceBundleResourcesTestCase.java
Index: ResourceBundleResourcesTestCase.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/ResourceBundleResourcesTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResourceBundleResourcesTestCase.java 18 Feb 2004 01:37:38 - 1.8
+++ ResourceBundleResourcesTestCase.java 27 Mar 2004 21:34:09 - 1.9
@@ -36,11 +36,7 @@
* pUnit tests for
* codeorg.apache.commons.resources.impl.ResourceBundleResources/code.
* /p
- *
- * @author Craig R. McClanahan
- * @version $Revision$ $Date$
*/
-
public class ResourceBundleResourcesTestCase
extends ResourceBundleResourcesFactoryTestCase {
1.7 +3 -18
jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/XMLResourcesTestCase.java
Index: XMLResourcesTestCase.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/resources/src/test/org/apache/commons/resources/impl/XMLResourcesTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLResourcesTestCase.java 18 Feb 2004 01:37:38 - 1.6
+++ XMLResourcesTestCase.java 27 Mar 2004 21:34:09 - 1.7
@@ -32,27 +32,12 @@
* pUnit tests for
* codeorg.apache.commons.resources.impl.XMLResources/code.
* /p
- *
- * @author Craig R. McClanahan
- * @version $Revision$ $Date$
*/
-
public class XMLResourcesTestCase extends CollectionResourcesBaseTestCase {
-
-// - Instance Variables
cvs commit: jakarta-commons-sandbox/resources project.xml
dgraham 2004/03/27 13:38:38 Modified:resources project.xml Log: Added contributors section. Revision ChangesPath 1.8 +10 -1 jakarta-commons-sandbox/resources/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/resources/project.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- project.xml 28 Feb 2004 05:31:00 - 1.7 +++ project.xml 27 Mar 2004 21:38:38 - 1.8 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? project - extend../sandbox-build/project.xml/extend +!-- extend../sandbox-build/project.xml/extend -- namecommons-resources/name idcommons-resources/id currentVersion1.0-dev/currentVersion @@ -69,6 +69,15 @@ organizationEdgeTech, Inc/organization /developer /developers + + contributors +contributor + nameDominique Plante/name + id/id + email/email + organization/organization +/contributor + /contributors dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils project.properties
dgraham 2004/03/27 14:01:03
Modified:dbutils project.properties
Log:
Disabled maven logo.
Revision ChangesPath
1.5 +2 -2 jakarta-commons/dbutils/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons/dbutils/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties28 Feb 2004 00:36:26 - 1.4
+++ project.properties27 Mar 2004 22:01:03 - 1.5
@@ -20,4 +20,4 @@
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
-maven.xdoc.poweredby.image=maven-feather.png
+maven.xdoc.poweredby.image=
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper project.properties
dgraham 2004/03/27 14:09:56
Modified:mapper project.properties
Log:
Use Commons Sandbox look and feel.
Revision ChangesPath
1.2 +19 -5 jakarta-commons-sandbox/mapper/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons-sandbox/mapper/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties17 Jan 2004 17:53:47 - 1.1
+++ project.properties27 Mar 2004 22:09:56 - 1.2
@@ -1,9 +1,23 @@
+# Copyright 2003-2004 The Apache Software Foundation
#
-# $Id$
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
-# display the date on the site
-maven.xdoc.date = left
-# Display the version the web site is documenting
-maven.xdoc.version = ${pom.currentVersion}
\ No newline at end of file
+##
+# commons site LF
+##
+maven.xdoc.jsl=../sandbox-build/commons-site.jsl
+maven.xdoc.date=left
+maven.xdoc.poweredby.image=
+maven.xdoc.version=${pom.currentVersion}
+maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources project.properties
dgraham 2004/03/27 14:18:16
Modified:resources project.properties
Log:
Use Commons Sandbox look and feel.
Revision ChangesPath
1.3 +23 -4 jakarta-commons-sandbox/resources/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons-sandbox/resources/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties8 Sep 2003 18:15:18 - 1.2
+++ project.properties27 Mar 2004 22:18:16 - 1.3
@@ -1,6 +1,26 @@
-# ---
-# P R O J E C T P R O P E R T I E S
-# ---
+# Copyright 2003-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+##
+# commons site LF
+##
+maven.xdoc.jsl=../sandbox-build/commons-site.jsl
+maven.xdoc.date=left
+maven.xdoc.poweredby.image=
+maven.xdoc.version=${pom.currentVersion}
+maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
compile.debug = on
compile.optimize = off
@@ -26,4 +46,3 @@
maven.checkstyle.ignore.public.in.interface = true
resources.repository=scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/resources/
-maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources project.xml
dgraham 2004/03/27 14:18:41 Modified:resources project.xml Log: Order developer list by last name. Revision ChangesPath 1.9 +25 -25jakarta-commons-sandbox/resources/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/resources/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- project.xml 27 Mar 2004 21:38:38 - 1.8 +++ project.xml 27 Mar 2004 22:18:41 - 1.9 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? project -!-- extend../sandbox-build/project.xml/extend -- + extend../sandbox-build/project.xml/extend namecommons-resources/name idcommons-resources/id currentVersion1.0-dev/currentVersion @@ -21,52 +21,52 @@ organization/organization /developer developer - nameCraig McClanahan/name - idcraigmcc/id - email[EMAIL PROTECTED]/email + nameRobert Burrell Donkin/name + idrdonkin/id + emailrdonkin hat apache.org/email organization/organization /developer developer - nameMichael Schachter/name - idmschachter/id - email[EMAIL PROTECTED]/email + nameDavid Graham/name + iddgraham/id + email[EMAIL PROTECTED]/email organization/organization /developer developer - nameJason van Zyl/name - idjvanzyl/id - email[EMAIL PROTECTED]/email + nameCraig McClanahan/name + idcraigmcc/id + email[EMAIL PROTECTED]/email organization/organization /developer developer + nameJames Mitchell/name + idjmitchell/id + email[EMAIL PROTECTED]/email + organizationEdgeTech, Inc/organization +/developer +developer nameDaniel Rall/name iddlr/id email[EMAIL PROTECTED]/email organization/organization /developer developer + nameMichael Schachter/name + idmschachter/id + email[EMAIL PROTECTED]/email + organization/organization +/developer +developer nameJames Strachan/name idjstrachan/id email[EMAIL PROTECTED]/email organizationSpiritSoft, Inc./organization /developer developer - nameDavid Graham/name - iddgraham/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer - nameRobert Burrell Donkin/name - idrdonkin/id - emailrdonkin hat apache.org/email + nameJason van Zyl/name + idjvanzyl/id + email[EMAIL PROTECTED]/email organization/organization -/developer -developer - nameJames Mitchell/name - idjmitchell/id - email[EMAIL PROTECTED]/email - organizationEdgeTech, Inc/organization /developer /developers - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/resources/xdocs navigation.xml
dgraham 2004/03/27 15:21:04 Modified:resources/xdocs navigation.xml Log: Import Commons Sandbox navigation. Revision ChangesPath 1.5 +25 -8 jakarta-commons-sandbox/resources/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons-sandbox/resources/xdocs/navigation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- navigation.xml28 Feb 2004 15:23:56 - 1.4 +++ navigation.xml27 Mar 2004 23:21:04 - 1.5 @@ -1,18 +1,35 @@ ?xml version=1.0 encoding=ISO-8859-1? -!-- You'll need commons proper checked out for this to work -- -!DOCTYPE org.apache.commons.menus SYSTEM '../../../jakarta-commons/commons-build/menus/menus.dtd' +!-- + Copyright 2003-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + +!DOCTYPE project [ +!ENTITY commons-nav SYSTEM ../../sandbox-build/incl_nav.xml +] + project name=Resources titleResources/title organizationLogo href=/images/jakarta-logo-blue.gifJakarta/organizationLogo body - about-menu; menu name=Resources - item name=Overviewhref=/index.html/ - item name=To Do List href=/todo.html/ + item name=Overview href=/index.html/ + item name=To Do List href=/todo.html/ /menu -information-menu; -community-menu; -translations-menu; + +commons-nav; + /body /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper/xdocs navigation.xml
dgraham 2004/03/27 15:23:23 Modified:mapper/xdocs navigation.xml Log: Import Commons Sandbox navigation. Revision ChangesPath 1.3 +23 -0 jakarta-commons-sandbox/mapper/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/xdocs/navigation.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- navigation.xml14 Mar 2004 23:42:25 - 1.2 +++ navigation.xml27 Mar 2004 23:23:23 - 1.3 @@ -1,4 +1,24 @@ ?xml version=1.0 encoding=ISO-8859-1? +!-- + Copyright 2003-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + +!DOCTYPE project [ +!ENTITY commons-nav SYSTEM ../../sandbox-build/incl_nav.xml +] + project name=Mapper titleMapper/title @@ -9,5 +29,8 @@ item name=Overview href=/index.html/ item name=To Do List href=/todo.html/ /menu + +commons-nav; + /body /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator project.xml
dgraham 2004/03/27 15:49:42 Modified:validator project.xml Log: Extend the commons-build project.xml file so we don't have to redefine the common xml elements. Revision ChangesPath 1.34 +20 -54jakarta-commons/validator/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/validator/project.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- project.xml 29 Feb 2004 09:48:28 - 1.33 +++ project.xml 27 Mar 2004 23:49:42 - 1.34 @@ -16,17 +16,11 @@ -- project + extend../commons-build/project.xml/extend nameValidator/name idcommons-validator/id currentVersion1.1.2-dev/currentVersion - - organization -nameApache Software Foundation/name -urlhttp://www.apache.org/url -logohttp://jakarta.apache.org/images/jakarta-logo-blue.gif/logo - /organization logo/images/validator-logo-blue.png/logo - inceptionYear2002/inceptionYear packageorg.apache.commons.validator/package @@ -36,55 +30,9 @@ and server side data validation. It may be used standalone or with a framework like Struts. /description - urlhttp://jakarta.apache.org/commons/validator//url - gumpRepositoryIdjakarta/gumpRepositoryId - - issueTrackingUrlhttp://issues.apache.org/bugzilla//issueTrackingUrl - siteAddressjakarta.apache.org/siteAddress - repository - connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons/validator/connection - developerConnectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvs:jakarta-commons/validator/developerConnection -urlhttp://cvs.apache.org/viewcvs/jakarta-commons/validator/url - /repository - - siteDirectory/www/jakarta.apache.org/commons/validator//siteDirectory - distributionDirectoryhttp://jakarta.apache.org/site/binindex.cgi/distributionDirectory - mailingLists -mailingList - nameCommons Dev List/name - subscribe[EMAIL PROTECTED]/subscribe - unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive -/mailingList -mailingList - nameCommons User List/name - subscribe[EMAIL PROTECTED]/subscribe - unsubscribe[EMAIL PROTECTED]/unsubscribe - archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive -/mailingList - /mailingLists - developers developer - nameDavid Winterfeldt/name - iddwinterfeldt/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer - nameCraig McClanahan/name - idcraigmcc/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer - nameJames Turner/name - idturner/id - email[EMAIL PROTECTED]/email - organization/organization -/developer -developer nameMartin Cooper/name idmartinc/id email[EMAIL PROTECTED]/email @@ -102,6 +50,24 @@ emailrleland at apache.org/email organization/organization /developer +developer + nameCraig McClanahan/name + idcraigmcc/id + email[EMAIL PROTECTED]/email + organization/organization +/developer +developer + nameJames Turner/name + idturner/id + email[EMAIL PROTECTED]/email + organization/organization +/developer +developer + nameDavid Winterfeldt/name + iddwinterfeldt/id + email[EMAIL PROTECTED]/email + organization/organization +/developer /developers contributors @@ -326,7 +292,7 @@ reportmaven-pmd-plugin/report reportmaven-simian-plugin/report reportmaven-faq-plugin/report -reportmaven-clover-plugin/report +!--reportmaven-clover-plugin/report-- /reports /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs tasks.xml
dgraham 2004/03/27 16:07:53 Modified:validator/xdocs tasks.xml Log: Removed author elements. Revision ChangesPath 1.10 +0 -2 jakarta-commons/validator/xdocs/tasks.xml Index: tasks.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/tasks.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tasks.xml 29 Feb 2004 09:48:28 - 1.9 +++ tasks.xml 28 Mar 2004 00:07:53 - 1.10 @@ -18,8 +18,6 @@ document properties titleTODO/title -author email=[EMAIL PROTECTED]Robert Leland/author -author email=[EMAIL PROTECTED]David Graham/author /properties body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper/xdocs navigation.xml
dgraham 2004/03/27 17:06:30 Modified:mapper/xdocs navigation.xml Log: Added link to javadocs. Revision ChangesPath 1.4 +1 -0 jakarta-commons-sandbox/mapper/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/xdocs/navigation.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- navigation.xml27 Mar 2004 23:23:23 - 1.3 +++ navigation.xml28 Mar 2004 01:06:30 - 1.4 @@ -28,6 +28,7 @@ menu name=Mapper item name=Overview href=/index.html/ item name=To Do List href=/todo.html/ + item name=Javadoc href=apidocs/index.html/ /menu commons-nav; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java BasicRowProcessor.java BasicColumnProcessor.java ColumnProcessor.java
dgraham 2004/03/14 15:03:54
Modified:dbutils/src/test/org/apache/commons/dbutils
BaseTestCase.java BasicRowProcessorTest.java
TestBean.java
dbutils/src/java/org/apache/commons/dbutils
BasicRowProcessor.java
Added: dbutils/src/test/org/apache/commons/dbutils
BeanProcessorTest.java
dbutils/src/java/org/apache/commons/dbutils
BeanProcessor.java
Removed: dbutils/src/test/org/apache/commons/dbutils
BasicColumnProcessorTest.java
dbutils/src/java/org/apache/commons/dbutils
BasicColumnProcessor.java ColumnProcessor.java
Log:
Removed ColumnProcessor and BasicColumnProcessor and replaced
with a new BeanProcessor class. Rather than splitting bean logic
across several classes it's now encapsulated in BeanProcessor. Further,
The ColumnProcessor interface only applied to beans which didn't fit with
the other ResultSet transformations (ie. arrays, maps).
BasicRowProcessor now delegates to a BeanProcessor instance making
its implementation clearer.
Revision ChangesPath
1.8 +1 -1
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BaseTestCase.java
Index: BaseTestCase.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BaseTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseTestCase.java 9 Mar 2004 03:05:51 - 1.7
+++ BaseTestCase.java 14 Mar 2004 23:03:54 - 1.8
@@ -139,7 +139,7 @@
TestSuite suite = new TestSuite(All DbUtils Tests);
suite.addTestSuite(BasicRowProcessorTest.class);
-suite.addTestSuite(BasicColumnProcessorTest.class);
+suite.addTestSuite(BeanProcessorTest.class);
suite.addTestSuite(ProxyFactoryTest.class);
suite.addTestSuite(ResultSetIteratorTest.class);
suite.addTestSuite(QueryLoaderTest.class);
1.7 +20 -4
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BasicRowProcessorTest.java
Index: BasicRowProcessorTest.java
===
RCS file:
/home/cvs/jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/BasicRowProcessorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicRowProcessorTest.java28 Feb 2004 00:12:22 - 1.6
+++ BasicRowProcessorTest.java14 Mar 2004 23:03:54 - 1.7
@@ -16,6 +16,9 @@
package org.apache.commons.dbutils;
import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
@@ -25,6 +28,13 @@
public class BasicRowProcessorTest extends BaseTestCase {
private static final RowProcessor processor = new BasicRowProcessor();
+
+/**
+ * Format that matches Date.toString().
+ * Sun Mar 14 15:19:15 MST 2004
+ */
+private static final DateFormat datef =
+new SimpleDateFormat(EEE MMM dd HH:mm:ss zzz );
/**
* Constructor for BasicRowProcessorTest.
@@ -50,7 +60,7 @@
assertEquals(6, a[2]);
}
-public void testToBean() throws SQLException {
+public void testToBean() throws SQLException, ParseException {
int rowCount = 0;
TestBean b = null;
@@ -69,10 +79,13 @@
assertEquals(new Integer(4), b.getIntegerTest());
assertEquals(null, b.getNullObjectTest());
assertEquals(0, b.getNullPrimitiveTest());
-assertEquals(not a date, b.getNotDate());
+// test date - string handling
+assertNotNull(b.getNotDate());
+assertTrue(!not a date.equals(b.getNotDate()));
+datef.parse(b.getNotDate());
}
-public void testToBeanList() throws SQLException {
+public void testToBeanList() throws SQLException, ParseException {
List list = processor.toBeanList(this.rs, TestBean.class);
assertNotNull(list);
@@ -88,7 +101,10 @@
assertEquals(new Integer(4), b.getIntegerTest());
assertEquals(null, b.getNullObjectTest());
assertEquals(0, b.getNullPrimitiveTest());
-assertEquals(not a date, b.getNotDate());
+// test date - string handling
+assertNotNull(b.getNotDate());
+assertTrue(!not a date.equals(b.getNotDate()));
+datef.parse(b.getNotDate());
}
public void testToMap() throws SQLException {
1.7 +2 -3
jakarta-commons/dbutils/src/test/org/apache/commons/dbutils/TestBean.java
cvs commit: jakarta-commons/dbutils/xdocs examples.xml
dgraham 2004/03/14 15:12:34 Modified:dbutils/xdocs examples.xml Log: Updated docs for BeanProcessor. Revision ChangesPath 1.5 +6 -8 jakarta-commons/dbutils/xdocs/examples.xml Index: examples.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/examples.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- examples.xml 28 Feb 2004 00:36:26 - 1.4 +++ examples.xml 14 Mar 2004 23:12:34 - 1.5 @@ -19,8 +19,6 @@ properties titleJDBC Utility Component -- Examples/title - author email=[EMAIL PROTECTED]Yoav Shapira/author - author email=[EMAIL PROTECTED]David Graham/author /properties body @@ -150,13 +148,13 @@ /p /section -section name=Custom ColumnProcessor +section name=Custom BeanProcessor p -codeBasicRowProcessor/code uses a a href=apidocs/org/apache/commons/dbutils/ColumnProcessor.htmlColumnProcessor/a -to convert codeResultSet/code columns into JavaBean properties. You can implement this interface -to handle datatype mapping specific to your application. By default codeBasicRowProcessor/code uses a -a href=apidocs/org/apache/commons/dbutils/BasicColumnProcessor.htmlBasicColumnProcessor/a -instance which may be sufficient for your application. +codeBasicRowProcessor/code uses a a href=apidocs/org/apache/commons/dbutils/BeanProcessor.htmlBeanProcessor/a +to convert codeResultSet/code columns into JavaBean properties. You can +subclass and override processing steps to handle datatype mapping specific to +your application. The provided implementation delegates datatype conversion to +the JDBC driver. /p /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java
dgraham 2004/03/14 15:16:25 Modified:dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java Log: javadoc changes only. Revision ChangesPath 1.2 +1 -1 jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java Index: BeanProcessor.java === RCS file: /home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BeanProcessor.java14 Mar 2004 23:03:54 - 1.1 +++ BeanProcessor.java14 Mar 2004 23:16:25 - 1.2 @@ -401,7 +401,7 @@ * * @param index The current column index being processed. * - * @param propertyType The bean property type that this column needs to be + * @param propType The bean property type that this column needs to be * converted into. * * @return The object from the codeResultSet/code at the given column - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs todo.xml downloads.xml index.xml
dgraham 2004/03/14 15:18:28 Modified:dbutils/xdocs todo.xml downloads.xml index.xml Log: Removed author tags. Revision ChangesPath 1.3 +0 -1 jakarta-commons/dbutils/xdocs/todo.xml Index: todo.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/todo.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- todo.xml 28 Feb 2004 00:12:23 - 1.2 +++ todo.xml 14 Mar 2004 23:18:28 - 1.3 @@ -18,7 +18,6 @@ document properties titleTODO/title -author email=[EMAIL PROTECTED]David Graham/author /properties body 1.4 +1 -2 jakarta-commons/dbutils/xdocs/downloads.xml Index: downloads.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/downloads.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- downloads.xml 28 Feb 2004 00:12:23 - 1.3 +++ downloads.xml 14 Mar 2004 23:18:28 - 1.4 @@ -17,7 +17,6 @@ document properties titleDownloads/title - author email=[EMAIL PROTECTED]Commons Documentation Team/author revision$Id$/revision /properties 1.6 +0 -1 jakarta-commons/dbutils/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 28 Feb 2004 00:36:26 - 1.5 +++ index.xml 14 Mar 2004 23:18:28 - 1.6 @@ -19,7 +19,6 @@ properties titleJDBC Utility Component/title - author email=[EMAIL PROTECTED]David Graham/author /properties body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/xdocs navigation.xml
dgraham 2004/03/14 15:21:02 Modified:dbutils/xdocs navigation.xml Log: Removed commented commons-collections specific elements. Revision ChangesPath 1.6 +2 -3 jakarta-commons/dbutils/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/dbutils/xdocs/navigation.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- navigation.xml2 Mar 2004 03:27:47 - 1.5 +++ navigation.xml14 Mar 2004 23:21:02 - 1.6 @@ -14,7 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. -- + !DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd' + project name=DbUtils titleDbUtils/title @@ -30,15 +32,12 @@ menu name=Commons DbUtils item name=Overview href=/index.html/ - !--item name=Users guide href=/userguide.html/-- item name=Examples href=/examples.html/ - !--item name=Javadoc (3.0 release) href=apidocs-COLLECTIONS_3_0/index.html/-- item name=Javadoc href=apidocs/index.html/ item name=Mailing lists href=/mail-lists.html/ item name=Team href=/team-list.html/ item name=Tasks href=/todo.html/ item name=CVS href=http://cvs.apache.org/viewcvs/jakarta-commons/dbutils// - !--item name=Javadoc (CVS latest) href=apidocs/index.html/-- item name=Downloads href=/downloads.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java
dgraham 2004/03/14 15:30:15 Modified:dbutils/src/java/org/apache/commons/dbutils BeanProcessor.java Log: javadoc changes only. Revision ChangesPath 1.3 +6 -0 jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java Index: BeanProcessor.java === RCS file: /home/cvs/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/BeanProcessor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BeanProcessor.java14 Mar 2004 23:16:25 - 1.2 +++ BeanProcessor.java14 Mar 2004 23:30:15 - 1.3 @@ -31,10 +31,16 @@ import java.util.Map; /** + * p * codeBeanProcessor/code matches column names to bean property names * and converts codeResultSet/code columns into objects for those bean * properties. Subclasses should override the methods in the processing chain * to customize behavior. + * /p + * + * p + * This class is thread-safe. + * /p * * @see BasicRowProcessor * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/mapper/xdocs todo.xml navigation.xml index.xml
dgraham 2004/03/14 15:42:25 Modified:mapper/xdocs todo.xml navigation.xml index.xml Log: Removed author tags. Revision ChangesPath 1.2 +0 -1 jakarta-commons-sandbox/mapper/xdocs/todo.xml Index: todo.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/xdocs/todo.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- todo.xml 8 Sep 2003 04:37:27 - 1.1 +++ todo.xml 14 Mar 2004 23:42:25 - 1.2 @@ -3,7 +3,6 @@ document properties titleTODO/title -author email=[EMAIL PROTECTED]David Graham/author /properties body 1.2 +2 -2 jakarta-commons-sandbox/mapper/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/xdocs/navigation.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- navigation.xml8 Sep 2003 04:37:27 - 1.1 +++ navigation.xml14 Mar 2004 23:42:25 - 1.2 @@ -6,8 +6,8 @@ body menu name=Mapper - item name=Overviewhref=/index.html/ - item name=To Do List href=/todo.html/ + item name=Overview href=/index.html/ + item name=To Do List href=/todo.html/ /menu /body /project 1.4 +1 -2 jakarta-commons-sandbox/mapper/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons-sandbox/mapper/xdocs/index.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.xml 9 Nov 2003 21:16:40 - 1.3 +++ index.xml 14 Mar 2004 23:42:25 - 1.4 @@ -3,8 +3,7 @@ document properties - titleData Mapping Abstraction Component/title - author email=[EMAIL PROTECTED]David Graham/author + titleData Mapping Abstraction Component/title /properties body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
