Author: niallp
Date: Sat Jan 7 09:55:14 2006
New Revision: 366867
URL: http://svn.apache.org/viewcvs?rev=366867&view=rev
Log:
Reverse Bug 35926 - remove change for Visa Card Blue in France - reported by
Christoph Kutzinski
Modified:
jakarta/commons/proper/validator/trunk/project.properties
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/CreditCardValidator.java
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/CreditCardValidatorTest.java
jakarta/commons/proper/validator/trunk/xdocs/changes.xml
Modified: jakarta/commons/proper/validator/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/project.properties?rev=366867&r1=366866&r2=366867&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/project.properties (original)
+++ jakarta/commons/proper/validator/trunk/project.properties Sat Jan 7
09:55:14 2006
@@ -1,4 +1,4 @@
-# Copyright 2003-2004 The Apache Software Foundation
+# Copyright 2003-2006 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.
@@ -42,6 +42,7 @@
#maven.test.skip = true
#maven.test.failure.ignore = true
maven.changelog.range = 120
+maven.changes.issue.template=%URL%/show_bug.cgi?id=%ISSUE%
# -------------------------------------------------------------------
# N I G H T L Y B U I L D P R O P E R T I E S
Modified:
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/CreditCardValidator.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/CreditCardValidator.java?rev=366867&r1=366866&r2=366867&view=diff
==============================================================================
---
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/CreditCardValidator.java
(original)
+++
jakarta/commons/proper/validator/trunk/src/share/org/apache/commons/validator/CreditCardValidator.java
Sat Jan 7 09:55:14 2006
@@ -4,7 +4,7 @@
* $Date$
*
* ====================================================================
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 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.
@@ -208,17 +208,17 @@
}
/**
- * Augmented to support Visa Carte Blue used in France
+ * Change to support Visa Carte Blue used in France
+ * has been removed - see Bug 35926
*/
private class Visa implements CreditCardType {
- private static final String PREFIX = "4,5,";
+ private static final String PREFIX = "4";
public boolean matches(String card) {
-
- String prefix2 = card.substring(0, 1) + ",";
- return ((PREFIX.indexOf(prefix2) != -1)
- && (card.length() == 13 || card.length() == 16));
+ return (
+ card.substring(0, 1).equals(PREFIX)
+ && (card.length() == 13 || card.length() == 16));
}
- }
+ }
private class Amex implements CreditCardType {
private static final String PREFIX = "34,37,";
Modified:
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/CreditCardValidatorTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/CreditCardValidatorTest.java?rev=366867&r1=366866&r2=366867&view=diff
==============================================================================
---
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/CreditCardValidatorTest.java
(original)
+++
jakarta/commons/proper/validator/trunk/src/test/org/apache/commons/validator/CreditCardValidatorTest.java
Sat Jan 7 09:55:14 2006
@@ -4,7 +4,7 @@
* $Date$
*
* ====================================================================
- * Copyright 2001-2005 The Apache Software Foundation
+ * Copyright 2001-2006 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.
@@ -29,7 +29,6 @@
public class CreditCardValidatorTest extends TestCase {
private static final String VALID_VISA = "4417123456789113";
- private static final String VALID_VISA_OTHER = "5817550003933609";
private static final String VALID_SHORT_VISA = "4222222222222";
private static final String VALID_AMEX = "378282246310005";
private static final String VALID_MASTERCARD = "5105105105105100";
@@ -53,7 +52,6 @@
assertFalse(ccv.isValid("4417123456789112"));
assertFalse(ccv.isValid("4417q23456w89113"));
assertTrue(ccv.isValid(VALID_VISA));
- assertTrue(ccv.isValid(VALID_VISA_OTHER));
assertTrue(ccv.isValid(VALID_SHORT_VISA));
assertTrue(ccv.isValid(VALID_AMEX));
assertTrue(ccv.isValid(VALID_MASTERCARD));
Modified: jakarta/commons/proper/validator/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/xdocs/changes.xml?rev=366867&r1=366866&r2=366867&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/validator/trunk/xdocs/changes.xml Sat Jan 7
09:55:14 2006
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 2004-2005 The Apache Software Foundation
+ Copyright 2004-2006 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.
@@ -37,6 +37,15 @@
<title>Release Notes</title>
</properties>
<body>
+
+ <release version="1.2.1 (alpha)" date="in SVN">
+ <action dev="niallp" type="fix" issue="35926">
+ Reverse change for to Credit Card Validator for visa card blue in
France.
+ </action>
+ <action dev="niallp" type="fix" issue="38159" due-to="Kristian L.
Petersen">
+ Fix JavaScript validation for Internet Explorer 5.0.
+ </action>
+ </release>
<release version="1.2.0" date="2005-11-15">
<action dev="dgraham" type="add">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
