svn commit: r1301321 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java
Author: bayard
Date: Fri Mar 16 03:11:36 2012
New Revision: 1301321
URL: http://svn.apache.org/viewvc?rev=1301321&view=rev
Log:
Applying Benedikt Ritter's patch to fix the Checkstyle error in
SerializationUtils - LANG-793
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java?rev=1301321&r1=1301320&r2=1301321&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java
Fri Mar 16 03:11:36 2012
@@ -280,10 +280,11 @@ public class SerializationUtils {
return Class.forName(name, false,
Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException cnfe) {
Class cls = primitiveTypes.get(name);
-if (cls != null)
+if (cls != null) {
return cls;
-else
+} else {
throw cnfe;
+}
}
}
}
svn commit: r1299560 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
Author: bayard
Date: Mon Mar 12 04:37:38 2012
New Revision: 1299560
URL: http://svn.apache.org/viewvc?rev=1299560&view=rev
Log:
Adding javadoc note concerning LANG-755 and the bug in java.util.Calendar.
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java?rev=1299560&r1=1299559&r2=1299560&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
Mon Mar 12 04:37:38 2012
@@ -27,6 +27,9 @@ import java.util.TimeZone;
* Formatting is performed using the thread-safe
* {@link org.apache.commons.lang3.time.FastDateFormat} class.
*
+ * Note that the JDK has a bug wherein calling Calendar.get(int) will
+ * override any previously called Calendar.clear() calls. See LANG-755.
+ *
* @since 2.0
* @version $Id$
*/
svn commit: r1296774 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Author: bayard
Date: Sun Mar 4 09:45:21 2012
New Revision: 1296774
URL: http://svn.apache.org/viewvc?rev=1296774&view=rev
Log:
Simplifying the unaccent code to no longer support Java 5
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1296774&r1=1296773&r2=1296774&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Sun Mar 4 09:45:21 2012
@@ -19,6 +19,7 @@ package org.apache.commons.lang3;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.text.Normalizer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -609,9 +610,6 @@ public class StringUtils {
* For instance, 'à' will be replaced by 'a'.
* Note that ligatures will be left as is.
*
- * This method will use the first available implementation of:
- * Java 6's {@link java.text.Normalizer}, Java 1.3–1.5's {@code
sun.text.Normalizer}
- *
*
* StringUtils.stripAccents(null)= null
* StringUtils.stripAccents("") = ""
@@ -629,130 +627,10 @@ public class StringUtils {
if(input == null) {
return null;
}
-try {
-String result = null;
-if (InitStripAccents.java6NormalizeMethod != null) {
-result = removeAccentsJava6(input);
-} else if (InitStripAccents.sunDecomposeMethod != null) {
-result = removeAccentsSUN(input);
-} else {
-throw new UnsupportedOperationException(
-"The stripAccents(CharSequence) method requires at least"
-+" Java6, but got: "+InitStripAccents.java6Exception
-+"; or a Sun JVM: "+InitStripAccents.sunException);
-}
-// Note that none of the above methods correctly remove
ligatures...
-return result;
-} catch(IllegalArgumentException iae) {
-throw new RuntimeException("IllegalArgumentException occurred",
iae);
-} catch(IllegalAccessException iae) {
-throw new RuntimeException("IllegalAccessException occurred", iae);
-} catch(InvocationTargetException ite) {
-throw new RuntimeException("InvocationTargetException occurred",
ite);
-} catch(SecurityException se) {
-throw new RuntimeException("SecurityException occurred", se);
-}
-}
-
-/**
- * Use {@code java.text.Normalizer#normalize(CharSequence,
Normalizer.Form)}
- * (but be careful, this class exists in Java 1.3, with an entirely
different meaning!)
- *
- * @param text the text to be processed
- * @return the processed string
- * @throws IllegalAccessException may be thrown by a reflection call
- * @throws InvocationTargetException if a reflection call throws an
exception
- * @throws IllegalStateException if the {@code Normalizer} class is not
available
- */
-private static String removeAccentsJava6(CharSequence text)
-throws IllegalAccessException, InvocationTargetException {
-/*
-String decomposed = java.text.Normalizer.normalize(CharSequence,
Normalizer.Form.NFD);
-return java6Pattern.matcher(decomposed).replaceAll("");//$NON-NLS-1$
-*/
-if (InitStripAccents.java6NormalizeMethod == null ||
InitStripAccents.java6NormalizerFormNFD == null) {
-throw new IllegalStateException("java.text.Normalizer is not
available", InitStripAccents.java6Exception);
-}
-String result;
-result = (String) InitStripAccents.java6NormalizeMethod.invoke(null,
new Object[] {text, InitStripAccents.java6NormalizerFormNFD});
-result =
InitStripAccents.java6Pattern.matcher(result).replaceAll("");//$NON-NLS-1$
-return result;
-}
-
-/**
- * Use {@code sun.text.Normalizer#decompose(String, boolean, int)}
- *
- * @param text the text to be processed
- * @return the processed string
- * @throws IllegalAccessException may be thrown by a reflection call
- * @throws InvocationTargetException if a reflection call throws an
exception
- * @throws IllegalStateException if the {@code Normalizer} class is not
available
- */
-private static String removeAccents
svn commit: r1290976 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/time/ test/java/org/apache/commons/lang3/time/
Author: bayard
Date: Sun Feb 19 09:26:06 2012
New Revision: 1290976
URL: http://svn.apache.org/viewvc?rev=1290976&view=rev
Log:
Applying Felix Müller's patch from LANG-462 to fix a timezone assumption in a
test and remove Java 6 interface implementation @Override statements
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java?rev=1290976&r1=1290975&r2=1290976&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java
Sun Feb 19 09:26:06 2012
@@ -461,7 +461,6 @@ public class FastDateFormat extends Form
/* (non-Javadoc)
* @see DateParser#parse(java.lang.String)
*/
-@Override
public Date parse(String source) throws ParseException {
return parser.parse(source);
}
@@ -469,7 +468,6 @@ public class FastDateFormat extends Form
/* (non-Javadoc)
* @see DateParser#parse(java.lang.String, java.text.ParsePosition)
*/
-@Override
public Date parse(String source, ParsePosition pos) {
return parser.parse(source, pos);
}
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateParser.java?rev=1290976&r1=1290975&r2=1290976&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
Sun Feb 19 09:26:06 2012
@@ -144,7 +144,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see org.apache.commons.lang3.time.DateParser#getPattern()
*/
-@Override
public String getPattern() {
return pattern;
}
@@ -152,7 +151,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see org.apache.commons.lang3.time.DateParser#getTimeZone()
*/
-@Override
public TimeZone getTimeZone() {
return timeZone;
}
@@ -160,7 +158,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see org.apache.commons.lang3.time.DateParser#getLocale()
*/
-@Override
public Locale getLocale() {
return locale;
}
@@ -222,7 +219,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see
org.apache.commons.lang3.time.DateParser#parseObject(java.lang.String)
*/
-@Override
public Object parseObject(String source) throws ParseException {
return parse(source);
}
@@ -230,7 +226,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see org.apache.commons.lang3.time.DateParser#parse(java.lang.String)
*/
-@Override
public Date parse(String source) throws ParseException {
Date date= parse(source, new ParsePosition(0));
if(date==null) {
@@ -242,7 +237,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see
org.apache.commons.lang3.time.DateParser#parseObject(java.lang.String,
java.text.ParsePosition)
*/
-@Override
public Object parseObject(String source, ParsePosition pos) {
return parse(source, pos);
}
@@ -250,7 +244,6 @@ public class FastDateParser implements D
/* (non-Javadoc)
* @see org.apache.commons.lang3.time.DateParser#parse(java.lang.String,
java.text.ParsePosition)
*/
-@Override
public Date parse(String source, ParsePosition pos) {
int offset= pos.getIndex();
Matcher matcher= parsePattern.matcher(source.substring(offset));
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java?rev=1290976&r1=1290975&r2=1290976&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java
(original)
+++
commons/proper/lang/trun
svn commit: r1236057 - /commons/proper/lang/trunk/src/site/changes/changes.xml
Author: bayard Date: Thu Jan 26 07:22:54 2012 New Revision: 1236057 URL: http://svn.apache.org/viewvc?rev=1236057&view=rev Log: Adding 462 and 786 to the change history Modified: commons/proper/lang/trunk/src/site/changes/changes.xml Modified: commons/proper/lang/trunk/src/site/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/changes/changes.xml?rev=1236057&r1=1236056&r2=1236057&view=diff == --- commons/proper/lang/trunk/src/site/changes/changes.xml (original) +++ commons/proper/lang/trunk/src/site/changes/changes.xml Thu Jan 26 07:22:54 2012 @@ -21,7 +21,8 @@ - + +StringUtils equals() relies on undefined behavior Documentation bug: StringUtils.split TypeUtilsTest contains incorrect type assignability assertion TypeUtils.getTypeArguments() misses type arguments for partially-assigned classes @@ -32,6 +33,7 @@ Fix javadoc Ant warnings JavaDoc bug in static inner class DateIterator Add Triple class (ternary version of Pair) +FastDateFormat supports parse methods
svn commit: r1225140 - /commons/proper/lang/trunk/src/site/changes/changes.xml
Author: bayard Date: Wed Dec 28 07:55:42 2011 New Revision: 1225140 URL: http://svn.apache.org/viewvc?rev=1225140&view=rev Log: Adding the issues in 3.2 to changes.xml Modified: commons/proper/lang/trunk/src/site/changes/changes.xml Modified: commons/proper/lang/trunk/src/site/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/changes/changes.xml?rev=1225140&r1=1225139&r2=1225140&view=diff == --- commons/proper/lang/trunk/src/site/changes/changes.xml (original) +++ commons/proper/lang/trunk/src/site/changes/changes.xml Wed Dec 28 07:55:42 2011 @@ -22,9 +22,18 @@ +Documentation bug: StringUtils.split +TypeUtilsTest contains incorrect type assignability assertion +TypeUtils.getTypeArguments() misses type arguments for partially-assigned classes +ImmutablePair doc contains nonsense text ClassUtils.PACKAGE_SEPARATOR javadoc contains garbage text +EventListenerSupport.ProxyInvocationHandler no longer defines serialVersionUID +StrBuilder is now serializable +Fix javadoc Ant warnings +JavaDoc bug in static inner class DateIterator Add Triple class (ternary version of Pair) + Add API StringUtils.toString(byte[] intput, String charsetName) Add an example with whitespace in StringUtils.defaultIfEmpty
svn commit: r1225117 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Author: bayard
Date: Wed Dec 28 07:05:24 2011
New Revision: 1225117
URL: http://svn.apache.org/viewvc?rev=1225117&view=rev
Log:
Fixing the DateIterator javadoc to indicate the end date is inclusive, not 'not
inclusive'
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java?rev=1225117&r1=1225116&r2=1225117&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Wed Dec 28 07:05:24 2011
@@ -1786,7 +1786,7 @@ public class DateUtils {
* Constructs a DateIterator that ranges from one date to another.
*
* @param startFinal start date (inclusive)
- * @param endFinal end date (not inclusive)
+ * @param endFinal end date (inclusive)
*/
DateIterator(Calendar startFinal, Calendar endFinal) {
super();
svn commit: r1225113 - /commons/proper/lang/trunk/build.xml
Author: bayard
Date: Wed Dec 28 06:39:30 2011
New Revision: 1225113
URL: http://svn.apache.org/viewvc?rev=1225113&view=rev
Log:
Applying Ville Skyttä's patch from LANG-761 to fix the javadoc warnings in the
Ant build
Modified:
commons/proper/lang/trunk/build.xml
Modified: commons/proper/lang/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/build.xml?rev=1225113&r1=1225112&r2=1225113&view=diff
==
--- commons/proper/lang/trunk/build.xml (original)
+++ commons/proper/lang/trunk/build.xml Wed Dec 28 06:39:30 2011
@@ -30,6 +30,7 @@
http://download.oracle.com/javase/1.5.0/docs/api/"/>
+http://commons.apache.org/collections/api-release/"/>
@@ -63,7 +64,7 @@
-
+
@@ -119,10 +120,11 @@
windowtitle="Lang ${component.version}"
bottom="Copyright © 2001-${current.year} - Apache
Software Foundation"
use="true"
- link="${jdk.javadoc}"
encoding="${compile.encoding}"
source="${compile.source}">
+
+
svn commit: r1225111 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
Author: bayard
Date: Wed Dec 28 06:33:21 2011
New Revision: 1225111
URL: http://svn.apache.org/viewvc?rev=1225111&view=rev
Log:
Making StrBuilder Serializable per LANG-764
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrBuilder.java?rev=1225111&r1=1225110&r2=1225111&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
Wed Dec 28 06:33:21 2011
@@ -17,6 +17,7 @@
package org.apache.commons.lang3.text;
import java.io.Reader;
+import java.io.Serializable;
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
@@ -70,7 +71,7 @@ import org.apache.commons.lang3.SystemUt
* @since 2.2
* @version $Id$
*/
-public class StrBuilder implements CharSequence, Appendable {
+public class StrBuilder implements CharSequence, Appendable, Serializable {
/**
* The extra capacity for new builders.
svn commit: r1225109 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
Author: bayard
Date: Wed Dec 28 06:27:47 2011
New Revision: 1225109
URL: http://svn.apache.org/viewvc?rev=1225109&view=rev
Log:
Dropping the serialVersionUID from EventListenerSupport per LANG-765
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java?rev=1225109&r1=1225108&r2=1225109&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
Wed Dec 28 06:27:47 2011
@@ -291,8 +291,6 @@ public class EventListenerSupport imp
* An invocation handler used to dispatch the event(s) to all the
listeners.
*/
protected class ProxyInvocationHandler implements InvocationHandler {
-/** Serialization version */
-private static final long serialVersionUID = 1L;
/**
* Propagates the method call to all registered listeners in place of
svn commit: r1225104 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Author: bayard
Date: Wed Dec 28 05:58:31 2011
New Revision: 1225104
URL: http://svn.apache.org/viewvc?rev=1225104&view=rev
Log:
Fixing the StringUtils.split javadoc per Samurel Tardieu in LANG-783
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1225104&r1=1225103&r2=1225104&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Wed Dec 28 05:58:31 2011
@@ -2610,8 +2610,8 @@ public class StringUtils {
*
* StringUtils.split(null, *, *)= null
* StringUtils.split("", *, *) = []
- * StringUtils.split("ab de fg", null, 0) = ["ab", "cd", "ef"]
- * StringUtils.split("ab de fg", null, 0) = ["ab", "cd", "ef"]
+ * StringUtils.split("ab cd ef", null, 0) = ["ab", "cd", "ef"]
+ * StringUtils.split("ab cd ef", null, 0) = ["ab", "cd", "ef"]
* StringUtils.split("ab:cd:ef", ":", 0)= ["ab", "cd", "ef"]
* StringUtils.split("ab:cd:ef", ":", 2)= ["ab", "cd:ef"]
*
svn commit: r1205734 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/tuple/ site/changes/ test/java/org/apache/commons/lang3/tuple/
Author: bayard
Date: Thu Nov 24 06:20:59 2011
New Revision: 1205734
URL: http://svn.apache.org/viewvc?rev=1205734&view=rev
Log:
Adding Henning's GitHub pull request with a Triple implementation. LANG-675
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
(with props)
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java
(with props)
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/Triple.java
(with props)
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java
(with props)
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/MutableTripleTest.java
(with props)
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/tuple/TripleTest.java
(with props)
Modified:
commons/proper/lang/trunk/src/site/changes/changes.xml
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java?rev=1205734&view=auto
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
Thu Nov 24 06:20:59 2011
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.tuple;
+
+/**
+ * An immutable triple consisting of three {@code Object} elements.
+ *
+ * Although the implementation is immutable, there is no restriction on the
objects
+ * that may be stored. If mutable objects are stored in the triple, then the
triple
+ * itself effectively becomes mutable. The class is also not {@code final}, so
a subclass
+ * could add undesirable behaviour.
+ *
+ * #ThreadSafe# if all three objects are thread-safe
+ *
+ * @param the left element type
+ * @param the middle element type
+ * @param the right element type
+ *
+ * @version $Id$
+ */
+public final class ImmutableTriple extends Triple {
+
+/** Serialization version */
+private static final long serialVersionUID = 1L;
+
+/** Left object */
+public final L left;
+/** Middle object */
+public final M middle;
+/** Right object */
+public final R right;
+
+/**
+ * Obtains an immutable triple of from three objects inferring the
generic types.
+ *
+ * This factory allows the triple to be created using inference to
+ * obtain the generic types.
+ *
+ * @param the left element type
+ * @param the middle element type
+ * @param the right element type
+ * @param left the left element, may be null
+ * @param middle the middle element, may be null
+ * @param right the right element, may be null
+ * @return a triple formed from the three parameters, not null
+ */
+public static ImmutableTriple of(L left, M middle, R
right) {
+return new ImmutableTriple(left, middle, right);
+}
+
+/**
+ * Create a new triple instance.
+ *
+ * @param left the left value, may be null
+ * @param middle the middle value, may be null
+ * @param right the right value, may be null
+ */
+public ImmutableTriple(L left, M middle, R right) {
+super();
+this.left = left;
+this.middle = middle;
+this.right = right;
+}
+
+//---
+/**
+ * {@inheritDoc}
+ */
+@Override
+public L getLeft() {
+return left;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public M getMiddle() {
+return middle;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public R getRight() {
+return right;
+}
+}
+
Propchange:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
svn commit: r1202369 - /commons/proper/lang/trunk/src/site/site.xml
Author: bayard Date: Tue Nov 15 18:40:52 2011 New Revision: 1202369 URL: http://svn.apache.org/viewvc?rev=1202369&view=rev Log: Remove version # from LHS nav Modified: commons/proper/lang/trunk/src/site/site.xml Modified: commons/proper/lang/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/site.xml?rev=1202369&r1=1202368&r2=1202369&view=diff == --- commons/proper/lang/trunk/src/site/site.xml (original) +++ commons/proper/lang/trunk/src/site/site.xml Tue Nov 15 18:40:52 2011 @@ -28,7 +28,7 @@ - +
svn commit: r1202288 - /commons/proper/lang/trunk/src/site/xdoc/release-history.xml
Author: bayard Date: Tue Nov 15 16:37:29 2011 New Revision: 1202288 URL: http://svn.apache.org/viewvc?rev=1202288&view=rev Log: Adding 3.1 Modified: commons/proper/lang/trunk/src/site/xdoc/release-history.xml Modified: commons/proper/lang/trunk/src/site/xdoc/release-history.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/xdoc/release-history.xml?rev=1202288&r1=1202287&r2=1202288&view=diff == --- commons/proper/lang/trunk/src/site/xdoc/release-history.xml (original) +++ commons/proper/lang/trunk/src/site/xdoc/release-history.xml Tue Nov 15 16:37:29 2011 @@ -28,7 +28,8 @@ limitations under the License. VersionRelease dateJavadocRelease notes -3.0.1.19/Aug/11api-3.0.1release notes for 3.0.1 +3.114/Nov/11api-3.1release notes for 3.1 +3.0.19/Aug/11api-3.0.1release notes for 3.0.1 3.018/Jul/11api-3.0release notes for 3.0 2.616/Jan/11api-2.6release notes for 2.6 2.523/Feb/10api-2.5release notes for 2.5
svn commit: r1202079 - /commons/proper/lang/trunk/src/site/changes/changes.xml
Author: bayard Date: Tue Nov 15 07:35:50 2011 New Revision: 1202079 URL: http://svn.apache.org/viewvc?rev=1202079&view=rev Log: Setting release date for 3.1 Modified: commons/proper/lang/trunk/src/site/changes/changes.xml Modified: commons/proper/lang/trunk/src/site/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/changes/changes.xml?rev=1202079&r1=1202078&r2=1202079&view=diff == --- commons/proper/lang/trunk/src/site/changes/changes.xml (original) +++ commons/proper/lang/trunk/src/site/changes/changes.xml Tue Nov 15 07:35:50 2011 @@ -21,7 +21,7 @@ - + Add API StringUtils.toString(byte[] intput, String charsetName) Add an example with whitespace in StringUtils.defaultIfEmpty Add APIs ClassUtils.isPrimitiveWrapper(Class<?>) and isPrimitiveOrWrapper(Class<?>)
svn commit: r1202077 - in /commons/proper/lang/trunk: default.properties pom.xml
Author: bayard
Date: Tue Nov 15 07:21:05 2011
New Revision: 1202077
URL: http://svn.apache.org/viewvc?rev=1202077&view=rev
Log:
Readying next version
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1202077&r1=1202076&r2=1202077&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Tue Nov 15 07:21:05 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.1-SNAPSHOT
+component.version = 3.2-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1202077&r1=1202076&r2=1202077&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Tue Nov 15 07:21:05 2011
@@ -17,7 +17,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.1-SNAPSHOT
+ 3.2-SNAPSHOT
Commons Lang
2001
svn commit: r1202076 - /commons/proper/lang/tags/LANG_3_1/
Author: bayard Date: Tue Nov 15 07:20:23 2011 New Revision: 1202076 URL: http://svn.apache.org/viewvc?rev=1202076&view=rev Log: Releasing 3.1 Added: commons/proper/lang/tags/LANG_3_1/ - copied from r1202075, commons/proper/lang/tags/LANG_3_1_RC1/
svn commit: r1201034 - /commons/proper/lang/trunk/src/site/xdoc/index.xml
Author: bayard Date: Fri Nov 11 19:38:20 2011 New Revision: 1201034 URL: http://svn.apache.org/viewvc?rev=1201034&view=rev Log: Adding link to GitHub mirror Modified: commons/proper/lang/trunk/src/site/xdoc/index.xml Modified: commons/proper/lang/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/xdoc/index.xml?rev=1201034&r1=1201033&r2=1201034&view=diff == --- commons/proper/lang/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/lang/trunk/src/site/xdoc/index.xml Fri Nov 11 19:38:20 2011 @@ -56,7 +56,7 @@ The JavaDoc API documents are available The subversion repository can be -http://svn.apache.org/viewvc/commons/proper/lang/trunk/";>browsed. +http://svn.apache.org/viewvc/commons/proper/lang/trunk/";>browsed, or you can browse/contribute via https://github.com/apache/commons-lang";>GitHub.
svn commit: r1201022 - in /commons/proper/io/trunk/src: main/java/org/apache/commons/io/FileUtils.java test/java/org/apache/commons/io/FileUtilsTestCase.java
Author: bayard
Date: Fri Nov 11 18:45:53 2011
New Revision: 1201022
URL: http://svn.apache.org/viewvc?rev=1201022&view=rev
Log:
Adding EB/PB/TB per IO-287 and Ron Kuris' patch
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java?rev=1201022&r1=1201021&r2=1201022&view=diff
==
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
Fri Nov 11 18:45:53 2011
@@ -352,14 +352,13 @@ public class FileUtils {
public static String byteCountToDisplaySize(long size) {
String displaySize;
-//if (size / ONE_EB > 0) {
-//displaySize = String.valueOf(size / ONE_EB) + " EB";
-//} else if (size / ONE_PB > 0) {
-//displaySize = String.valueOf(size / ONE_PB) + " PB";
-//} else if (size / ONE_TB > 0) {
-//displaySize = String.valueOf(size / ONE_TB) + " TB";
-//} else
-if (size / ONE_GB > 0) {
+if (size / ONE_EB > 0) {
+displaySize = String.valueOf(size / ONE_EB) + " EB";
+} else if (size / ONE_PB > 0) {
+displaySize = String.valueOf(size / ONE_PB) + " PB";
+} else if (size / ONE_TB > 0) {
+displaySize = String.valueOf(size / ONE_TB) + " TB";
+} else if (size / ONE_GB > 0) {
displaySize = String.valueOf(size / ONE_GB) + " GB";
} else if (size / ONE_MB > 0) {
displaySize = String.valueOf(size / ONE_MB) + " MB";
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java?rev=1201022&r1=1201021&r2=1201022&view=diff
==
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
Fri Nov 11 18:45:53 2011
@@ -324,10 +324,10 @@ public class FileUtilsTestCase extends F
assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1024 * 1024), "1
GB");
assertEquals(FileUtils.byteCountToDisplaySize(1024 * 1024 * 1025), "1
GB");
assertEquals(FileUtils.byteCountToDisplaySize((1024 * 1024 * 1024 * 2)
- 1), "1 GB");
-//assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 *
1024), "1 TB");
-//assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 *
1024 * 1024), "1 PB");
-//assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 *
1024 * 1024 * 1024), "1 EB");
-//assertEquals(FileUtils.byteCountToDisplaySize(Long.MAX_VALUE), "7
EB");
+assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 *
1024), "1 TB");
+assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 *
1024 * 1024), "1 PB");
+assertEquals(FileUtils.byteCountToDisplaySize(1024L * 1024 * 1024 *
1024 * 1024 * 1024), "1 EB");
+assertEquals(FileUtils.byteCountToDisplaySize(Long.MAX_VALUE), "7 EB");
// Other MAX_VALUEs
assertEquals(FileUtils.byteCountToDisplaySize(Character.MAX_VALUE),
"63 KB");
assertEquals(FileUtils.byteCountToDisplaySize(Short.MAX_VALUE), "31
KB");
svn commit: r1200192 - in /commons/proper/lang/trunk: default.properties pom.xml
Author: bayard
Date: Thu Nov 10 06:57:01 2011
New Revision: 1200192
URL: http://svn.apache.org/viewvc?rev=1200192&view=rev
Log:
Returning to snapshots
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1200192&r1=1200191&r2=1200192&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Thu Nov 10 06:57:01 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.1
+component.version = 3.1-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1200192&r1=1200191&r2=1200192&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Thu Nov 10 06:57:01 2011
@@ -17,7 +17,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.1
+ 3.1-SNAPSHOT
Commons Lang
2001
svn commit: r1200191 - /commons/proper/lang/tags/LANG_3_1_RC1/
Author: bayard Date: Thu Nov 10 06:56:30 2011 New Revision: 1200191 URL: http://svn.apache.org/viewvc?rev=1200191&view=rev Log: Tagging 3.1 rc1 Added: commons/proper/lang/tags/LANG_3_1_RC1/ - copied from r1200190, commons/proper/lang/trunk/
svn commit: r1200190 - in /commons/proper/lang/trunk: default.properties pom.xml
Author: bayard
Date: Thu Nov 10 06:56:02 2011
New Revision: 1200190
URL: http://svn.apache.org/viewvc?rev=1200190&view=rev
Log:
Removing snapshot
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1200190&r1=1200189&r2=1200190&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Thu Nov 10 06:56:02 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.1-SNAPSHOT
+component.version = 3.1
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1200190&r1=1200189&r2=1200190&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Thu Nov 10 06:56:02 2011
@@ -17,7 +17,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.1-SNAPSHOT
+ 3.1
Commons Lang
2001
svn commit: r1200187 - /commons/proper/lang/tags/LANG_3_1_RC1/
Author: bayard Date: Thu Nov 10 06:48:39 2011 New Revision: 1200187 URL: http://svn.apache.org/viewvc?rev=1200187&view=rev Log: Redoing Removed: commons/proper/lang/tags/LANG_3_1_RC1/
svn commit: r1199887 - /commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt
Author: bayard Date: Wed Nov 9 17:32:52 2011 New Revision: 1199887 URL: http://svn.apache.org/viewvc?rev=1199887&view=rev Log: Copying current rel notes into site Added: commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt (with props) Added: commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt?rev=1199887&view=auto == --- commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt (added) +++ commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt Wed Nov 9 17:32:52 2011 @@ -0,0 +1,40 @@ +$Id: RELEASE-NOTES.txt 1199820 2011-11-09 16:14:52Z bayard $ + +Commons Lang Package +Version 3.1 + Release Notes + + +INTRODUCTION: + +This document contains the release notes for the 3.1 version of Apache Commons Lang. +Commons Lang is a set of utility functions and reusable components that should be of use in any +Java environment. + +Lang 3.0 and onwards now targets Java 5.0, making use of features that arrived with Java 5.0 such as generics, +variable arguments, autoboxing, concurrency and formatted output. + +For the advice on upgrading from 2.x to 3.x, see the following page: + +http://commons.apache.org/lang/article3_0.html + +CHANGES IN 3.1 + + +[LANG-760] Add API StringUtils.toString(byte[] intput, String charsetName) +[LANG-756] Add APIs ClassUtils.isPrimitiveWrapper(Class) and isPrimitiveOrWrapper(Class) +[LANG-758] Add an example with whitespace in StringUtils.defaultIfEmpty +[LANG-752] Fix createLong() so it behaves like createInteger() +[LANG-751] Include the actual type in the Validate.isInstance and isAssignableFrom exception messages +[LANG-748] Deprecating chomp(String, String) +[LANG-736] CharUtils static final array CHAR_STRING is not needed to compute CHAR_STRING_ARRAY +[LANG-695] SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix system + +BUG FIXES IN 3.1 +== + +[LANG-749] Incorrect Bundle-SymbolicName in Manifest +[LANG-746] NumberUtils does not handle upper-case hex: 0X and -0X +[LANG-744] StringUtils throws java.security.AccessControlException on Google App Engine +[LANG-741] Ant build has wrong component.name +[LANG-698] Document that the Mutable numbers don't work as expected with String.format Propchange: commons/proper/lang/trunk/src/site/resources/release-notes/RELEASE-NOTES-3.1.txt -- svn:eol-style = native
svn commit: r1199881 - in /commons/proper/lang/trunk: default.properties pom.xml
Author: bayard
Date: Wed Nov 9 17:22:17 2011
New Revision: 1199881
URL: http://svn.apache.org/viewvc?rev=1199881&view=rev
Log:
Setting back to snapshot
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1199881&r1=1199880&r2=1199881&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Wed Nov 9 17:22:17 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.1
+component.version = 3.1-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199881&r1=1199880&r2=1199881&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Wed Nov 9 17:22:17 2011
@@ -17,7 +17,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.1
+ 3.1-SNAPSHOT
Commons Lang
2001
svn commit: r1199879 - /commons/proper/lang/tags/LANG_3_1_RC1/
Author: bayard Date: Wed Nov 9 17:21:52 2011 New Revision: 1199879 URL: http://svn.apache.org/viewvc?rev=1199879&view=rev Log: Tagging 3.1 rc1 Added: commons/proper/lang/tags/LANG_3_1_RC1/ - copied from r1199878, commons/proper/lang/trunk/
svn commit: r1199878 - in /commons/proper/lang/trunk: default.properties pom.xml
Author: bayard
Date: Wed Nov 9 17:21:38 2011
New Revision: 1199878
URL: http://svn.apache.org/viewvc?rev=1199878&view=rev
Log:
Setting version to 3.1 for release build
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1199878&r1=1199877&r2=1199878&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Wed Nov 9 17:21:38 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.1-SNAPSHOT
+component.version = 3.1
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199878&r1=1199877&r2=1199878&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Wed Nov 9 17:21:38 2011
@@ -17,7 +17,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.1-SNAPSHOT
+ 3.1
Commons Lang
2001
svn commit: r1199877 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Wed Nov 9 17:19:20 2011 New Revision: 1199877 URL: http://svn.apache.org/viewvc?rev=1199877&view=rev Log: Removing explicit definition of previous version of Lang per Sebb Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199877&r1=1199876&r2=1199877&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Wed Nov 9 17:19:20 2011 @@ -555,9 +555,6 @@ clirr-maven-plugin 2.3 - -3.0.1 - info
svn commit: r1199820 - in /commons/proper/lang/trunk: RELEASE-NOTES.txt default.properties pom.xml src/site/changes/changes.xml src/site/xdoc/download_lang.xml src/site/xdoc/index.xml
Author: bayard
Date: Wed Nov 9 16:14:52 2011
New Revision: 1199820
URL: http://svn.apache.org/viewvc?rev=1199820&view=rev
Log:
Changing planned version from 3.0.2 to 3.1
Modified:
commons/proper/lang/trunk/RELEASE-NOTES.txt
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
commons/proper/lang/trunk/src/site/changes/changes.xml
commons/proper/lang/trunk/src/site/xdoc/download_lang.xml
commons/proper/lang/trunk/src/site/xdoc/index.xml
Modified: commons/proper/lang/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/RELEASE-NOTES.txt?rev=1199820&r1=1199819&r2=1199820&view=diff
==
--- commons/proper/lang/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/lang/trunk/RELEASE-NOTES.txt Wed Nov 9 16:14:52 2011
@@ -1,13 +1,13 @@
$Id$
Commons Lang Package
-Version 3.0.2
+Version 3.1
Release Notes
INTRODUCTION:
-This document contains the release notes for the 3.0.2 version of Apache
Commons Lang.
+This document contains the release notes for the 3.1 version of Apache Commons
Lang.
Commons Lang is a set of utility functions and reusable components that should
be of use in any
Java environment.
@@ -18,7 +18,7 @@ For the advice on upgrading from 2.x to
http://commons.apache.org/lang/article3_0.html
-CHANGES IN 3.0.2
+CHANGES IN 3.1
[LANG-760] Add API StringUtils.toString(byte[] intput, String charsetName)
@@ -30,7 +30,7 @@ CHANGES IN 3.0.2
[LANG-736] CharUtils static final array CHAR_STRING is not needed to
compute CHAR_STRING_ARRAY
[LANG-695] SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix
system
-BUG FIXES IN 3.0.2
+BUG FIXES IN 3.1
==
[LANG-749] Incorrect Bundle-SymbolicName in Manifest
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1199820&r1=1199819&r2=1199820&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Wed Nov 9 16:14:52 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.0.2-SNAPSHOT
+component.version = 3.1-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199820&r1=1199819&r2=1199820&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Wed Nov 9 16:14:52 2011
@@ -17,7 +17,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.0.2-SNAPSHOT
+ 3.1-SNAPSHOT
Commons Lang
2001
@@ -452,7 +452,7 @@
1.5
1.5
lang3
-3.0.2
+3.1
(Java 5.0+)
LANG
12310481
Modified: commons/proper/lang/trunk/src/site/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/changes/changes.xml?rev=1199820&r1=1199819&r2=1199820&view=diff
==
--- commons/proper/lang/trunk/src/site/changes/changes.xml (original)
+++ commons/proper/lang/trunk/src/site/changes/changes.xml Wed Nov 9 16:14:52
2011
@@ -21,7 +21,7 @@
-
+
Add API StringUtils.toString(byte[]
intput, String charsetName)
Add an example with whitespace in
StringUtils.defaultIfEmpty
Add APIs
ClassUtils.isPrimitiveWrapper(Class<?>) and
isPrimitiveOrWrapper(Class<?>)
Modified: commons/proper/lang/trunk/src/site/xdoc/download_lang.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/xdoc/download_lang.xml?rev=1199820&r1=1199819&r2=1199820&view=diff
==
--- commons/proper/lang/trunk/src/site/xdoc/download_lang.xml (original)
+++ commons/proper/lang/trunk/src/site/xdoc/download_lang.xml Wed Nov 9
16:14:52 2011
@@ -95,32 +95,32 @@ limitations under the License.
-
+
- commons-lang3-3.0.2-bin.tar.gz
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.2-bin.tar.gz.md5";>md5
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.2-bin.tar.gz.asc";>pgp
+ commons-lang3-3.1-bin.tar.gz
+ http://www.apache.org/dist/
svn commit: r1199817 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Wed Nov 9 16:11:44 2011 New Revision: 1199817 URL: http://svn.apache.org/viewvc?rev=1199817&view=rev Log: Updating dependencies Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199817&r1=1199816&r2=1199817&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Wed Nov 9 16:11:44 2011 @@ -434,14 +434,14 @@ commons-io commons-io - 2.0.1 + 2.1 test org.easymock easymock - 2.5.2 + 3.0 test
svn commit: r1199816 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/ main/java/org/apache/commons/lang3/math/ test/java/org/apache/commons/lang3/builder/
Author: bayard
Date: Wed Nov 9 16:11:34 2011
New Revision: 1199816
URL: http://svn.apache.org/viewvc?rev=1199816&view=rev
Log:
Changing @since 3.0.2 to @since 3.1
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderMutateInspectConcurrencyTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java?rev=1199816&r1=1199815&r2=1199816&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
Wed Nov 9 16:11:34 2011
@@ -531,7 +531,7 @@ public class ClassUtils {
*The class to query or null.
* @return true if the given {@code type} is a primitive or primitive
wrapper ({@link Boolean}, {@link Byte}, {@link Character},
* {@link Short}, {@link Integer}, {@link Long}, {@link Double},
{@link Float}).
- * @since 3.0.2
+ * @since 3.1
*/
public static boolean isPrimitiveOrWrapper(Class type) {
if (type == null) {
@@ -548,7 +548,7 @@ public class ClassUtils {
*The class to query or null.
* @return true if the given {@code type} is a primitive wrapper ({@link
Boolean}, {@link Byte}, {@link Character}, {@link Short},
* {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
- * @since 3.0.2
+ * @since 3.1
*/
public static boolean isPrimitiveWrapper(Class type) {
return wrapperPrimitiveMap.containsKey(type);
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java?rev=1199816&r1=1199815&r2=1199816&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
Wed Nov 9 16:11:34 2011
@@ -1009,7 +1009,7 @@ public class SystemUtils {
* The field will return {@code false} if {@code OS_NAME} is {@code null}.
*
*
- * @since 3.0.2
+ * @since 3.1
*/
public static final boolean IS_OS_FREE_BSD = getOSMatchesName("FreeBSD");
@@ -1021,7 +1021,7 @@ public class SystemUtils {
* The field will return {@code false} if {@code OS_NAME} is {@code null}.
*
*
- * @since 3.0.2
+ * @since 3.1
*/
public static final boolean IS_OS_OPEN_BSD = getOSMatchesName("OpenBSD");
@@ -1033,7 +1033,7 @@ public class SystemUtils {
* The field will return {@code false} if {@code OS_NAME} is {@code null}.
*
*
- * @since 3.0.2
+ * @since 3.1
*/
public static final boolean IS_OS_NET_BSD = getOSMatchesName("NetBSD");
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/math/NumberUtils.java?rev=1199816&r1=1199815&r2=1199816&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
Wed Nov 9 16:11:34 2011
@@ -666,7 +666,7 @@ public class NumberUtils {
/**
* Convert a String to a Long;
- * since 3.0.2 it handles hex and octal notations.
+ * since 3.1 it handles hex and octal notations.
*
* Returns null if the string is null.
*
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java?rev=1199816&r1=1199815&r2=1199816&view=diff
==
svn commit: r1199651 - in /commons/proper/lang/trunk: default.properties pom.xml
Author: bayard
Date: Wed Nov 9 08:43:48 2011
New Revision: 1199651
URL: http://svn.apache.org/viewvc?rev=1199651&view=rev
Log:
Moving to snapshot to avoid any accidental 3.0.2 builds
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1199651&r1=1199650&r2=1199651&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Wed Nov 9 08:43:48 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.0.2
+component.version = 3.0.2-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199651&r1=1199650&r2=1199651&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Wed Nov 9 08:43:48 2011
@@ -27,7 +27,7 @@
4.0.0
org.apache.commons
commons-lang3
- 3.0.2
+ 3.0.2-SNAPSHOT
Commons Lang
2001
svn commit: r1199641 - /commons/proper/lang/tags/LANG_3_0_2_RC1/
Author: bayard Date: Wed Nov 9 07:52:34 2011 New Revision: 1199641 URL: http://svn.apache.org/viewvc?rev=1199641&view=rev Log: Tagging 3.0.2 Added: commons/proper/lang/tags/LANG_3_0_2_RC1/ - copied from r1199640, commons/proper/lang/trunk/
svn commit: r1199640 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Wed Nov 9 07:51:58 2011 New Revision: 1199640 URL: http://svn.apache.org/viewvc?rev=1199640&view=rev Log: Making the clirr comparison be the previous version (3.0.1) Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199640&r1=1199639&r2=1199640&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Wed Nov 9 07:51:58 2011 @@ -581,7 +581,7 @@ org.apache.commons commons-lang3 - 3.0.2 + 3.0.1 info
svn commit: r1199639 - /commons/proper/lang/tags/LANG_3_0_2_RC1/
Author: bayard Date: Wed Nov 9 07:51:09 2011 New Revision: 1199639 URL: http://svn.apache.org/viewvc?rev=1199639&view=rev Log: Redoing Removed: commons/proper/lang/tags/LANG_3_0_2_RC1/
svn commit: r1199638 - /commons/proper/lang/tags/LANG_3_0_2_RC1/
Author: bayard Date: Wed Nov 9 07:49:39 2011 New Revision: 1199638 URL: http://svn.apache.org/viewvc?rev=1199638&view=rev Log: Tagging 3.0.2 Added: commons/proper/lang/tags/LANG_3_0_2_RC1/ - copied from r1199637, commons/proper/lang/trunk/
svn commit: r1199637 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Wed Nov 9 07:48:38 2011 New Revision: 1199637 URL: http://svn.apache.org/viewvc?rev=1199637&view=rev Log: Setting version as 3.0.2 for tagging Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199637&r1=1199636&r2=1199637&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Wed Nov 9 07:48:38 2011 @@ -27,7 +27,7 @@ 4.0.0 org.apache.commons commons-lang3 - 3.0.2-SNAPSHOT + 3.0.2 Commons Lang 2001
svn commit: r1199613 - in /commons/proper/lang/trunk: default.properties pom.xml src/site/xdoc/download_lang.xml src/site/xdoc/index.xml
Author: bayard
Date: Wed Nov 9 04:29:01 2011
New Revision: 1199613
URL: http://svn.apache.org/viewvc?rev=1199613&view=rev
Log:
Upgrading version numbers to 3.0.2
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/pom.xml
commons/proper/lang/trunk/src/site/xdoc/download_lang.xml
commons/proper/lang/trunk/src/site/xdoc/index.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1199613&r1=1199612&r2=1199613&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Wed Nov 9 04:29:01 2011
@@ -39,7 +39,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.0.1
+component.version = 3.0.2
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1199613&r1=1199612&r2=1199613&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Wed Nov 9 04:29:01 2011
@@ -462,7 +462,7 @@
1.5
1.5
lang3
-3.0.1
+3.0.2
(Java 5.0+)
LANG
12310481
@@ -581,7 +581,7 @@
org.apache.commons
commons-lang3
- 3.0.1
+ 3.0.2
info
Modified: commons/proper/lang/trunk/src/site/xdoc/download_lang.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/xdoc/download_lang.xml?rev=1199613&r1=1199612&r2=1199613&view=diff
==
--- commons/proper/lang/trunk/src/site/xdoc/download_lang.xml (original)
+++ commons/proper/lang/trunk/src/site/xdoc/download_lang.xml Wed Nov 9
04:29:01 2011
@@ -95,62 +95,32 @@ limitations under the License.
-
+
- commons-lang3-3.0.1-bin.tar.gz
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.1-bin.tar.gz.md5";>md5
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.1-bin.tar.gz.asc";>pgp
+ commons-lang3-3.0.2-bin.tar.gz
+ http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.2-bin.tar.gz.md5";>md5
+ http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.2-bin.tar.gz.asc";>pgp
- commons-lang3-3.0.1-bin.zip
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.1-bin.zip.md5";>md5
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.1-bin.zip.asc";>pgp
+ commons-lang3-3.0.2-bin.zip
+ http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.2-bin.zip.md5";>md5
+ http://www.apache.org/dist/commons/lang/binaries/commons-lang3-3.0.2-bin.zip.asc";>pgp
- commons-lang3-3.0.1-src.tar.gz
- http://www.apache.org/dist/commons/lang/source/commons-lang3-3.0.1-src.tar.gz.md5";>md5
- http://www.apache.org/dist/commons/lang/source/commons-lang3-3.0.1-src.tar.gz.asc";>pgp
+ commons-lang3-3.0.2-src.tar.gz
+ http://www.apache.org/dist/commons/lang/source/commons-lang3-3.0.2-src.tar.gz.md5";>md5
+ http://www.apache.org/dist/commons/lang/source/commons-lang3-3.0.2-src.tar.gz.asc";>pgp
- commons-lang3-3.0.1-src.zip
- http://www.apache.org/dist/commons/lang/source/commons-lang3-3.0.1-src.zip.md5";>md5
- http://www.apache.org/dist/commons/lang/source/commons-lang3-3.0.1-src.zip.asc";>pgp
-
-
-
-
-
-
-
-
- commons-lang3-2.6-bin.tar.gz
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-2.6-bin.tar.gz.md5";>md5
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-2.6-bin.tar.gz.asc";>pgp
-
-
- commons-lang3-2.6-bin.zip
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-2.6-bin.zip.md5";>md5
- http://www.apache.org/dist/commons/lang/binaries/commons-lang3-2.6-bin.zip.asc";>pgp
-
-
-
-
-
-
- commons
svn commit: r1199612 - /commons/proper/lang/trunk/RELEASE-NOTES.txt
Author: bayard Date: Wed Nov 9 04:25:12 2011 New Revision: 1199612 URL: http://svn.apache.org/viewvc?rev=1199612&view=rev Log: Updating release notes Modified: commons/proper/lang/trunk/RELEASE-NOTES.txt Modified: commons/proper/lang/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/RELEASE-NOTES.txt?rev=1199612&r1=1199611&r2=1199612&view=diff == --- commons/proper/lang/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/lang/trunk/RELEASE-NOTES.txt Wed Nov 9 04:25:12 2011 @@ -1,13 +1,13 @@ $Id$ Commons Lang Package -Version 3.0.1 +Version 3.0.2 Release Notes INTRODUCTION: -This document contains the release notes for the 3.0.1 version of Apache Commons Lang. +This document contains the release notes for the 3.0.2 version of Apache Commons Lang. Commons Lang is a set of utility functions and reusable components that should be of use in any Java environment. @@ -18,25 +18,23 @@ For the advice on upgrading from 2.x to http://commons.apache.org/lang/article3_0.html -CHANGES IN 3.0.1 +CHANGES IN 3.0.2 -[LANG-686] Improve exception message when StringUtils.replaceEachRepeatedly detects recursion -[LANG-717] Specify source encoding for Ant build -[LANG-721] Complement ArrayUtils.addAll() variants with by-index and by-value removal methods -[LANG-726] Add Range Range.intersectionWith(Range) -[LANG-723] Add mode and median Comparable... methods to ObjectUtils -[LANG-722] Add BooleanUtils.and + or varargs methods -[LANG-730] EnumSet -> bit vector -[LANG-735] Deprecate CharUtils.toCharacterObject(char) in favor of java.lang.Character.valueOf(char) -[LANG-737] Missing method getRawMessage for ContextedException and ContextedRuntimeException +[LANG-760] Add API StringUtils.toString(byte[] intput, String charsetName) +[LANG-756] Add APIs ClassUtils.isPrimitiveWrapper(Class) and isPrimitiveOrWrapper(Class) +[LANG-758] Add an example with whitespace in StringUtils.defaultIfEmpty +[LANG-752] Fix createLong() so it behaves like createInteger() +[LANG-751] Include the actual type in the Validate.isInstance and isAssignableFrom exception messages +[LANG-748] Deprecating chomp(String, String) +[LANG-736] CharUtils static final array CHAR_STRING is not needed to compute CHAR_STRING_ARRAY +[LANG-695] SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix system -BUG FIXES IN 3.0.1 +BUG FIXES IN 3.0.2 == -[LANG-626] SerializationUtils.clone: Fallback to context classloader if class not found in current classloader -[LANG-727] ToStringBuilderTest.testReflectionHierarchyArrayList fails with IBM JDK 6 -[LANG-720] StringEscapeUtils.escapeXml(input) wrong when input contains characters in Supplementary Planes -[LANG-708] StringEscapeUtils.escapeEcmaScript from lang3 cuts off long unicode string -[LANG-734] The CHAR_ARRAY cache in CharUtils duplicates the cache in java.lang.Character -[LANG-738] Use internal Java's Number caches instead creating new objects +[LANG-749] Incorrect Bundle-SymbolicName in Manifest +[LANG-746] NumberUtils does not handle upper-case hex: 0X and -0X +[LANG-744] StringUtils throws java.security.AccessControlException on Google App Engine +[LANG-741] Ant build has wrong component.name +[LANG-698] Document that the Mutable numbers don't work as expected with String.format
svn commit: r1199610 - /commons/proper/lang/trunk/src/site/changes/changes.xml
Author: bayard Date: Wed Nov 9 04:22:21 2011 New Revision: 1199610 URL: http://svn.apache.org/viewvc?rev=1199610&view=rev Log: Updating changes report per 3.0.2 issues in JIRA Modified: commons/proper/lang/trunk/src/site/changes/changes.xml Modified: commons/proper/lang/trunk/src/site/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/changes/changes.xml?rev=1199610&r1=1199609&r2=1199610&view=diff == --- commons/proper/lang/trunk/src/site/changes/changes.xml (original) +++ commons/proper/lang/trunk/src/site/changes/changes.xml Wed Nov 9 04:22:21 2011 @@ -23,15 +23,18 @@ Add API StringUtils.toString(byte[] intput, String charsetName) +Add an example with whitespace in StringUtils.defaultIfEmpty Add APIs ClassUtils.isPrimitiveWrapper(Class<?>) and isPrimitiveOrWrapper(Class<?>) Fix createLong() so it behaves like createInteger() Include the actual type in the Validate.isInstance and isAssignableFrom exception messages +Incorrect Bundle-SymbolicName in Manifest +Deprecating chomp(String, String) NumberUtils does not handle upper-case hex: 0X and -0X -CharUtils static final array CHAR_STRING is not needed to compute CHAR_STRING_ARRAY StringUtils throws java.security.AccessControlException on Google App Engine -SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix system -Document that the Mutable numbers don't work as expected with String.format Ant build has wrong component.name +CharUtils static final array CHAR_STRING is not needed to compute CHAR_STRING_ARRAY +Document that the Mutable numbers don't work as expected with String.format +SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix system
svn commit: r1199609 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/compare/ test/java/org/apache/commons/lang3/compare/
Author: bayard Date: Wed Nov 9 04:12:18 2011 New Revision: 1199609 URL: http://svn.apache.org/viewvc?rev=1199609&view=rev Log: Dropping comparators for next release (LANG-532) Removed: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/
svn commit: r1178128 - /commons/scripts/commons-build-bayard.sh
Author: bayard
Date: Sun Oct 2 05:23:23 2011
New Revision: 1178128
URL: http://svn.apache.org/viewvc?rev=1178128&view=rev
Log:
Dropping the environment variables
Modified:
commons/scripts/commons-build-bayard.sh
Modified: commons/scripts/commons-build-bayard.sh
URL:
http://svn.apache.org/viewvc/commons/scripts/commons-build-bayard.sh?rev=1178128&r1=1178127&r2=1178128&view=diff
==
--- commons/scripts/commons-build-bayard.sh (original)
+++ commons/scripts/commons-build-bayard.sh Sun Oct 2 05:23:23 2011
@@ -4,10 +4,6 @@ GROUPDIR=`echo ${GROUPID} | sed 's/\./\/
ARTIFACTID=`grep artifactId pom.xml | head -2 | tail -1 | sed 's/^
*//' | sed 's/<\/artifactId>//'`
VERSION=`grep version pom.xml | head -3 | tail -1 | sed 's/^ *//' |
sed 's/<\/version>//'`
-export JAVA_HOME=$HOME/apps/jdk1.5.0_22
-export PATH=$JAVA_HOME/bin:$PATH
-export PATH=$HOME/oss/apache/committer-tools/releases:$PATH
-
rm -fr $HOME/.m2/repository/${GROUPDIR}/${ARTIFACTID}
rm -fr ../upload
mkdir ../upload
svn commit: r1178126 - /commons/scripts/commons-build-bayard.sh
Author: bayard
Date: Sun Oct 2 05:20:33 2011
New Revision: 1178126
URL: http://svn.apache.org/viewvc?rev=1178126&view=rev
Log:
Replacing hardcoded home dir
Modified:
commons/scripts/commons-build-bayard.sh
Modified: commons/scripts/commons-build-bayard.sh
URL:
http://svn.apache.org/viewvc/commons/scripts/commons-build-bayard.sh?rev=1178126&r1=1178125&r2=1178126&view=diff
==
--- commons/scripts/commons-build-bayard.sh (original)
+++ commons/scripts/commons-build-bayard.sh Sun Oct 2 05:20:33 2011
@@ -4,16 +4,16 @@ GROUPDIR=`echo ${GROUPID} | sed 's/\./\/
ARTIFACTID=`grep artifactId pom.xml | head -2 | tail -1 | sed 's/^
*//' | sed 's/<\/artifactId>//'`
VERSION=`grep version pom.xml | head -3 | tail -1 | sed 's/^ *//' |
sed 's/<\/version>//'`
-export JAVA_HOME=/home/hen/apps/jdk1.5.0_22
+export JAVA_HOME=$HOME/apps/jdk1.5.0_22
export PATH=$JAVA_HOME/bin:$PATH
-export PATH=/home/hen/oss/apache/committer-tools/releases:$PATH
+export PATH=$HOME/oss/apache/committer-tools/releases:$PATH
-rm -fr /home/hen/.m2/repository/${GROUPDIR}/${ARTIFACTID}
+rm -fr $HOME/.m2/repository/${GROUPDIR}/${ARTIFACTID}
rm -fr ../upload
mkdir ../upload
mvn -Prc -DcreateChecksum=true install
-cp -r /home/hen/.m2/repository/${GROUPDIR}/${ARTIFACTID} ../upload/maven
+cp -r $HOME/.m2/repository/${GROUPDIR}/${ARTIFACTID} ../upload/maven
mvn assembly:assembly site
svn commit: r1178125 - /commons/scripts/commons-build-bayard.sh
Author: bayard
Date: Sun Oct 2 05:16:47 2011
New Revision: 1178125
URL: http://svn.apache.org/viewvc?rev=1178125&view=rev
Log:
Storing the shell script I use to build releases
Added:
commons/scripts/commons-build-bayard.sh (with props)
Added: commons/scripts/commons-build-bayard.sh
URL:
http://svn.apache.org/viewvc/commons/scripts/commons-build-bayard.sh?rev=1178125&view=auto
==
--- commons/scripts/commons-build-bayard.sh (added)
+++ commons/scripts/commons-build-bayard.sh Sun Oct 2 05:16:47 2011
@@ -0,0 +1,36 @@
+
+GROUPID=`grep groupId pom.xml | head -2 | tail -1 | sed 's/^ *//' |
sed 's/<\/groupId>//'`
+GROUPDIR=`echo ${GROUPID} | sed 's/\./\//g'`
+ARTIFACTID=`grep artifactId pom.xml | head -2 | tail -1 | sed 's/^
*//' | sed 's/<\/artifactId>//'`
+VERSION=`grep version pom.xml | head -3 | tail -1 | sed 's/^ *//' |
sed 's/<\/version>//'`
+
+export JAVA_HOME=/home/hen/apps/jdk1.5.0_22
+export PATH=$JAVA_HOME/bin:$PATH
+export PATH=/home/hen/oss/apache/committer-tools/releases:$PATH
+
+rm -fr /home/hen/.m2/repository/${GROUPDIR}/${ARTIFACTID}
+rm -fr ../upload
+mkdir ../upload
+
+mvn -Prc -DcreateChecksum=true install
+cp -r /home/hen/.m2/repository/${GROUPDIR}/${ARTIFACTID} ../upload/maven
+
+mvn assembly:assembly site
+
+mv target/${ARTIFACTID}-${VERSION}-src.* ../upload/
+mv target/${ARTIFACTID}-${VERSION}-bin.* ../upload/
+mv target/site ../upload
+
+cd ../upload
+
+multisign.sh ${ARTIFACTID}-${VERSION}-*
+
+tar -zcf site.tgz site
+rm -fr site
+
+cd maven/${VERSION}
+jar cf ../../${ARTIFACTID}-${VERSION}-bundle.jar *.jar *.pom *.asc
+cd ../..
+rm -fr maven
+
+cd ..
Propchange: commons/scripts/commons-build-bayard.sh
--
svn:eol-style = native
Propchange: commons/scripts/commons-build-bayard.sh
--
svn:executable = *
svn commit: r1177171 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Author: bayard
Date: Thu Sep 29 05:56:45 2011
New Revision: 1177171
URL: http://svn.apache.org/viewvc?rev=1177171&view=rev
Log:
Adding additional example for whitespace per Bruno's patch in LANG-758
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1177171&r1=1177170&r2=1177171&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Thu Sep 29 05:56:45 2011
@@ -5568,6 +5568,7 @@ public class StringUtils {
*
* StringUtils.defaultIfEmpty(null, "NULL") = "NULL"
* StringUtils.defaultIfEmpty("", "NULL")= "NULL"
+ * StringUtils.defaultIfEmpty(" ", "NULL") = " "
* StringUtils.defaultIfEmpty("bat", "NULL") = "bat"
* StringUtils.defaultIfEmpty("", null) = null
*
svn commit: r1171893 - /commons/proper/dbutils/trunk/src/site/site.xml
Author: bayard Date: Sat Sep 17 04:58:35 2011 New Revision: 1171893 URL: http://svn.apache.org/viewvc?rev=1171893&view=rev Log: Removing the license link from the navbar; Commons handles this now via a default link Modified: commons/proper/dbutils/trunk/src/site/site.xml Modified: commons/proper/dbutils/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/site/site.xml?rev=1171893&r1=1171892&r2=1171893&view=diff == --- commons/proper/dbutils/trunk/src/site/site.xml (original) +++ commons/proper/dbutils/trunk/src/site/site.xml Sat Sep 17 04:58:35 2011 @@ -29,7 +29,6 @@ - http://wiki.apache.org/commons/DbUtils"/>
svn commit: r1171128 - /commons/proper/dbutils/trunk/RELEASE-NOTES.txt
Author: bayard Date: Thu Sep 15 15:16:13 2011 New Revision: 1171128 URL: http://svn.apache.org/viewvc?rev=1171128&view=rev Log: Generating release notes from changes report Modified: commons/proper/dbutils/trunk/RELEASE-NOTES.txt Modified: commons/proper/dbutils/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/RELEASE-NOTES.txt?rev=1171128&r1=1171127&r2=1171128&view=diff == --- commons/proper/dbutils/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/dbutils/trunk/RELEASE-NOTES.txt Thu Sep 15 15:16:13 2011 @@ -1,12 +1,20 @@ -$Id$ +The Commons DbUtils team is pleased to announce the commons-dbutils-1.4-SNAPSHOT release! -Commons DbUtils Package -Release Notes +A package of Java utility classes for easing JDBC development +Changes in this version include: -You can find release notes for this and past releases online at +New features: +o Add asynchronous batch, query, and update calls Issue: DBUTILS-78. -http://commons.apache.org/dbutils/changes-report.html +Fixed Bugs: +o Duplicate code introduced during Java 1.5 branch merge Issue: DBUTILS-65. +o fillStatement doesn't complain when there are too few parameters Issue: DBUTILS-79. +Changes: +o efficient usage from findbugs Issue: DBUTILS-75. +Have fun! +-Commons DbUtils team +
svn commit: r1171127 - /commons/proper/dbutils/trunk/pom.xml
Author: bayard Date: Thu Sep 15 15:13:18 2011 New Revision: 1171127 URL: http://svn.apache.org/viewvc?rev=1171127&view=rev Log: Rolling main version back to 1.4-SNAPSHOT. Updating the version property to 1.4-SNAPSHOT Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1171127&r1=1171126&r2=1171127&view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Thu Sep 15 15:13:18 2011 @@ -24,7 +24,7 @@ 4.0.0 commons-dbutils commons-dbutils - 1.5-SNAPSHOT + 1.4-SNAPSHOT Commons DbUtils 2002 @@ -200,8 +200,8 @@ 1.5 1.5 dbutils -1.3 -RC4 +1.4-SNAPSHOT +RC1 DBUTILS 12310470
svn commit: r1170983 - /commons/proper/dbutils/trunk/pom.xml
Author: bayard Date: Thu Sep 15 07:30:07 2011 New Revision: 1170983 URL: http://svn.apache.org/viewvc?rev=1170983&view=rev Log: Incrementing the version number while we vote Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1170983&r1=1170982&r2=1170983&view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Thu Sep 15 07:30:07 2011 @@ -24,7 +24,7 @@ 4.0.0 commons-dbutils commons-dbutils - 1.4 + 1.5-SNAPSHOT Commons DbUtils 2002
svn commit: r1170973 - /commons/proper/dbutils/tags/DBUTILS_1_4_RC1/
Author: bayard Date: Thu Sep 15 06:36:12 2011 New Revision: 1170973 URL: http://svn.apache.org/viewvc?rev=1170973&view=rev Log: Tagging 1.4 RC1 Added: commons/proper/dbutils/tags/DBUTILS_1_4_RC1/ (props changed) - copied from r1170972, commons/proper/dbutils/trunk/ Propchange: commons/proper/dbutils/tags/DBUTILS_1_4_RC1/ -- --- svn:ignore (added) +++ svn:ignore Thu Sep 15 06:36:12 2011 @@ -0,0 +1,6 @@ +target +maven.log +.classpath +.project +*.log +.settings Propchange: commons/proper/dbutils/tags/DBUTILS_1_4_RC1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Sep 15 06:36:12 2011 @@ -0,0 +1,2 @@ +/commons/sandbox/dbutils/bugfixing:741987-747450 +/commons/sandbox/dbutils/java5:741988-832184
svn commit: r1170972 - /commons/proper/dbutils/trunk/pom.xml
Author: bayard Date: Thu Sep 15 06:34:52 2011 New Revision: 1170972 URL: http://svn.apache.org/viewvc?rev=1170972&view=rev Log: Making the version 1.4 for release Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1170972&r1=1170971&r2=1170972&view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Thu Sep 15 06:34:52 2011 @@ -24,7 +24,7 @@ 4.0.0 commons-dbutils commons-dbutils - 1.4-SNAPSHOT + 1.4 Commons DbUtils 2002
svn commit: r1170970 - /commons/proper/dbutils/trunk/pom.xml
Author: bayard Date: Thu Sep 15 06:33:18 2011 New Revision: 1170970 URL: http://svn.apache.org/viewvc?rev=1170970&view=rev Log: Adding Bill Speirs to the contributors Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1170970&r1=1170969&r2=1170970&view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Thu Sep 15 06:33:18 2011 @@ -167,6 +167,12 @@ Java Developer + + Bill Speirs + +Java Developer + +
svn commit: r1170938 - in /commons/proper/dbutils/trunk: PROPOSAL.html src/assembly/src.xml
Author: bayard Date: Thu Sep 15 02:59:22 2011 New Revision: 1170938 URL: http://svn.apache.org/viewvc?rev=1170938&view=rev Log: Removing the proposal as it's a historic document and not needed nowadays Modified: commons/proper/dbutils/trunk/PROPOSAL.html commons/proper/dbutils/trunk/src/assembly/src.xml Modified: commons/proper/dbutils/trunk/src/assembly/src.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/assembly/src.xml?rev=1170938&r1=1170937&r2=1170938&view=diff == --- commons/proper/dbutils/trunk/src/assembly/src.xml (original) +++ commons/proper/dbutils/trunk/src/assembly/src.xml Thu Sep 15 02:59:22 2011 @@ -29,7 +29,6 @@ LICENSE.txt NOTICE.txt pom.xml -PROPOSAL.html RELEASE-NOTES.txt
svn commit: r1170937 - /commons/proper/dbutils/trunk/src/changes/changes.xml
Author: bayard Date: Thu Sep 15 02:58:18 2011 New Revision: 1170937 URL: http://svn.apache.org/viewvc?rev=1170937&view=rev Log: Adding release notes Modified: commons/proper/dbutils/trunk/src/changes/changes.xml Modified: commons/proper/dbutils/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/changes/changes.xml?rev=1170937&r1=1170936&r2=1170937&view=diff == --- commons/proper/dbutils/trunk/src/changes/changes.xml (original) +++ commons/proper/dbutils/trunk/src/changes/changes.xml Thu Sep 15 02:58:18 2011 @@ -38,6 +38,20 @@ The type attribute can be add,u Release Notes + + +Duplicate code introduced during Java 1.5 branch merge + + +fillStatement doesn't complain when there are too few parameters + + +efficient usage from findbugs + + +Add asynchronous batch, query, and update calls + + Java 1.5 generics and varargs
svn commit: r1167674 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Author: bayard
Date: Sun Sep 11 05:49:13 2011
New Revision: 1167674
URL: http://svn.apache.org/viewvc?rev=1167674&view=rev
Log:
Making this package private as it lacks any public API value at the present
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java?rev=1167674&r1=1167673&r2=1167674&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Sun Sep 11 05:49:13 2011
@@ -25,7 +25,7 @@ import java.util.Comparator;
* @since Commons Collections 2.1
* @version $Revision$ $Date$
*/
-public class ComparatorUtils {
+class ComparatorUtils {
/**
* ComparatorUtils should not normally be instantiated.
svn commit: r1167673 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/compare/ test/java/org/apache/commons/lang3/compare/
Author: bayard
Date: Sun Sep 11 05:47:33 2011
New Revision: 1167673
URL: http://svn.apache.org/viewvc?rev=1167673&view=rev
Log:
Making ComparatorChain implement Iterable. Including test and package private
copy of Collections' UnmodifiableIterator
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/UnmodifiableIterator.java
(with props)
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparatorChainTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java?rev=1167673&r1=1167672&r2=1167673&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
Sun Sep 11 05:47:33 2011
@@ -43,7 +43,7 @@ import java.util.List;
* @since Commons Collections 2.0
* @version $Revision$ $Date$
*/
-public class ComparatorChain implements Comparator, Serializable {
+public class ComparatorChain implements Comparator, Serializable,
Iterable {
/** The list of comparators in the chain. */
protected List> comparatorChain = null;
@@ -109,6 +109,16 @@ public class ComparatorChain implemen
//---
/**
+ * Iterate through the chained comparators.
+ *
+ * @return Unmodifiable iterator over the chained comparators
+ */
+public Iterator> iterator() {
+return new UnmodifiableIterator(comparatorChain.iterator());
+}
+
+//---
+/**
* Implement a hash code for this comparator that is consistent with
* {@link #equals(Object) equals}.
*
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/UnmodifiableIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/UnmodifiableIterator.java?rev=1167673&view=auto
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/UnmodifiableIterator.java
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/UnmodifiableIterator.java
Sun Sep 11 05:47:33 2011
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.compare;
+
+import java.util.Iterator;
+
+/**
+ * Decorates an iterator such that it cannot be modified.
+ *
+ * Attempts to modify it will result in an UnsupportedOperationException.
+ *
+ * @since Commons Collections 3.0
+ * @version $Revision: 1148801 $ $Date: 2011-07-20 07:44:46 -0700 (Wed, 20 Jul
2011) $
+ */
+final class UnmodifiableIterator implements Iterator {
+
+/** The iterator being decorated */
+private final Iterator iterator;
+
+//---
+/**
+ * Constructor.
+ *
+ * @param iterator the iterator to decorate
+ */
+public UnmodifiableIterator(Iterator iterator) {
+super();
+if (iterator == null) {
+throw new IllegalArgumentException("Iterator must not be null");
+}
+this.iterator = iterator;
+}
+
+//---
+public boolean hasNext() {
+return iterator.hasNext();
+}
+
+public E next() {
+return iterator.next();
+}
+
+public void remove() {
+throw new UnsupportedOperationException("remove() is not supported");
+}
+
+}
Propchange:
commons/proper/lang/trunk/s
svn commit: r1167671 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/compare/ComparatorChain.java test/java/org/apache/commons/lang3/compare/ComparatorChainTest.java
Author: bayard
Date: Sun Sep 11 05:07:14 2011
New Revision: 1167671
URL: http://svn.apache.org/viewvc?rev=1167671&view=rev
Log:
Simplifying ComparatorChain version from the version taken from Commons
Collections. The ability to modify the comparator list, and the ability to
reverse items (rather than simply wrapping in ReverseComparator) was complexity
inducing. Also added a unit test.
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparatorChainTest.java
(with props)
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java?rev=1167671&r1=1167670&r2=1167671&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
Sun Sep 11 05:07:14 2011
@@ -18,7 +18,7 @@ package org.apache.commons.lang3.compare
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.BitSet;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -35,16 +35,6 @@ import java.util.List;
* allows Java classes to emulate that kind of behaviour
* when sorting a List.
*
- * To further facilitate SQL-like sorting, the order of
- * any single Comparator in the list can be reversed.
- *
- * Calling a method that adds new Comparators or
- * changes the ascend/descend sort after compare(Object,
- * Object) has been called will result in an
- * UnsupportedOperationException. However, take care
- * to not alter the underlying List of Comparators
- * or the BitSet that defines the sort order.
- *
* Instances of ComparatorChain are not synchronized.
* The class is not thread-safe at construction time, but
* it is thread-safe to perform multiple comparisons
@@ -55,51 +45,19 @@ import java.util.List;
*/
public class ComparatorChain implements Comparator, Serializable {
-/** Serialization version from Collections 2.0. */
-private static final long serialVersionUID = -721644942746081630L;
-
/** The list of comparators in the chain. */
protected List> comparatorChain = null;
-/** Order - false (clear) = ascend; true (set) = descend. */
-protected BitSet orderingBits = null;
- /** Whether the chain has been "locked". */
-protected boolean isLocked = false;
//---
/**
- * Construct a ComparatorChain with no Comparators.
- * You must add at least one Comparator before calling
- * the compare(Object,Object) method, or an
- * UnsupportedOperationException is thrown
- */
-public ComparatorChain() {
-this(new ArrayList>(), new BitSet());
-}
-
-/**
* Construct a ComparatorChain with a single Comparator,
* sorting in the forward order
*
* @param comparator First comparator in the Comparator chain
*/
-public ComparatorChain(Comparator comparator) {
-this(comparator, false);
-}
-
-/**
- * Construct a Comparator chain with a single Comparator,
- * sorting in the given order
- *
- * @param comparator First Comparator in the ComparatorChain
- * @param reversefalse = forward sort; true = reverse sort
- */
-public ComparatorChain(Comparator comparator, boolean reverse) {
-comparatorChain = new ArrayList>(1);
-comparatorChain.add(comparator);
-orderingBits = new BitSet(1);
-if (reverse == true) {
-orderingBits.set(0);
-}
+public ComparatorChain(Comparator... comparators) {
+this.comparatorChain = new ArrayList>();
+Collections.addAll(this.comparatorChain, comparators);
}
/**
@@ -111,111 +69,12 @@ public class ComparatorChain implemen
* @see #ComparatorChain(List,BitSet)
*/
public ComparatorChain(List> list) {
-this(list, new BitSet(list.size()));
-}
-
-/**
- * Construct a ComparatorChain from the Comparators in the
- * given List. The sort order of each column will be
- * drawn from the given BitSet. When determining the sort
- * order for Comparator at index i in the List,
- * the ComparatorChain will call BitSet.get(i).
- * If that method returns false, the forward
- * sort order is used; a return value of true
- * indicates reverse sort order.
- *
- * @param list List of Comparators. NOTE: This constructor does not
perform a
- * defensive copy of the list
svn commit: r1167669 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
Author: bayard
Date: Sun Sep 11 05:06:14 2011
New Revision: 1167669
URL: http://svn.apache.org/viewvc?rev=1167669&view=rev
Log:
Adding test for equals
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java?rev=1167669&r1=1167668&r2=1167669&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
Sun Sep 11 05:06:14 2011
@@ -50,4 +50,10 @@ public class ComparableComparatorTest {
cc.compare(new
File("dir/file"), new File("dir/file2")) );
}
+public void testEquals() {
+assertEquals( "Same instance wasn't equal",
ComparableComparator.INSTANCE, ComparableComparator.INSTANCE);
+assertEquals( "Different instance wasn't equal",
ComparableComparator.INSTANCE, new ComparableComparator());
+assertFalse( "Null was equal",
ComparableComparator.INSTANCE.equals(null) );
+}
+
}
svn commit: r1163906 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Author: bayard
Date: Thu Sep 1 05:17:32 2011
New Revision: 1163906
URL: http://svn.apache.org/viewvc?rev=1163906&view=rev
Log:
Adding a System.err when a security manager stops JDK 1.5 from being able to
access the Sun Normalizer class. LANG-744
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1163906&r1=1163905&r2=1163906&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Thu Sep 1 05:17:32 2011
@@ -744,7 +744,10 @@ public class StringUtils {
} catch (NoSuchMethodException e) {
sunAvailable = false;
} catch (java.security.AccessControlException e) {
-// LANG-744 - thrown in Google App Engine
+// LANG-744 - thrown when under a SecurityManager
+// we are not allowed to access this class
+System.err.println("Caught a AccessControlException loading
sun.text.Normalizer. " +
+ "Adjust your security manager if you want to
use the stripAccents method. ");
sunAvailable = false;
}
}
svn commit: r1163904 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Thu Sep 1 05:10:35 2011 New Revision: 1163904 URL: http://svn.apache.org/viewvc?rev=1163904&view=rev Log: Fixing the OSGi SymbolicName by updating the commons.componentid. Issue identified by Brandon Harper in LANG-749 Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1163904&r1=1163903&r2=1163904&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Thu Sep 1 05:10:35 2011 @@ -462,7 +462,7 @@ UTF-8 1.5 1.5 -lang +lang3 3.0.1 (Java 5.0+) LANG
svn commit: r1163488 - /commons/proper/ognl/trunk/pom.xml
Author: bayard Date: Wed Aug 31 05:26:14 2011 New Revision: 1163488 URL: http://svn.apache.org/viewvc?rev=1163488&view=rev Log: Updating urls from incubator to commons Modified: commons/proper/ognl/trunk/pom.xml Modified: commons/proper/ognl/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/pom.xml?rev=1163488&r1=1163487&r2=1163488&view=diff == --- commons/proper/ognl/trunk/pom.xml (original) +++ commons/proper/ognl/trunk/pom.xml Wed Aug 31 05:26:14 2011 @@ -33,7 +33,7 @@ limitations under the License. Apache Commons OGNL - Object Graph Navigation Library The Apache Commons OGNL library is a Java development framework for Object-Graph Navigation Language, plus other extras such as list projection and selection and lambda expressions. - http://incubator.apache.org/ognl/ + http://commons.apache.org/ognl/ 1997 The Apache Software Foundation @@ -146,9 +146,9 @@ limitations under the License. - scm:svn:http://svn.apache.org/repos/asf/incubator/ognl/trunk/ - scm:svn:https://svn.apache.org/repos/asf/incubator/ognl/trunk/ -http://svn.apache.org/viewvc/incubator/ognl/trunk/ + scm:svn:http://svn.apache.org/repos/asf/commons/proper/ognl/trunk/ + scm:svn:https://svn.apache.org/repos/asf/commons/proper/ognl/trunk/ +http://svn.apache.org/viewvc/commons/proper/ognl/trunk/ jira @@ -161,7 +161,7 @@ limitations under the License. website - scp://people.apache.org/www/incubator.apache.org/ognl/ + scp://people.apache.org/www/commons.apache.org/ognl/
svn commit: r1163483 - in /commons: ognl/ proper/ognl/
Author: bayard Date: Wed Aug 31 05:18:59 2011 New Revision: 1163483 URL: http://svn.apache.org/viewvc?rev=1163483&view=rev Log: Fixing location after mismoving Added: commons/proper/ognl/ - copied from r1163482, commons/ognl/ Modified: commons/ognl/
svn commit: r1163481 - /commons/trunks-proper/
Author: bayard Date: Wed Aug 31 05:14:07 2011 New Revision: 1163481 URL: http://svn.apache.org/viewvc?rev=1163481&view=rev Log: Moving OGNL to Commons Modified: commons/trunks-proper/ (props changed) Propchange: commons/trunks-proper/ -- --- svn:externals (original) +++ svn:externals Wed Aug 31 05:14:07 2011 @@ -36,6 +36,7 @@ logging https://svn.apache.org/repos/asf math https://svn.apache.org/repos/asf/commons/proper/math/trunk modeler https://svn.apache.org/repos/asf/commons/proper/modeler/trunk net https://svn.apache.org/repos/asf/commons/proper/net/trunk +ognl https://svn.apache.org/repos/asf/commons/proper/ognl/trunk pool https://svn.apache.org/repos/asf/commons/proper/pool/trunk primitives https://svn.apache.org/repos/asf/commons/proper/primitives/trunk proxy https://svn.apache.org/repos/asf/commons/proper/proxy/trunk
svn commit: r1163480 - /incubator/ognl/
Author: bayard Date: Wed Aug 31 05:13:24 2011 New Revision: 1163480 URL: http://svn.apache.org/viewvc?rev=1163480&view=rev Log: Moving OGNL to Commons Modified: incubator/ognl/
svn commit: r1163480 - /commons/ognl/
Author: bayard Date: Wed Aug 31 05:13:24 2011 New Revision: 1163480 URL: http://svn.apache.org/viewvc?rev=1163480&view=rev Log: Moving OGNL to Commons Added: commons/ognl/ - copied from r1163479, incubator/ognl/
svn commit: r1162021 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Author: bayard
Date: Fri Aug 26 08:22:00 2011
New Revision: 1162021
URL: http://svn.apache.org/viewvc?rev=1162021&view=rev
Log:
Removing most of the ComparatorUtils code. Need to figure out how to get rid of
the last attribute.
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java?rev=1162021&r1=1162020&r2=1162021&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Fri Aug 26 08:22:00 2011
@@ -16,17 +16,11 @@
*/
package org.apache.commons.lang3.compare;
-import java.util.Collection;
import java.util.Comparator;
/**
* Provides convenient static utility methods for Comparator
* objects.
- *
- * Most of the functionality in this class can also be found in the
- * comparators package. This class merely provides a
- * convenient central place if you have use for more than one class
- * in the comparators subpackage.
*
* @since Commons Collections 2.1
* @version $Revision$ $Date$
@@ -42,160 +36,9 @@ public class ComparatorUtils {
/**
* Comparator for natural sort order.
*
- * @see ComparableComparator#getInstance
+ * @see ComparableComparator#INSTANCE
*/
@SuppressWarnings("unchecked")
public static final Comparator NATURAL_COMPARATOR =
ComparableComparator.comparableComparator();
-/**
- * Gets a comparator that uses the natural order of the objects.
- *
- * @return a comparator which uses natural order
- */
-@SuppressWarnings("unchecked")
-public static > Comparator
naturalComparator() {
-return NATURAL_COMPARATOR;
-}
-
-/**
- * Gets a comparator that compares using two {@link Comparator}s.
- *
- * The second comparator is used if the first comparator returns equal.
- *
- * @param comparator1 the first comparator to use, not null
- * @param comparator2 the first comparator to use, not null
- * @return a {@link ComparatorChain} formed from the two comparators
- * @throws NullPointerException if either comparator is null
- * @see ComparatorChain
- */
-@SuppressWarnings("unchecked")
-public static > Comparator
chainedComparator(Comparator comparator1, Comparator comparator2) {
-return chainedComparator(new Comparator[] {comparator1, comparator2});
-}
-
-/**
- * Gets a comparator that compares using an array of {@link Comparator}s,
applied
- * in sequence until one returns not equal or the array is exhausted.
- *
- * @param comparators the comparators to use, not null or empty or
containing nulls
- * @return a {@link ComparatorChain} formed from the input comparators
- * @throws NullPointerException if comparators array is null or contains a
null
- * @see ComparatorChain
- */
-public static > Comparator
chainedComparator(Comparator[] comparators) {
-ComparatorChain chain = new ComparatorChain();
-for (int i = 0; i < comparators.length; i++) {
-if (comparators[i] == null) {
-throw new NullPointerException("Comparator cannot be null");
-}
-chain.addComparator(comparators[i]);
-}
-return chain;
-}
-
-/**
- * Gets a comparator that compares using a collection of {@link
Comparator}s,
- * applied in (default iterator) sequence until one returns not equal or
the
- * collection is exhausted.
- *
- * @param comparators the comparators to use, not null or empty or
containing nulls
- * @return a {@link ComparatorChain} formed from the input comparators
- * @throws NullPointerException if comparators collection is null or
contains a null
- * @throws ClassCastException if the comparators collection contains the
wrong object type
- * @see ComparatorChain
- */
-@SuppressWarnings("unchecked")
-public static > Comparator
chainedComparator(Collection> comparators) {
-return chainedComparator(
-(Comparator[]) comparators.toArray(new
Comparator[comparators.size()])
-);
-}
-
-/**
- * Gets a comparator that reverses the order of the given comparator.
- *
- * @param comparator the comparator to reverse
- * @return a comparator that reverses the order of the input comparator
- * @see ReverseComparator
- */
-public static Comparator reversedComparator(Comparator
comparator) {
-return
svn commit: r1162020 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparableComparator.java
Author: bayard
Date: Fri Aug 26 08:19:53 2011
New Revision: 1162020
URL: http://svn.apache.org/viewvc?rev=1162020&view=rev
Log:
Adding javadoc for the type
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparableComparator.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparableComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparableComparator.java?rev=1162020&r1=1162019&r2=1162020&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparableComparator.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparableComparator.java
Fri Aug 26 08:19:53 2011
@@ -57,6 +57,7 @@ public class ComparableComparator the type of the enumeration
* @return the singleton ComparableComparator
*/
@SuppressWarnings("unchecked")
svn commit: r1161997 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Author: bayard
Date: Fri Aug 26 05:19:00 2011
New Revision: 1161997
URL: http://svn.apache.org/viewvc?rev=1161997&view=rev
Log:
Deprecating chomp(String, String) per Verneri Åberg's report in LANG-748
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1161997&r1=1161996&r2=1161997&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Fri Aug 26 05:19:00 2011
@@ -4381,15 +4381,11 @@ public class StringUtils {
* @param str the String to chomp from, may be null
* @param separator separator String, may be null
* @return String without trailing separator, {@code null} if null String
input
+ * @deprecated This feature will be removed in Lang 4.0
*/
+@Deprecated
public static String chomp(String str, String separator) {
-if (isEmpty(str) || separator == null) {
-return str;
-}
-if (str.endsWith(separator)) {
-return str.substring(0, str.length() - separator.length());
-}
-return str;
+return removeEnd(str,separator);
}
// Chopping
svn commit: r1161605 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Author: bayard
Date: Thu Aug 25 15:27:39 2011
New Revision: 1161605
URL: http://svn.apache.org/viewvc?rev=1161605&view=rev
Log:
Rolling back r1161378. NullComparator and ReverseComparator need the
NATURAL_COMPARATOR field and the ComparableComparator.INSTANCE field is not a
straight replacement
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
(with props)
Added:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java?rev=1161605&view=auto
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
(added)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Thu Aug 25 15:27:39 2011
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.compare;
+
+import java.util.Collection;
+import java.util.Comparator;
+
+/**
+ * Provides convenient static utility methods for Comparator
+ * objects.
+ *
+ * Most of the functionality in this class can also be found in the
+ * comparators package. This class merely provides a
+ * convenient central place if you have use for more than one class
+ * in the comparators subpackage.
+ *
+ * @since Commons Collections 2.1
+ * @version $Revision$ $Date$
+ */
+public class ComparatorUtils {
+
+/**
+ * ComparatorUtils should not normally be instantiated.
+ */
+public ComparatorUtils() {
+}
+
+/**
+ * Comparator for natural sort order.
+ *
+ * @see ComparableComparator#getInstance
+ */
+@SuppressWarnings("unchecked")
+public static final Comparator NATURAL_COMPARATOR =
ComparableComparator.comparableComparator();
+
+/**
+ * Gets a comparator that uses the natural order of the objects.
+ *
+ * @return a comparator which uses natural order
+ */
+@SuppressWarnings("unchecked")
+public static > Comparator
naturalComparator() {
+return NATURAL_COMPARATOR;
+}
+
+/**
+ * Gets a comparator that compares using two {@link Comparator}s.
+ *
+ * The second comparator is used if the first comparator returns equal.
+ *
+ * @param comparator1 the first comparator to use, not null
+ * @param comparator2 the first comparator to use, not null
+ * @return a {@link ComparatorChain} formed from the two comparators
+ * @throws NullPointerException if either comparator is null
+ * @see ComparatorChain
+ */
+@SuppressWarnings("unchecked")
+public static > Comparator
chainedComparator(Comparator comparator1, Comparator comparator2) {
+return chainedComparator(new Comparator[] {comparator1, comparator2});
+}
+
+/**
+ * Gets a comparator that compares using an array of {@link Comparator}s,
applied
+ * in sequence until one returns not equal or the array is exhausted.
+ *
+ * @param comparators the comparators to use, not null or empty or
containing nulls
+ * @return a {@link ComparatorChain} formed from the input comparators
+ * @throws NullPointerException if comparators array is null or contains a
null
+ * @see ComparatorChain
+ */
+public static > Comparator
chainedComparator(Comparator[] comparators) {
+ComparatorChain chain = new ComparatorChain();
+for (int i = 0; i < comparators.length; i++) {
+if (comparators[i] == null) {
+throw new NullPointerException("Comparator cannot be null");
+}
+chain.addComparator(comparators[i]);
+}
+return chain;
+}
+
+/**
+ * Gets a comparator that compares using a collection of {@link
Comparator}s,
+ * applied in (default iterator) sequence until one returns not equal or
the
+ * collection is exhausted.
+ *
+ * @param comparators the comparators to use, not null or empty or
svn commit: r1161378 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Author: bayard Date: Thu Aug 25 04:29:29 2011 New Revision: 1161378 URL: http://svn.apache.org/viewvc?rev=1161378&view=rev Log: Removing ComparatorUtils. I don't think min/max(Obj,Obj,Comparator) are the most useful methods, and I'm not sure we need the static factory methods to instantiate the comparators. Removed: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
svn commit: r1160581 - /commons/proper/lang/trunk/src/site/changes/changes.xml
Author: bayard Date: Tue Aug 23 08:23:12 2011 New Revision: 1160581 URL: http://svn.apache.org/viewvc?rev=1160581&view=rev Log: Adding current 3.0.2 items Modified: commons/proper/lang/trunk/src/site/changes/changes.xml Modified: commons/proper/lang/trunk/src/site/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/changes/changes.xml?rev=1160581&r1=1160580&r2=1160581&view=diff == --- commons/proper/lang/trunk/src/site/changes/changes.xml (original) +++ commons/proper/lang/trunk/src/site/changes/changes.xml Tue Aug 23 08:23:12 2011 @@ -21,6 +21,14 @@ + +CharUtils static final array CHAR_STRING is not needed to compute CHAR_STRING_ARRAY +StringUtils throws java.security.AccessControlException on Google App Engine +SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix system +Document that the Mutable numbers don't work as expected with String.format +Ant build has wrong component.name + + SerializationUtils.clone: Fallback to context classloader if class not found in current classloader. ToStringBuilderTest.testReflectionHierarchyArrayList fails with IBM JDK 6.
svn commit: r1160571 - in /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable: MutableBoolean.java MutableByte.java MutableDouble.java MutableFloat.java MutableInt.java MutableLo
Author: bayard Date: Tue Aug 23 07:36:08 2011 New Revision: 1160571 URL: http://svn.apache.org/viewvc?rev=1160571&view=rev Log: Adding documentation that the Mutable numbers don't work as might be expected with String.format. LANG-698 Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java?rev=1160571&r1=1160570&r2=1160571&view=diff == --- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java (original) +++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableBoolean.java Tue Aug 23 07:36:08 2011 @@ -21,6 +21,8 @@ import java.io.Serializable; /** * A mutable boolean wrapper. + * + * Note that as MutableBoolean does not extend Boolean, it is not treated by String.format as a Boolean parameter. * * @see Boolean * @since 2.2 Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java?rev=1160571&r1=1160570&r2=1160571&view=diff == --- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java (original) +++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java Tue Aug 23 07:36:08 2011 @@ -18,6 +18,8 @@ package org.apache.commons.lang3.mutable /** * A mutable byte wrapper. + * + * Note that as MutableByte does not extend Byte, it is not treated by String.format as a Byte parameter. * * @see Byte * @since 2.1 Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java?rev=1160571&r1=1160570&r2=1160571&view=diff == --- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java (original) +++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java Tue Aug 23 07:36:08 2011 @@ -18,6 +18,8 @@ package org.apache.commons.lang3.mutable /** * A mutable double wrapper. + * + * Note that as MutableDouble does not extend Double, it is not treated by String.format as a Double parameter. * * @see Double * @since 2.1 Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java?rev=1160571&r1=1160570&r2=1160571&view=diff == --- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java (original) +++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java Tue Aug 23 07:36:08 2011 @@ -18,6 +18,8 @@ package org.apache.commons.lang3.mutable /** * A mutable float wrapper. + * + * Note that as MutableFloat does not extend Float, it is not treated by String.format as a Float parameter. * * @see Float * @since 2.1 Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java?rev=1160571&r1=1160570&r2=1160571&view=diff == --- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java (original) +++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java Tue Aug 23 07:36:08 2011 @@ -18,6 +18,8 @@ package org.apache.commons.lang3.mutable /** * A mutable int wrapper. + * + *
svn commit: r1160568 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Author: bayard
Date: Tue Aug 23 07:05:46 2011
New Revision: 1160568
URL: http://svn.apache.org/viewvc?rev=1160568&view=rev
Log:
Adding an exception to catch AccessControlExceptions in Google App Engine as
reported by Clément Denis in LANG-744
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java?rev=1160568&r1=1160567&r2=1160568&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils.java
Tue Aug 23 07:05:46 2011
@@ -743,6 +743,9 @@ public class StringUtils {
sunAvailable = false;
} catch (NoSuchMethodException e) {
sunAvailable = false;
+} catch (java.security.AccessControlException e) {
+// LANG-744 - thrown in Google App Engine
+sunAvailable = false;
}
}
svn commit: r1160564 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
Author: bayard
Date: Tue Aug 23 06:56:42 2011
New Revision: 1160564
URL: http://svn.apache.org/viewvc?rev=1160564&view=rev
Log:
Adding FreeBSD, NetBSD and OpenBSD per Oliver's suggestion in LANG-695
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java?rev=1160564&r1=1160563&r2=1160564&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SystemUtils.java
Tue Aug 23 06:56:42 2011
@@ -1003,6 +1003,42 @@ public class SystemUtils {
/**
*
+ * Is {@code true} if this is FreeBSD.
+ *
+ *
+ * The field will return {@code false} if {@code OS_NAME} is {@code null}.
+ *
+ *
+ * @since 3.0.2
+ */
+public static final boolean IS_OS_FREE_BSD = getOSMatchesName("FreeBSD");
+
+/**
+ *
+ * Is {@code true} if this is OpenBSD.
+ *
+ *
+ * The field will return {@code false} if {@code OS_NAME} is {@code null}.
+ *
+ *
+ * @since 3.0.2
+ */
+public static final boolean IS_OS_OPEN_BSD = getOSMatchesName("OpenBSD");
+
+/**
+ *
+ * Is {@code true} if this is NetBSD.
+ *
+ *
+ * The field will return {@code false} if {@code OS_NAME} is {@code null}.
+ *
+ *
+ * @since 3.0.2
+ */
+public static final boolean IS_OS_NET_BSD = getOSMatchesName("NetBSD");
+
+/**
+ *
* Is {@code true} if this is OS/2.
*
*
@@ -1048,7 +1084,7 @@ public class SystemUtils {
* @since 2.1
*/
public static final boolean IS_OS_UNIX = IS_OS_AIX || IS_OS_HP_UX ||
IS_OS_IRIX || IS_OS_LINUX || IS_OS_MAC_OSX
-|| IS_OS_SOLARIS || IS_OS_SUN_OS;
+|| IS_OS_SOLARIS || IS_OS_SUN_OS || IS_OS_FREE_BSD ||
IS_OS_OPEN_BSD || IS_OS_NET_BSD;
/**
*
svn commit: r1160015 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
Author: bayard
Date: Sun Aug 21 17:26:36 2011
New Revision: 1160015
URL: http://svn.apache.org/viewvc?rev=1160015&view=rev
Log:
Filling out ReverseComparator testing
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java?rev=1160015&r1=1160014&r2=1160015&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
Sun Aug 21 17:26:36 2011
@@ -49,4 +49,39 @@ public class ReverseComparatorTest {
assertTrue("Comparison wasn't reversed", rc.compare( "aardvark", "baa"
) > 0 );
}
+@Test
+public void testTwoCallsCancel() {
+ReverseComparator rc = new ReverseComparator(new ReverseComparator());
+
+// back to front tests
+assertTrue("Reversal wasn't cancelled out", rc.compare( 1, 2 ) < 0 );
+assertTrue("Reversal wasn't cancelled out", rc.compare( 2, 1 ) > 0 );
+assertTrue("Reversal wasn't cancelled out", rc.compare( "aardvark",
"baa" ) < 0 );
+assertTrue("Reversal wasn't cancelled out", rc.compare( "baa",
"aardvark" ) > 0 );
+}
+
+@Test
+public void testEquality() {
+ReverseComparator rc1 = new ReverseComparator();
+ReverseComparator rc2 = new ReverseComparator(rc1);
+ReverseComparator rc3 = new ReverseComparator(rc1);
+
+// test same instance
+assertTrue("Same instance wasn't equal", rc1.equals(rc1));
+assertEquals("Equal instance has different hash code", rc1.hashCode(),
rc1.hashCode());
+
+// test null not equal
+assertFalse("Null was equal", rc1.equals(null));
+
+// test diff subcomparator not equal
+assertFalse("Was equal despite different nested comparators",
rc1.equals(rc2));
+
+// test same subcomparator equal
+assertTrue("Wasn't equal despite same nested comparator",
rc2.equals(rc3));
+assertEquals("Same subcomparator had different hash code",
rc2.hashCode(), rc3.hashCode());
+
+// test different type not equal
+assertFalse("Was equal despite not being same class",
rc1.equals(this));
+}
+
}
svn commit: r1159858 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Author: bayard Date: Sat Aug 20 07:55:22 2011 New Revision: 1159858 URL: http://svn.apache.org/viewvc?rev=1159858&view=rev Log: Fixing javadoc Modified: commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java Modified: commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java?rev=1159858&r1=1159857&r2=1159858&view=diff == --- commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java (original) +++ commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java Sat Aug 20 07:55:22 2011 @@ -150,7 +150,7 @@ public class AsyncQueryRunner extends Ab } /** - * Creates a continuation for a batch call, and returns it in a RunnableFuture. + * Creates a continuation for a batch call, and returns it in a Callable. * @param conn The connection to use for the batch call. * @param closeConn True if the connection should be closed, false otherwise. * @param sql The SQL statement to execute. @@ -243,7 +243,7 @@ public class AsyncQueryRunner extends Ab } /** - * Creates a continuation for a query call, and returns it in a RunnableFuture. + * Creates a continuation for a query call, and returns it in a Callable. * @param conn The connection to use for the query call. * @param closeConn True if the connection should be closed, false otherwise. * @param sql The SQL statement to execute. @@ -389,7 +389,7 @@ public class AsyncQueryRunner extends Ab } /** - * Creates a continuation for an update call, and returns it in a RunnableFuture. + * Creates a continuation for an update call, and returns it in a Callable. * @param conn The connection to use for the update call. * @param closeConn True if the connection should be closed, false otherwise. * @param sql The SQL statement to execute.
svn commit: r1159857 - /commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Author: bayard Date: Sat Aug 20 07:55:12 2011 New Revision: 1159857 URL: http://svn.apache.org/viewvc?rev=1159857&view=rev Log: Removing unused imports Modified: commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java Modified: commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java?rev=1159857&r1=1159856&r2=1159857&view=diff == --- commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java (original) +++ commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java Sat Aug 20 07:55:12 2011 @@ -29,8 +29,6 @@ import java.sql.ParameterMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.RunnableFuture; import javax.sql.DataSource;
svn commit: r1159516 - /commons/proper/dbutils/trunk/pom.xml
Author: bayard Date: Fri Aug 19 06:30:47 2011 New Revision: 1159516 URL: http://svn.apache.org/viewvc?rev=1159516&view=rev Log: Rolling back to JDK 1.5 per DBUTILS-78 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1159516&r1=1159515&r2=1159516&view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Fri Aug 19 06:30:47 2011 @@ -191,8 +191,8 @@ -1.6 -1.6 +1.5 +1.5 dbutils 1.3 RC4 @@ -217,8 +217,8 @@ org.apache.maven.plugins maven-compiler-plugin -1.6 -1.6 +1.5 +1.5 @@ -280,7 +280,7 @@ maven-pmd-plugin 2.3 - 1.6 + 1.5
svn commit: r1159514 - /commons/proper/dbutils/trunk/src/site/xdoc/examples.xml
Author: bayard
Date: Fri Aug 19 06:22:22 2011
New Revision: 1159514
URL: http://svn.apache.org/viewvc?rev=1159514&view=rev
Log:
Splitting the example per DBUTILS-78
Modified:
commons/proper/dbutils/trunk/src/site/xdoc/examples.xml
Modified: commons/proper/dbutils/trunk/src/site/xdoc/examples.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/site/xdoc/examples.xml?rev=1159514&r1=1159513&r2=1159514&view=diff
==
--- commons/proper/dbutils/trunk/src/site/xdoc/examples.xml (original)
+++ commons/proper/dbutils/trunk/src/site/xdoc/examples.xml Fri Aug 19 06:22:22
2011
@@ -146,14 +146,18 @@ try
// Create a Callable for the update call
Callable callable = asyncRun.update( "UPDATE Person SET height=?
WHERE name=?",
2.05, "John Doe" );
-
// Submit the Callable to the executor
executor.submit( callable );
+} catch(SQLException sqle) {
+// Handle it
+}
- // Later (or in another thread) get the result
+// Sometime later (or in another thread)
+try
+{
+ // Get the result of the update
Integer updates = executor.take().get();
-}
-catch(SQLException sqle) {
+} catch(InterruptedException ie) {
// Handle it
}
]]>
svn commit: r1159513 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Author: bayard
Date: Fri Aug 19 06:20:15 2011
New Revision: 1159513
URL: http://svn.apache.org/viewvc?rev=1159513&view=rev
Log:
Removing unnecessary connection closing per DBUTILS-78
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java?rev=1159513&r1=1159512&r2=1159513&view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Fri Aug 19 06:20:15 2011
@@ -161,8 +161,6 @@ public class AsyncQueryRunner extends Ab
*/
private Callable batch(Connection conn, boolean closeConn, String
sql, Object[][] params) throws SQLException {
if(conn == null) {
- if(closeConn)
- close(conn);
throw new SQLException("Null connection");
}
@@ -259,8 +257,6 @@ public class AsyncQueryRunner extends Ab
Callable ret = null;
if(conn == null) {
- if(closeConn)
- close(conn);
throw new SQLException("Null connection");
}
@@ -407,8 +403,6 @@ public class AsyncQueryRunner extends Ab
Callable ret = null;
if(conn == null) {
- if(closeConn)
- close(conn);
throw new SQLException("Null connection");
}
svn commit: r1159512 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Author: bayard
Date: Fri Aug 19 06:19:56 2011
New Revision: 1159512
URL: http://svn.apache.org/viewvc?rev=1159512&view=rev
Log:
Removing unnecessary connection closing. Switching update with boolean param
method to private per DBUTILS-78
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=1159512&r1=1159511&r2=1159512&view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
Fri Aug 19 06:19:56 2011
@@ -121,8 +121,6 @@ public class QueryRunner extends Abstrac
*/
private int[] batch(Connection conn, boolean closeConn, String sql,
Object[][] params) throws SQLException {
if(conn == null) {
-if(closeConn)
-close(conn);
throw new SQLException("Null connection");
}
@@ -316,8 +314,6 @@ public class QueryRunner extends Abstrac
*/
private T query(Connection conn, boolean closeConn, String sql,
ResultSetHandler rsh, Object... params) throws SQLException {
if(conn == null) {
-if(closeConn)
-close(conn);
throw new SQLException("Null connection");
}
@@ -462,10 +458,8 @@ public class QueryRunner extends Abstrac
* @return The number of rows updated.
* @throws SQLException If there are database or parameter errors.
*/
-public int update(Connection conn, boolean closeConn, String sql,
Object... params) throws SQLException {
+private int update(Connection conn, boolean closeConn, String sql,
Object... params) throws SQLException {
if(conn == null) {
-if(closeConn)
-close(conn);
throw new SQLException("Null connection");
}
svn commit: r1159030 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
Author: bayard
Date: Thu Aug 18 04:36:12 2011
New Revision: 1159030
URL: http://svn.apache.org/viewvc?rev=1159030&view=rev
Log:
Adding a basic ComparableComparator test
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
(with props)
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java?rev=1159030&view=auto
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
(added)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
Thu Aug 18 04:36:12 2011
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.compare;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.util.Comparator;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * Tests the methods in the {@link
org.apache.commons.lang3.compare.ComparableComparator} class.
+ *
+ *
+ * @version $Id: RangeTest.java 1147537 2011-07-17 06:10:37Z mbenson $
+ */
+public class ComparableComparatorTest {
+
+@Before
+public void setUp() {
+}
+
+//---
+@Test
+public void testUse() {
+Comparator cc = new ComparableComparator();
+
+// ensure same as Comparable
+assertEquals( "Not same as Integer.compareTo", new
Integer(5).compareTo(2), cc.compare(5, 2) );
+assertEquals( "Not same as String.compareTo",
"aardvark".compareTo("green"), cc.compare("aardvark", "green") );
+assertEquals( "Not same as File.compareTo", new
File("dir/file").compareTo(new File("dir/file2")),
+cc.compare(new
File("dir/file"), new File("dir/file2")) );
+}
+
+}
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ComparableComparatorTest.java
--
svn:eol-style = native
svn commit: r1159028 - in /commons/proper/lang/trunk: ./ src/main/java/org/apache/commons/lang3/compare/
Author: bayard
Date: Thu Aug 18 04:27:57 2011
New Revision: 1159028
URL: http://svn.apache.org/viewvc?rev=1159028&view=rev
Log:
Dropped @author notes, moved individuals to the pom.xml contributor list
Modified:
commons/proper/lang/trunk/pom.xml
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/FixedOrderComparator.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/NullComparator.java
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ReverseComparator.java
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1159028&r1=1159027&r2=1159028&view=diff
==
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Thu Aug 18 04:27:57 2011
@@ -231,6 +231,9 @@
Norm Deane
+Morgan Delagrange
+
+
Ringo De Smet
@@ -267,6 +270,9 @@
Chris Hyzer
+Paul Jack
+
+
Marc Johnson
@@ -291,6 +297,9 @@
Rafal Krzewski
+David Leppik
+
+
Eli Lindsey
@@ -375,6 +384,9 @@
David M. Sledge
+Michael A. Smith
+
+
Jan Sorensen
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java?rev=1159028&r1=1159027&r2=1159028&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorChain.java
Thu Aug 18 04:27:57 2011
@@ -51,7 +51,6 @@ import java.util.List;
* after all the setup operations are complete.
*
* @since Commons Collections 2.0
- * @author Morgan Delagrange
* @version $Revision$ $Date$
*/
public class ComparatorChain implements Comparator, Serializable {
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java?rev=1159028&r1=1159027&r2=1159028&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/ComparatorUtils.java
Thu Aug 18 04:27:57 2011
@@ -30,9 +30,6 @@ import java.util.Comparator;
*
* @since Commons Collections 2.1
* @version $Revision$ $Date$
- *
- * @author Paul Jack
- * @author Stephen Colebourne
*/
public class ComparatorUtils {
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/FixedOrderComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/FixedOrderComparator.java?rev=1159028&r1=1159027&r2=1159028&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/FixedOrderComparator.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/FixedOrderComparator.java
Thu Aug 18 04:27:57 2011
@@ -42,10 +42,6 @@ import java.util.Map;
*
* @since Commons Collections 3.0
* @version $Revision$ $Date$
- *
- * @author David Leppik
- * @author Stephen Colebourne
- * @author Janek Bogucki
*/
public class FixedOrderComparator implements Comparator {
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/NullComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/NullComparator.java?rev=1159028&r1=1159027&r2=1159028&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/NullComparator.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/compare/NullComparator.java
Thu Aug 18 04:27:57 2011
@@ -25,8 +25,6 @@ import java.util.Comparator;
*
svn commit: r1159026 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java
Author: bayard
Date: Thu Aug 18 04:24:57 2011
New Revision: 1159026
URL: http://svn.apache.org/viewvc?rev=1159026&view=rev
Log:
Adding a basic FixedOrderComparatorTest
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java
(with props)
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java?rev=1159026&view=auto
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java
(added)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java
Thu Aug 18 04:24:57 2011
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.compare;
+
+import static org.junit.Assert.*;
+
+import java.util.Comparator;
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * Tests the methods in the {@link
org.apache.commons.lang3.compare.FixedOrderComparator} class.
+ *
+ *
+ * @version $Id: RangeTest.java 1147537 2011-07-17 06:10:37Z mbenson $
+ */
+public class FixedOrderComparatorTest {
+
+@Before
+public void setUp() {
+}
+
+//---
+@Test
+public void testJavadocExample() {
+String[] planets = {"Mercury", "Venus", "Earth", "Mars"};
+String[] modified = {"Mercury", "Venus", "Earth", "Mars"};
+Comparator distanceFromSun = new FixedOrderComparator(planets);
+Arrays.sort(modified); // Sort to alphabetical
order
+Arrays.sort(modified, distanceFromSun);// Back to original order
+assertArrayEquals("Did not sort to fixed order", planets, modified);
+}
+
+}
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/FixedOrderComparatorTest.java
--
svn:eol-style = native
svn commit: r1159025 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Thu Aug 18 04:24:44 2011 New Revision: 1159025 URL: http://svn.apache.org/viewvc?rev=1159025&view=rev Log: Removing excludes Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1159025&r1=1159024&r2=1159025&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Thu Aug 18 04:24:44 2011 @@ -467,10 +467,6 @@ **/*Test.java - -**/BulkTest.java -**/AbstractTestObject.java -
svn commit: r1159024 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
Author: bayard
Date: Thu Aug 18 04:20:40 2011
New Revision: 1159024
URL: http://svn.apache.org/viewvc?rev=1159024&view=rev
Log:
Adding a basic ReverseComparatorTest
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
(with props)
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java?rev=1159024&view=auto
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
(added)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
Thu Aug 18 04:20:40 2011
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.compare;
+
+import static org.junit.Assert.*;
+
+import java.util.Comparator;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * Tests the methods in the {@link
org.apache.commons.lang3.compare.ReverseComparator} class.
+ *
+ *
+ * @version $Id: RangeTest.java 1147537 2011-07-17 06:10:37Z mbenson $
+ */
+public class ReverseComparatorTest {
+
+@Before
+public void setUp() {
+}
+
+//---
+@Test
+public void testUse() {
+ReverseComparator rc = new ReverseComparator();
+
+// back to front tests
+assertTrue("Comparison wasn't reversed", rc.compare( 2, 1 ) < 0 );
+assertTrue("Comparison wasn't reversed", rc.compare( 1, 2 ) > 0 );
+assertTrue("Comparison wasn't reversed", rc.compare( "baa", "aardvark"
) < 0 );
+assertTrue("Comparison wasn't reversed", rc.compare( "aardvark", "baa"
) > 0 );
+}
+
+}
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/ReverseComparatorTest.java
--
svn:eol-style = native
svn commit: r1159023 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java
Author: bayard
Date: Thu Aug 18 04:13:48 2011
New Revision: 1159023
URL: http://svn.apache.org/viewvc?rev=1159023&view=rev
Log:
Adding a basic NullComparatorTest
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java
(with props)
Added:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java?rev=1159023&view=auto
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java
(added)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java
Thu Aug 18 04:13:48 2011
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.lang3.compare;
+
+import static org.junit.Assert.*;
+
+import java.util.Comparator;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * Tests the methods in the {@link
org.apache.commons.lang3.compare.NullComparator} class.
+ *
+ *
+ * @version $Id: RangeTest.java 1147537 2011-07-17 06:10:37Z mbenson $
+ */
+public class NullComparatorTest {
+
+@Before
+public void setUp() {
+}
+
+//---
+@Test
+public void testNullHigh() {
+Comparator c = new NullComparator(true);
+assertEquals("Null was not treated as high", -1, c.compare(new
Object(), null) );
+assertEquals("Null was not treated as high", 1, c.compare(null, new
Object()) );
+}
+
+@Test
+public void testNullLow() {
+Comparator c = new NullComparator(false);
+assertEquals("Null was not treated as low", 1, c.compare(new Object(),
null) );
+assertEquals("Null was not treated as low", -1, c.compare(null, new
Object()) );
+}
+
+}
Propchange:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/NullComparatorTest.java
--
svn:eol-style = native
svn commit: r1159018 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/
Author: bayard Date: Thu Aug 18 03:59:16 2011 New Revision: 1159018 URL: http://svn.apache.org/viewvc?rev=1159018&view=rev Log: Removing collections tests - far too complex a system for the comparators' needs. Will rewrite as standalone test classes Removed: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/BulkTest.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java
svn commit: r1158507 - in /commons/proper: bcel/trunk/doap_bcel.rdf bsf/trunk/doap_bsf.rdf jcs/trunk/doap_jcs.rdf
Author: bayard Date: Wed Aug 17 04:32:04 2011 New Revision: 1158507 URL: http://svn.apache.org/viewvc?rev=1158507&view=rev Log: Updating to the Commons PMC Modified: commons/proper/bcel/trunk/doap_bcel.rdf commons/proper/bsf/trunk/doap_bsf.rdf commons/proper/jcs/trunk/doap_jcs.rdf Modified: commons/proper/bcel/trunk/doap_bcel.rdf URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/doap_bcel.rdf?rev=1158507&r1=1158506&r2=1158507&view=diff == --- commons/proper/bcel/trunk/doap_bcel.rdf (original) +++ commons/proper/bcel/trunk/doap_bcel.rdf Wed Aug 17 04:32:04 2011 @@ -28,7 +28,7 @@ http://usefulinc.com/doap/licenses/asl20"/> http://issues.apache.org/bugzilla/buglist.cgi?product=BCEL"/> http://jakarta.apache.org/site/downloads/downloads_bcel.cgi/"/> -http://svn.apache.org/repos/asf/jakarta/site/jakarta.rdf"/> +http://commons.apache.org/"/> Bytecode Engineering Library The Byte Code Engineering Library is intended to give users a convenient possibility to analyze, create, and manipulate (binary) Java class files (those ending with .class). Classes are represented by objects which contain all the symbolic information of the given class: methods, fields and byte code instructions, in particular. Modified: commons/proper/bsf/trunk/doap_bsf.rdf URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/doap_bsf.rdf?rev=1158507&r1=1158506&r2=1158507&view=diff == --- commons/proper/bsf/trunk/doap_bsf.rdf (original) +++ commons/proper/bsf/trunk/doap_bsf.rdf Wed Aug 17 04:32:04 2011 @@ -27,7 +27,7 @@ http://usefulinc.com/doap/licenses/asl20"; /> Apache Jakarta BSF http://jakarta.apache.org/bsf/"; /> -http://svn.apache.org/repos/asf/jakarta/site/jakarta.rdf"; /> +http://commons.apache.org/"/> Framework that provides scripting language support within Java applications Bean Scripting Framework (BSF) is a set of Java classes which provides scripting language support within Java applications, and access to Java objects and methods from scripting languages. BSF allows one to write JSPs in languages other than Java while providing access to the Java class library. In addition, BSF permits any Java application to be implemented in part (or dynamically extended) by a language that is embedded within it. This is achieved by providing an API that permits calling scripting language engines from within Java, as well as an object registry that exposes Java objects to these scripting language engines. http://issues.apache.org/bugzilla/buglist.cgi?product=BSF"; /> Modified: commons/proper/jcs/trunk/doap_jcs.rdf URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/doap_jcs.rdf?rev=1158507&r1=1158506&r2=1158507&view=diff == --- commons/proper/jcs/trunk/doap_jcs.rdf (original) +++ commons/proper/jcs/trunk/doap_jcs.rdf Wed Aug 17 04:32:04 2011 @@ -26,7 +26,7 @@ http://usefulinc.com/doap/licenses/asl20"/> http://issues.apache.org/scarab/servlet/scarab/"/> http://jakarta.apache.org/jcs/Downloads.html"/> -http://svn.apache.org/repos/asf/jakarta/site/jakarta.rdf"/> +http://commons.apache.org/"/> Cache Comprehensive Caching System
svn commit: r1158506 - /commons/proper/bsf/trunk/doap_bsf.rdf
Author: bayard Date: Wed Aug 17 04:31:15 2011 New Revision: 1158506 URL: http://svn.apache.org/viewvc?rev=1158506&view=rev Log: Fixing the svn url in doap Modified: commons/proper/bsf/trunk/doap_bsf.rdf Modified: commons/proper/bsf/trunk/doap_bsf.rdf URL: http://svn.apache.org/viewvc/commons/proper/bsf/trunk/doap_bsf.rdf?rev=1158506&r1=1158505&r2=1158506&view=diff == --- commons/proper/bsf/trunk/doap_bsf.rdf (original) +++ commons/proper/bsf/trunk/doap_bsf.rdf Wed Aug 17 04:31:15 2011 @@ -59,8 +59,8 @@ -http://svn.apache.org/repos/asf/jakarta/bsf/trunk/"/> -http://http://svn.apache.org/viewcvs.cgi/jakarta/bsf/"/> +http://svn.apache.org/repos/asf/commons/proper/bsf/trunk/"/> +http://http://svn.apache.org/viewcvs.cgi/commons/proper/bsf/"/>
svn commit: r1158504 - /commons/trunks-proper/
Author: bayard Date: Wed Aug 17 04:25:55 2011 New Revision: 1158504 URL: http://svn.apache.org/viewvc?rev=1158504&view=rev Log: Updating the externals Modified: commons/trunks-proper/ (props changed) Propchange: commons/trunks-proper/ -- --- svn:externals (original) +++ svn:externals Wed Aug 17 04:25:55 2011 @@ -2,6 +2,7 @@ attributes https://svn.apache.org/repos/ bcel https://svn.apache.org/repos/asf/commons/proper/bcel/trunk beanutils https://svn.apache.org/repos/asf/commons/proper/beanutils/trunk betwixt https://svn.apache.org/repos/asf/commons/proper/betwixt/trunk +bsf https://svn.apache.org/repos/asf/commons/proper/bsf/trunk chain https://svn.apache.org/repos/asf/commons/proper/chain/trunk cli https://svn.apache.org/repos/asf/commons/proper/cli/trunk codec https://svn.apache.org/repos/asf/commons/proper/codec/trunk
svn commit: r1158503 - /commons/proper/bsf/
Author: bayard Date: Wed Aug 17 04:24:19 2011 New Revision: 1158503 URL: http://svn.apache.org/viewvc?rev=1158503&view=rev Log: Moving BSF over to Commons Added: commons/proper/bsf/ - copied from r1158502, jakarta/bsf/
svn commit: r1158501 - /commons/proper/lang/trunk/default.properties
Author: bayard
Date: Wed Aug 17 04:11:37 2011
New Revision: 1158501
URL: http://svn.apache.org/viewvc?rev=1158501&view=rev
Log:
Fixing the component-name (aka artifactId in Maven language). LANG-741
Modified:
commons/proper/lang/trunk/default.properties
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1158501&r1=1158500&r2=1158501&view=diff
==
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Wed Aug 17 04:11:37 2011
@@ -30,7 +30,7 @@ commons-io.jar = ${commons-io.home}/comm
junit.fork = true
# The name of this component
-component.name = commons-lang
+component.name = commons-lang3
# The primary package name of this component
component.package = org.apache.commons.lang3
svn commit: r1158110 - /commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Author: bayard
Date: Tue Aug 16 05:51:37 2011
New Revision: 1158110
URL: http://svn.apache.org/viewvc?rev=1158110&view=rev
Log:
Applying William Speirs' patch to move QueryRunnerTest to Mockito (DBUTILS-78)
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java?rev=1158110&r1=1158109&r2=1158110&view=diff
==
---
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
(original)
+++
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Tue Aug 16 05:51:37 2011
@@ -16,203 +16,476 @@
*/
package org.apache.commons.dbutils;
-import java.beans.IndexedPropertyDescriptor;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.sql.Connection;
import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Arrays;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.RunnableFuture;
+
+import javax.sql.DataSource;
-import junit.framework.TestCase;
+import org.apache.commons.dbutils.handlers.ArrayHandler;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
-public class QueryRunnerTest extends TestCase {
+public class QueryRunnerTest {
QueryRunner runner;
-PreparedStatement stmt;
+ ArrayHandler handler;
+
+@Mock DataSource dataSource;
+@Mock Connection conn;
+@Mock PreparedStatement stmt;
+@Mock ParameterMetaData meta;
+@Mock ResultSet results;
+
+@Before
+public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this); // init the mocks
+
+ when(dataSource.getConnection()).thenReturn(conn);
+ when(conn.prepareStatement(any(String.class))).thenReturn(stmt);
+ when(stmt.getParameterMetaData()).thenReturn(meta);
+ when(stmt.getResultSet()).thenReturn(results);
+ when(stmt.executeQuery()).thenReturn(results);
+ when(results.next()).thenReturn(false);
+
+handler = new ArrayHandler();
+runner = new QueryRunner(dataSource);
+}
+
+//
+// Batch test cases
+//
+
+private void callGoodBatch(Connection conn, Object[][] params) throws
Exception {
+ when(meta.getParameterCount()).thenReturn(2);
+ int[] ret = runner.batch(conn, "select * from blah where ? = ?",
params);
+
+ verify(stmt, times(2)).addBatch();
+ verify(stmt, times(1)).executeBatch();
+ verify(stmt, times(1)).close(); // make sure we closed the statement
+ verify(conn, times(0)).close(); // make sure we closed the connection
+}
+
+private void callGoodBatch(Object[][] params) throws Exception {
+ when(meta.getParameterCount()).thenReturn(2);
+ int[] ret = runner.batch("select * from blah where ? = ?", params);
+
+ verify(stmt, times(2)).addBatch();
+ verify(stmt, times(1)).executeBatch();
+ verify(stmt, times(1)).close(); // make sure we closed the statement
+ verify(conn, times(1)).close(); // make sure we closed the connection
+}
+
+@Test
+public void testGoodBatch() throws Exception {
+ String[][] params = new String[][] { { "unit", "unit" }, { "test",
"test" } };
+
+ callGoodBatch(params);
+}
+
+@Test
+public void testGoodBatchPmdTrue() throws Exception {
+ runner = new QueryRunner(dataSource, true);
+ String[][] params = new String[][] { { "unit", "unit" }, { "test",
"test" } };
+
+ callGoodBatch(params);
+}
+
+@Test
+public void testGoodBatchDefaultConstructor() throws Exception {
+ runner = new QueryRunner();
+ String[][] params = new String[][] { { "unit", "unit" }, { "test",
"test" } };
+
+ callGoodBatch(conn, params);
+}
+
+@Test
+public void testNullParamsBatch() throws Exception {
+ String[][] params = new String[][] { { null, "unit" }, { "test"
svn commit: r1158107 - /commons/proper/dbutils/trunk/src/site/xdoc/examples.xml
Author: bayard
Date: Tue Aug 16 05:45:49 2011
New Revision: 1158107
URL: http://svn.apache.org/viewvc?rev=1158107&view=rev
Log:
Adding example explaining how to use AsyncQueryRunner (DBUTILS-78)
Modified:
commons/proper/dbutils/trunk/src/site/xdoc/examples.xml
Modified: commons/proper/dbutils/trunk/src/site/xdoc/examples.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/site/xdoc/examples.xml?rev=1158107&r1=1158106&r2=1158107&view=diff
==
--- commons/proper/dbutils/trunk/src/site/xdoc/examples.xml (original)
+++ commons/proper/dbutils/trunk/src/site/xdoc/examples.xml Tue Aug 16 05:45:49
2011
@@ -128,6 +128,38 @@ catch(SQLException sqle) {
]]>
+
+ For long running calls you can use the AsyncQueryRunner to
execute
+ the calls asynchronously. The AsyncQueryRunner class has the
same
+ methods as the QueryRunner calls; however, the methods return a
+ Callable.
+
+
+
+
+
+
+
svn commit: r1157459 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Sun Aug 14 03:25:18 2011 New Revision: 1157459 URL: http://svn.apache.org/viewvc?rev=1157459&view=rev Log: Incrementing the clirr version Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1157459&r1=1157458&r2=1157459&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Sun Aug 14 03:25:18 2011 @@ -554,7 +554,7 @@ org.apache.commons commons-lang3 - 3.0 + 3.0.1 info
svn commit: r1156966 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Author: bayard
Date: Fri Aug 12 04:51:22 2011
New Revision: 1156966
URL: http://svn.apache.org/viewvc?rev=1156966&view=rev
Log:
Adding @since tag
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java?rev=1156966&r1=1156965&r2=1156966&view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Fri Aug 12 04:51:22 2011
@@ -40,6 +40,7 @@ import javax.sql.DataSource;
* ResultSets. This class is thread safe.
*
* @see ResultSetHandler
+ * @since 1.4
*/
public class AsyncQueryRunner {
svn commit: r1156964 - in /commons/proper/dbutils/trunk: pom.xml src/java/org/apache/commons/dbutils/AsyncQueryRunner.java src/test/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
Author: bayard
Date: Fri Aug 12 04:45:25 2011
New Revision: 1156964
URL: http://svn.apache.org/viewvc?rev=1156964&view=rev
Log:
Adding asynchronous query runner patch from William Speirs. Also moves DbUtils
to Java6 dependent. DBUTILS-78
Added:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
(with props)
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/AsyncQueryRunnerTest.java
(with props)
Modified:
commons/proper/dbutils/trunk/pom.xml
Modified: commons/proper/dbutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1156964&r1=1156963&r2=1156964&view=diff
==
--- commons/proper/dbutils/trunk/pom.xml [utf-8] (original)
+++ commons/proper/dbutils/trunk/pom.xml [utf-8] Fri Aug 12 04:45:25 2011
@@ -173,14 +173,26 @@
junit
junit
- 3.8.2
+ 4.8.2
test
+
+ org.mockito
+ mockito-core
+ 1.8.5
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ 1.1
+ test
+
-1.5
-1.5
+1.6
+1.6
dbutils
1.3
RC4
@@ -205,8 +217,8 @@
org.apache.maven.plugins
maven-compiler-plugin
-1.5
-1.5
+1.6
+1.6
@@ -268,7 +280,7 @@
maven-pmd-plugin
2.3
- 1.5
+ 1.6
Added:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java?rev=1156964&view=auto
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
(added)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/AsyncQueryRunner.java
Fri Aug 12 04:45:25 2011
@@ -0,0 +1,786 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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;
+
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
+
+import javax.sql.DataSource;
+
+/**
+ * Executes SQL queries with pluggable strategies for handling
+ * ResultSets. This class is thread safe.
+ *
+ * @see ResultSetHandler
+ */
+public class AsyncQueryRunner {
+
+/**
+ * Is {@link ParameterMetaData#getParameterType(int)} broken (have we
tried it yet)?
+ */
+private volatile boolean pmdKnownBroken = false;
+
+/**
+ * The DataSource to retrieve connections from.
+ */
+protected final DataSource ds;
+
+/**
+ * Constructor for QueryRunner.
+ */
+public AsyncQueryRunner() {
+this(null, false);
+}
+
+/**
+ * Constructor for QueryRunner, allows workaround for Oracle drivers
+ * @param pmdKnownBroken Oracle drivers don't support {@link
ParameterMetaData#getParameterType(int) };
+ * if pmdKnownBroken is set to true, we won't even try it; if
false, we'll try it,
+ * and if it breaks, we'll remember not to use it again.
+ */
+public AsyncQueryRunner(boolean pmdKnownBroken) {
+this(null, pmdKnownBroken);
+}
+
+/**
+ * Constructor for QueryRunner, allows workaround for Oracle drivers.
Methods that do not take a
+ * Connection parameter will retrieve connections from this
+ * DataSource.
+ *
+ * @param ds The DataSource to retrieve connections from.
+ */
+publ
svn commit: r1156027 - /commons/proper/lang/trunk/src/site/xdoc/index.xml
Author: bayard Date: Wed Aug 10 05:11:15 2011 New Revision: 1156027 URL: http://svn.apache.org/viewvc?rev=1156027&view=rev Log: Formatting the Maven xml block Modified: commons/proper/lang/trunk/src/site/xdoc/index.xml Modified: commons/proper/lang/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/xdoc/index.xml?rev=1156027&r1=1156026&r2=1156027&view=diff == --- commons/proper/lang/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/lang/trunk/src/site/xdoc/index.xml Wed Aug 10 05:11:15 2011 @@ -71,11 +71,11 @@ The sub Alternatively you can pull it from the central Maven repositories: - + <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>3.0.1</version> - +
svn commit: r1156026 - /commons/proper/lang/trunk/src/site/xdoc/index.xml
Author: bayard Date: Wed Aug 10 04:52:59 2011 New Revision: 1156026 URL: http://svn.apache.org/viewvc?rev=1156026&view=rev Log: More updates to the front page Modified: commons/proper/lang/trunk/src/site/xdoc/index.xml Modified: commons/proper/lang/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/site/xdoc/index.xml?rev=1156026&r1=1156025&r2=1156026&view=diff == --- commons/proper/lang/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/lang/trunk/src/site/xdoc/index.xml Wed Aug 10 04:52:59 2011 @@ -50,9 +50,8 @@ together with various current stable release 3.0.1 -The legacy release 2.6 -The previous version 2.5 +The current stable release 3.0.1 [Java 5.0+] +The legacy release 2.6 [Java 1.2+] Older releases - see the Release History page @@ -61,15 +60,26 @@ The sub - + +The latest stable release of Lang is 3.0.1. You may: + +Download http://commons.apache.org/lang/download_lang.cgi";>3.0.1 +Read the 3.0.1 release notes +Examine the 2.x to 3.0 upgrade notes +Compare major versions via the Lang2 to Lang3 Clirr report + + -A latest stable and Java 5.0 dependent version is available: -(http://commons.apache.org/lang/download_lang.cgi";>download 3.0.1) -(3.0.1 release notes) (2.x to 3.0 upgrade notes) -(Lang2 to Lang3 Clirr report). +Alternatively you can pull it from the central Maven repositories: + + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.0.1</version> + + -For information on previous releases, see the Release History and to download previous releases, see the http://archive.apache.org/dist/commons/lang/";>Apache Archive. +For information on previous releases see the Release History, and to download previous releases see the http://archive.apache.org/dist/commons/lang/";>Commons Lang Archive. @@ -82,8 +92,8 @@ Please remember that the lists are share so prefix your email by [lang]. -Issues may be reported via ASF JIRA. -Please read the instructions carefully to submit a useful bug report or enhancement request. +Bug reports and enhancements are also welcomed via the JIRA issue tracker. +Please read the instructions carefully.
