You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by dg...@apache.org on 2003/10/05 18:47:28 UTC
cvs commit: jakarta-commons/validator/src/test/org/apache/commons/validator/util FlagsTest.java
dgraham 2003/10/05 09:47:28
Modified: validator/src/test/org/apache/commons/validator
ValidatorTest.java DoubleTest.java
ValidatorTestSuite.java LongTest.java
ValueBean.java MultipleConfigFilesTest.java
validator/src/example/org/apache/commons/validator/example
ValidateExample.java ValidateBean.java
validator/src/test/org/apache/commons/validator/util
FlagsTest.java
Log:
Fixed Apache license.
Revision Changes Path
1.15 +9 -11 jakarta-commons/validator/src/test/org/apache/commons/validator/ValidatorTest.java
Index: ValidatorTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/ValidatorTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ValidatorTest.java 8 Jun 2003 07:11:24 -0000 1.14
+++ ValidatorTest.java 5 Oct 2003 16:47:27 -0000 1.15
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,7 +59,6 @@
*
*/
-
package org.apache.commons.validator;
import java.text.DateFormat;
@@ -74,14 +73,13 @@
import junit.framework.TestSuite;
import org.apache.commons.validator.util.ValidatorUtils;
-
/**
* <p>Performs Validation Test.</p>
*
* @author David Winterfeldt
* @version $Revision$ $Date$
-*/
+ */
public class ValidatorTest extends TestCase {
public ValidatorTest(String name) {
1.14 +4 -6 jakarta-commons/validator/src/test/org/apache/commons/validator/DoubleTest.java
Index: DoubleTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/DoubleTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DoubleTest.java 5 Oct 2003 16:41:09 -0000 1.13
+++ DoubleTest.java 5 Oct 2003 16:47:27 -0000 1.14
@@ -59,12 +59,10 @@
*
*/
-
package org.apache.commons.validator;
import junit.framework.Test;
import junit.framework.TestSuite;
-
/**
* <p>Performs Validation Test for <code>double</code> validations.</p>
1.12 +8 -8 jakarta-commons/validator/src/test/org/apache/commons/validator/ValidatorTestSuite.java
Index: ValidatorTestSuite.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/ValidatorTestSuite.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ValidatorTestSuite.java 28 Sep 2003 20:39:57 -0000 1.11
+++ ValidatorTestSuite.java 5 Oct 2003 16:47:27 -0000 1.12
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1.13 +7 -9 jakarta-commons/validator/src/test/org/apache/commons/validator/LongTest.java
Index: LongTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/LongTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LongTest.java 6 Sep 2003 05:17:59 -0000 1.12
+++ LongTest.java 5 Oct 2003 16:47:27 -0000 1.13
@@ -29,14 +29,14 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,7 +59,6 @@
*
*/
-
package org.apache.commons.validator;
import junit.framework.Test;
@@ -72,7 +71,6 @@
* @version $Revision$ $Date$
*/
public class LongTest extends TestNumber {
-
public LongTest(String name) {
super(name);
1.3 +13 -15 jakarta-commons/validator/src/test/org/apache/commons/validator/ValueBean.java
Index: ValueBean.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/ValueBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValueBean.java 15 Dec 2002 20:58:57 -0000 1.2
+++ ValueBean.java 5 Oct 2003 16:47:27 -0000 1.3
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,30 +59,28 @@
*
*/
-
package org.apache.commons.validator;
/**
- * <p>Value object for storing a value to
- * run tests on.</p>
+ * Value object for storing a value to run tests on.
*
* @author David Winterfeldt
* @version $Revision$ $Date$
-*/
+ */
public class ValueBean {
protected String value = null;
/**
* Gets the value.
- */
+ */
public String getValue() {
return value;
}
/**
* Sets the value.
- */
+ */
public void setValue(String value) {
this.value = value;
}
1.8 +5 -5 jakarta-commons/validator/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java
Index: MultipleConfigFilesTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/MultipleConfigFilesTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultipleConfigFilesTest.java 23 Aug 2003 02:24:07 -0000 1.7
+++ MultipleConfigFilesTest.java 5 Oct 2003 16:47:27 -0000 1.8
@@ -64,9 +64,9 @@
import java.io.IOException;
import java.io.InputStream;
-import org.xml.sax.SAXException;
-
import junit.framework.TestCase;
+
+import org.xml.sax.SAXException;
/**
* Tests that validator rules split between 2 different XML files get merged properly.
1.15 +8 -8 jakarta-commons/validator/src/example/org/apache/commons/validator/example/ValidateExample.java
Index: ValidateExample.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/example/org/apache/commons/validator/example/ValidateExample.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ValidateExample.java 12 Aug 2003 00:29:34 -0000 1.14
+++ ValidateExample.java 5 Oct 2003 16:47:28 -0000 1.15
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1.2 +62 -38 jakarta-commons/validator/src/example/org/apache/commons/validator/example/ValidateBean.java
Index: ValidateBean.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/example/org/apache/commons/validator/example/ValidateBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidateBean.java 11 Oct 2002 20:17:50 -0000 1.1
+++ ValidateBean.java 5 Oct 2003 16:47:28 -0000 1.2
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,77 +59,101 @@
*
*/
-
package org.apache.commons.validator.example;
-
/**
* <p>A simple bean to use with the Validator Example.</p>
*
* @author James Turner
* @version $Revision$ $Date$
-*/
-
+ */
public class ValidateBean extends Object {
String lastName, firstName, street1, street2, city, state, postalCode, age;
-
public void setLastName(String lastName) {
- this.lastName = lastName;
+ this.lastName = lastName;
}
+
public void setFirstName(String firstName) {
- this.firstName = firstName;
+ this.firstName = firstName;
}
- public void setStreet1 (String street1) {
- this.street1 = street1;
+
+ public void setStreet1(String street1) {
+ this.street1 = street1;
}
+
public void setStreet2(String street2) {
- this.street2 = street2;
+ this.street2 = street2;
}
+
public void setCity(String city) {
- this.city = city;
+ this.city = city;
}
+
public void setState(String state) {
- this.state = state;
+ this.state = state;
}
+
public void setPostalCode(String postalCode) {
- this.postalCode = postalCode;
+ this.postalCode = postalCode;
}
- public void setAge (String age) {
- this.age = age;
+
+ public void setAge(String age) {
+ this.age = age;
}
public String getLastName() {
- return this.lastName;
+ return this.lastName;
}
+
public String getFirstName() {
- return this.firstName;
+ return this.firstName;
}
- public String getStreet1 () {
- return this.street1;
+
+ public String getStreet1() {
+ return this.street1;
}
+
public String getStreet2() {
- return this.street2;
+ return this.street2;
}
+
public String getCity() {
- return this.city;
+ return this.city;
}
+
public String getState() {
- return this.state;
+ return this.state;
}
+
public String getPostalCode() {
- return this.postalCode;
+ return this.postalCode;
}
- public String getAge () {
- return this.age;
+
+ public String getAge() {
+ return this.age;
}
public String toString() {
- return "{lastname=" + this.lastName + ", firstname=" + this.firstName +
- ", street1=" + this.street1 + ",\n street2=" + this.street2 + ", " +
- "city=" + this.city + ", state=" + this.state +
- ",\n postalcode=" + this.postalCode + ", age=" + this.age + "}";
- }
+ return "{lastname="
+ + this.lastName
+ + ", firstname="
+ + this.firstName
+ + ", street1="
+ + this.street1
+ + ",\n street2="
+ + this.street2
+ + ", "
+ + "city="
+ + this.city
+ + ", state="
+ + this.state
+ + ",\n postalcode="
+ + this.postalCode
+ + ", age="
+ + this.age
+ + "}";
+ }
}
1.2 +8 -8 jakarta-commons/validator/src/test/org/apache/commons/validator/util/FlagsTest.java
Index: FlagsTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/util/FlagsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlagsTest.java 3 May 2003 02:16:37 -0000 1.1
+++ FlagsTest.java 5 Oct 2003 16:47:28 -0000 1.2
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,20 +23,20 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
+ * any, must include the following acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names, "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org