You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/07/11 17:54:13 UTC
[01/34] commons-collections git commit: Release v3.2
Repository: commons-collections
Updated Branches:
refs/heads/COLLECTIONS_3_2_BRANCH [created] a0721ed91
Release v3.2
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/tags/COLLECTIONS_3_2@406443 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/4b641123
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/4b641123
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/4b641123
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 4b6411235e6953ad65b4cb0e16ff6ad09581247d
Parents: a200aef
Author: Stephen Colebourne <sc...@apache.org>
Authored: Sun May 14 21:53:53 2006 +0000
Committer: Stephen Colebourne <sc...@apache.org>
Committed: Sun May 14 21:53:53 2006 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/34] commons-collections git commit: Moving to TLP
Posted by ch...@apache.org.
Moving to TLP
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/tags/COLLECTIONS_3_2@560660 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/8792072a
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/8792072a
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/8792072a
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 8792072a213366605161b2f6e315024711da7eee
Parents: 3d5aeb1
Author: Henri Yandell <ba...@apache.org>
Authored: Sun Jul 29 03:42:34 2007 +0000
Committer: Henri Yandell <ba...@apache.org>
Committed: Sun Jul 29 03:42:34 2007 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[20/34] commons-collections git commit: Minor site changes
Posted by ch...@apache.org.
Minor site changes
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@647160 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/7d97c864
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/7d97c864
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/7d97c864
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 7d97c86498f238cfd0746d5ce778dc2cf6105495
Parents: 23b4e59
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Fri Apr 11 13:29:08 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Fri Apr 11 13:29:08 2008 +0000
----------------------------------------------------------------------
src/site/site.xml | 2 +-
xdocs/history.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/7d97c864/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index c9102e6..a137c53 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,7 @@
<item name="Download" href="http://commons.apache.org/downloads/download_collections.cgi"/>
<item name="Users guide" href="/userguide.html"/>
<item name="History" href="/history.html"/>
- <item name="Javadoc (3.2 release)" href="api-release/index.html"/>
+ <item name="Javadoc (3.2.1 release)" href="api-release/index.html"/>
</menu>
<menu name="Development">
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/7d97c864/xdocs/history.xml
----------------------------------------------------------------------
diff --git a/xdocs/history.xml b/xdocs/history.xml
index b7568a4..262f623 100644
--- a/xdocs/history.xml
+++ b/xdocs/history.xml
@@ -101,7 +101,7 @@ Notably MultiValueMap is a new more flexible implementation of MultiHashMap.
</p>
<p>
-<b>Collections 3.2.1</b> Re-packaged release of v3.2 which is OSGi enabled.
+<b>Collections 3.2.1</b> Re-packaged v3.2 release which is OSGi enabled.
</p>
</section>
[24/34] commons-collections git commit: Roll the version number on
the branch
Posted by ch...@apache.org.
Roll the version number on the branch
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@648096 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/8434eec4
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/8434eec4
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/8434eec4
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 8434eec4dad83dca336ce6fdfb06f716dff7311a
Parents: 2acfde1
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Tue Apr 15 02:11:58 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Tue Apr 15 02:11:58 2008 +0000
----------------------------------------------------------------------
build.xml | 2 +-
pom.xml | 2 +-
project.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/8434eec4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index cb3c5d6..5940df3 100644
--- a/build.xml
+++ b/build.xml
@@ -36,7 +36,7 @@
<property name="component.title.full" value="Apache Commons Collections"/>
<!-- The current version number of this component -->
- <property name="component.version" value="3.2.1"/>
+ <property name="component.version" value="3.2.2-SNAPSHOT"/>
<!-- The base directory for component configuration files -->
<property name="source.conf" value="src/conf"/>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/8434eec4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2fa89ae..4a71e6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2-SNAPSHOT</version>
<name>Commons Collections</name>
<inceptionYear>2001</inceptionYear>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/8434eec4/project.xml
----------------------------------------------------------------------
diff --git a/project.xml b/project.xml
index 1dcabed..9bb2b32 100644
--- a/project.xml
+++ b/project.xml
@@ -19,7 +19,7 @@
<pomVersion>3</pomVersion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <currentVersion>3.2.1</currentVersion>
+ <currentVersion>3.2.2-SNAPSHOT</currentVersion>
<inceptionYear>2001</inceptionYear>
<name>Collections</name>
<shortDescription>Commons Collections</shortDescription>
[29/34] commons-collections git commit: PR: COLLECTIONS-332
Documented the dependency of ListOrderedMap on the standard Map contract of
using equals() and hashCode().
Posted by ch...@apache.org.
PR: COLLECTIONS-332
Documented the dependency of ListOrderedMap on the standard Map contract of using equals() and hashCode().
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1079552 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/a5f5ec96
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/a5f5ec96
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/a5f5ec96
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: a5f5ec96d1dc13f0a2c4b307dc88c0154e2b6be4
Parents: 470db28
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 8 21:27:41 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 8 21:27:41 2011 +0000
----------------------------------------------------------------------
.../commons/collections/map/CaseInsensitiveMap.java | 5 +++++
.../org/apache/commons/collections/map/IdentityMap.java | 6 ++++--
.../apache/commons/collections/map/ListOrderedMap.java | 11 +++++++++++
3 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a5f5ec96/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
index ba9650d..2674349 100644
--- a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
+++ b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
@@ -46,6 +46,11 @@ import java.util.Map;
* returns <code>"Four".</code> The <code>Set</code> returned by <code>keySet()</code>
* equals <code>{"one", "two", null}.</code>
* <p>
+ * <strong>This map will violate the detail of various Map and map view contracts.</note>
+ * As a general rule, don't compare this map to other maps. In particular, you can't
+ * use decorators like {@link ListOrderedMap} on it, which silently assume that these
+ * contracts are fulfilled.
+ * <p>
* <strong>Note that CaseInsensitiveMap is not synchronized and is not thread-safe.</strong>
* If you wish to use this map from multiple threads concurrently, you must use
* appropriate synchronization. The simplest approach is to wrap this map
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a5f5ec96/src/java/org/apache/commons/collections/map/IdentityMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/IdentityMap.java b/src/java/org/apache/commons/collections/map/IdentityMap.java
index 16edd8b..ee1fa3d 100644
--- a/src/java/org/apache/commons/collections/map/IdentityMap.java
+++ b/src/java/org/apache/commons/collections/map/IdentityMap.java
@@ -26,8 +26,10 @@ import java.util.Map;
* A <code>Map</code> implementation that matches keys and values based
* on <code>==</code> not <code>equals()</code>.
* <p>
- * This map will violate the detail of various Map and map view contracts.
- * As a general rule, don't compare this map to other maps.
+ * <strong>This map will violate the detail of various Map and map view contracts.</note>
+ * As a general rule, don't compare this map to other maps. In particular, you can't
+ * use decorators like {@link ListOrderedMap} on it, which silently assume that these
+ * contracts are fulfilled.
* <p>
* <strong>Note that IdentityMap is not synchronized and is not thread-safe.</strong>
* If you wish to use this map from multiple threads concurrently, you must use
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a5f5ec96/src/java/org/apache/commons/collections/map/ListOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
index 710c6bb..09d3262 100644
--- a/src/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
@@ -59,6 +59,17 @@ import org.apache.commons.collections.list.UnmodifiableList;
* using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
* exceptions when accessed by concurrent threads without synchronization.
* <p>
+ * <strong>Note that ListOrderedMap doesn't work with {@link IdentityMap},
+ * {@link CaseInsensitiveMap}, or similar maps that violate the general
+ * contract of {@link java.util.Map}.</strong> The <code>ListOrderedMap</code>
+ * (or, more precisely, the underlying <code>List</code>) is relying on
+ * {@link Object#java.lang.equals(Object) equals()}. This is fine, as long as the
+ * decorated <code>Map</code> is also based on {@link Object#equals(Object) equals()},
+ * and {@link Object#hashCode() hashCode()}, which {@link IdentityMap}, and
+ * {@link CaseInsensitiveMap} don't: The former uses <code>==</code>, and
+ * the latter uses {@link Object#equals(Object) equals()} on a lowercased
+ * key.
+ * <p>
* This class is Serializable from Commons Collections 3.1.
*
* @since Commons Collections 3.0
[17/34] commons-collections git commit: Fix test reports directory
Posted by ch...@apache.org.
Fix test reports directory
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@646848 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/2cad4a1e
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/2cad4a1e
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/2cad4a1e
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 2cad4a1e2482f549006e86e32a908a7fac807437
Parents: d9d85d1
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Thu Apr 10 15:37:13 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Thu Apr 10 15:37:13 2008 +0000
----------------------------------------------------------------------
build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/2cad4a1e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2895d14..cb3c5d6 100644
--- a/build.xml
+++ b/build.xml
@@ -52,6 +52,7 @@
<property name="build.conf" value="${build.home}/conf"/>
<property name="build.classes" value="${build.home}/classes"/>
<property name="build.tests" value="${build.home}/tests"/>
+ <property name="build.test.reports" value="${build.home}/test-reports"/>
<property name="build.docs" value="${build.home}/docs/apidocs"/>
<property name="build.src" value="${build.home}/src-ide" />
@@ -284,6 +285,7 @@
<!-- Runs all tests -->
<target name="-test-all" depends="compile.tests" unless="testcase">
+ <mkdir dir="${build.test.reports}"/>
<junit printsummary="yes" haltonfailure="yes" showoutput="yes">
<formatter type="brief" />
<classpath>
@@ -292,7 +294,7 @@
<pathelement location="${junit.jar}"/>
</classpath>
- <batchtest fork="yes">
+ <batchtest fork="yes" todir="${build.test.reports}">
<fileset dir="${source.test}">
<include name="**/Test*.java"/>
<exclude name="**/TestAll*.java"/>
@@ -318,7 +320,7 @@
<pathelement location="${junit.jar}"/>
</classpath>
- <test name="${testcase}" fork="yes">
+ <test name="${testcase}" fork="yes" todir="${build.test.reports}">
<formatter type="brief" usefile="false" />
</test>
</junit>
[06/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/TransformedSortedMap.java b/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
index 428f147..c91e7d5 100644
--- a/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/TypedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/TypedMap.java b/src/java/org/apache/commons/collections/map/TypedMap.java
index cc06289..f58b12b 100644
--- a/src/java/org/apache/commons/collections/map/TypedMap.java
+++ b/src/java/org/apache/commons/collections/map/TypedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/TypedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/TypedSortedMap.java b/src/java/org/apache/commons/collections/map/TypedSortedMap.java
index 62b9ec3..0822dd0 100644
--- a/src/java/org/apache/commons/collections/map/TypedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/TypedSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
index cdc121b..63ec7e6 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
index 43cf18e..262af77 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
index d58716f..db0b6f7 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
index 4d79791..1ef3884 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/package.html b/src/java/org/apache/commons/collections/map/package.html
index 47e4211..1a9e6fc 100644
--- a/src/java/org/apache/commons/collections/map/package.html
+++ b/src/java/org/apache/commons/collections/map/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/overview.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/overview.html b/src/java/org/apache/commons/collections/overview.html
index 83d1f51..95ecb4e 100644
--- a/src/java/org/apache/commons/collections/overview.html
+++ b/src/java/org/apache/commons/collections/overview.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -109,4 +110,4 @@
Consult each subpackage for full details of these.
</p>
-</body>
\ No newline at end of file
+</body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/package.html b/src/java/org/apache/commons/collections/package.html
index 2a9da01..a15d71e 100644
--- a/src/java/org/apache/commons/collections/package.html
+++ b/src/java/org/apache/commons/collections/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
index dc1a5b0..ca0f12c 100644
--- a/src/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
+++ b/src/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
index 28225f9..65fec4f 100644
--- a/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
+++ b/src/java/org/apache/commons/collections/set/AbstractSetDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
index 8f2c7c8..82ac4ea 100644
--- a/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
+++ b/src/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/CompositeSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/CompositeSet.java b/src/java/org/apache/commons/collections/set/CompositeSet.java
index ecea976..35bc893 100644
--- a/src/java/org/apache/commons/collections/set/CompositeSet.java
+++ b/src/java/org/apache/commons/collections/set/CompositeSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/ListOrderedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
index 8cb9806..92b8383 100644
--- a/src/java/org/apache/commons/collections/set/ListOrderedSet.java
+++ b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/MapBackedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/MapBackedSet.java b/src/java/org/apache/commons/collections/set/MapBackedSet.java
index cf32a9c..03f6182 100644
--- a/src/java/org/apache/commons/collections/set/MapBackedSet.java
+++ b/src/java/org/apache/commons/collections/set/MapBackedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/PredicatedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/PredicatedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSet.java
index 0e09dd6..6ed979a 100644
--- a/src/java/org/apache/commons/collections/set/PredicatedSet.java
+++ b/src/java/org/apache/commons/collections/set/PredicatedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
index 7696279..bceb202 100644
--- a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/SynchronizedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/SynchronizedSet.java b/src/java/org/apache/commons/collections/set/SynchronizedSet.java
index bdbcf34..c3fa103 100644
--- a/src/java/org/apache/commons/collections/set/SynchronizedSet.java
+++ b/src/java/org/apache/commons/collections/set/SynchronizedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java b/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
index 346c861..4e07c52 100644
--- a/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/TransformedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/TransformedSet.java b/src/java/org/apache/commons/collections/set/TransformedSet.java
index 32500ef..463bf58 100644
--- a/src/java/org/apache/commons/collections/set/TransformedSet.java
+++ b/src/java/org/apache/commons/collections/set/TransformedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/TransformedSortedSet.java b/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
index 0dee68f..1472ee5 100644
--- a/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/TypedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/TypedSet.java b/src/java/org/apache/commons/collections/set/TypedSet.java
index fa49fa6..027c901 100644
--- a/src/java/org/apache/commons/collections/set/TypedSet.java
+++ b/src/java/org/apache/commons/collections/set/TypedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/TypedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/TypedSortedSet.java b/src/java/org/apache/commons/collections/set/TypedSortedSet.java
index ba465a6..7c679ae 100644
--- a/src/java/org/apache/commons/collections/set/TypedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/TypedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
index d70f46d..22eaede 100644
--- a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
+++ b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
index 41f60fa..6c06e9c 100644
--- a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/set/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/package.html b/src/java/org/apache/commons/collections/set/package.html
index 36f895b..d069ebd 100644
--- a/src/java/org/apache/commons/collections/set/package.html
+++ b/src/java/org/apache/commons/collections/set/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
[33/34] commons-collections git commit: Add missing license header.
Posted by ch...@apache.org.
Add missing license header.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1713761 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/27707a83
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/27707a83
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/27707a83
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 27707a836e9cc3016d2e81579bb3f8a3410b7d40
Parents: a0603b1
Author: Gary D. Gregory <gg...@apache.org>
Authored: Wed Nov 11 05:01:51 2015 +0000
Committer: Gary D. Gregory <gg...@apache.org>
Committed: Wed Nov 11 05:01:51 2015 +0000
----------------------------------------------------------------------
xdocs/style/project.css | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/27707a83/xdocs/style/project.css
----------------------------------------------------------------------
diff --git a/xdocs/style/project.css b/xdocs/style/project.css
index c1d541c..3f385c1 100644
--- a/xdocs/style/project.css
+++ b/xdocs/style/project.css
@@ -1 +1,18 @@
+/*
+ * 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.
+ *
+ */
@import url("http://commons.apache.org/style/commons-maven.css");
[22/34] commons-collections git commit: Set svn:eol-style to native
as suggested by Sebb
Posted by ch...@apache.org.
Set svn:eol-style to native as suggested by Sebb
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@647512 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/bc0620d9
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/bc0620d9
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/bc0620d9
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: bc0620d95106c5a865f41177c9d7ea46ca48ecaf
Parents: e3bbfdf
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Sun Apr 13 00:38:53 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Sun Apr 13 00:38:53 2008 +0000
----------------------------------------------------------------------
.../collections/map/TestMultiValueMap.java | 676 +++++++++----------
1 file changed, 338 insertions(+), 338 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bc0620d9/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
index 7b322dc..fb60dbe 100644
--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
@@ -1,338 +1,338 @@
-/*
- * 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.collections.map;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.MultiMap;
-import org.apache.commons.collections.TestMultiHashMap;
-
-/**
- * TestMultiValueMap.
- *
- * @author <a href="mailto:jcarman@apache.org">James Carman</a>
- * @author Stephen Colebourne
- * @since Commons Collections 3.2
- */
-public class TestMultiValueMap extends TestCase {
-
- public TestMultiValueMap(String testName) {
- super(testName);
- }
-
- public static Test suite() {
- return new TestSuite(TestMultiHashMap.class);
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { TestMultiHashMap.class.getName()};
- junit.textui.TestRunner.main(testCaseName);
- }
-
- public void testNoMappingReturnsNull() {
- final MultiValueMap map = createTestMap();
- assertNull(map.get("whatever"));
- }
-
- public void testValueCollectionType() {
- final MultiValueMap map = createTestMap(LinkedList.class);
- assertTrue(map.get("one") instanceof LinkedList);
- }
-
- public void testMultipleValues() {
- final MultiValueMap map = createTestMap(HashSet.class);
- final HashSet expected = new HashSet();
- expected.add("uno");
- expected.add("un");
- assertEquals(expected, map.get("one"));
- }
-
- public void testContainsValue() {
- final MultiValueMap map = createTestMap(HashSet.class);
- assertTrue(map.containsValue("uno"));
- assertTrue(map.containsValue("un"));
- assertTrue(map.containsValue("dos"));
- assertTrue(map.containsValue("deux"));
- assertTrue(map.containsValue("tres"));
- assertTrue(map.containsValue("trois"));
- assertFalse(map.containsValue("quatro"));
- }
-
- public void testKeyContainsValue() {
- final MultiValueMap map = createTestMap(HashSet.class);
- assertTrue(map.containsValue("one", "uno"));
- assertTrue(map.containsValue("one", "un"));
- assertTrue(map.containsValue("two", "dos"));
- assertTrue(map.containsValue("two", "deux"));
- assertTrue(map.containsValue("three", "tres"));
- assertTrue(map.containsValue("three", "trois"));
- assertFalse(map.containsValue("four", "quatro"));
- }
-
- public void testValues() {
- final MultiValueMap map = createTestMap(HashSet.class);
- final HashSet expected = new HashSet();
- expected.add("uno");
- expected.add("dos");
- expected.add("tres");
- expected.add("un");
- expected.add("deux");
- expected.add("trois");
- final Collection c = map.values();
- assertEquals(6, c.size());
- assertEquals(expected, new HashSet(c));
- }
-
- private MultiValueMap createTestMap() {
- return createTestMap(ArrayList.class);
- }
-
- private MultiValueMap createTestMap(Class collectionClass) {
- final MultiValueMap map = MultiValueMap.decorate(new HashMap(), collectionClass);
- map.put("one", "uno");
- map.put("one", "un");
- map.put("two", "dos");
- map.put("two", "deux");
- map.put("three", "tres");
- map.put("three", "trois");
- return map;
- }
-
- public void testKeyedIterator() {
- final MultiValueMap map = createTestMap();
- final ArrayList actual = new ArrayList(IteratorUtils.toList(map.iterator("one")));
- final ArrayList expected = new ArrayList(Arrays.asList(new String[]{"uno", "un"}));
- assertEquals(expected, actual);
- }
-
- public void testRemoveAllViaIterator() {
- final MultiValueMap map = createTestMap();
- for(Iterator i = map.values().iterator(); i.hasNext();) {
- i.next();
- i.remove();
- }
- assertNull(map.get("one"));
- assertTrue(map.isEmpty());
- }
-
- public void testRemoveAllViaKeyedIterator() {
- final MultiValueMap map = createTestMap();
- for(Iterator i = map.iterator("one"); i.hasNext();) {
- i.next();
- i.remove();
- }
- assertNull(map.get("one"));
- assertEquals(4, map.totalSize());
- }
-
- public void testTotalSizeA() {
- assertEquals(6, createTestMap().totalSize());
- }
-
- //-----------------------------------------------------------------------
- public void testMapEquals() {
- MultiValueMap one = new MultiValueMap();
- Integer value = new Integer(1);
- one.put("One", value);
- one.remove("One", value);
-
- MultiValueMap two = new MultiValueMap();
- assertEquals(two, one);
- }
-
- //-----------------------------------------------------------------------
- public void testGetCollection() {
- MultiValueMap map = new MultiValueMap();
- map.put("A", "AA");
- assertSame(map.get("A"), map.getCollection("A"));
- }
-
- public void testTotalSize() {
- MultiValueMap map = new MultiValueMap();
- assertEquals(0, map.totalSize());
- map.put("A", "AA");
- assertEquals(1, map.totalSize());
- map.put("B", "BA");
- assertEquals(2, map.totalSize());
- map.put("B", "BB");
- assertEquals(3, map.totalSize());
- map.put("B", "BC");
- assertEquals(4, map.totalSize());
- map.remove("A");
- assertEquals(3, map.totalSize());
- map.remove("B", "BC");
- assertEquals(2, map.totalSize());
- }
-
- public void testSize() {
- MultiValueMap map = new MultiValueMap();
- assertEquals(0, map.size());
- map.put("A", "AA");
- assertEquals(1, map.size());
- map.put("B", "BA");
- assertEquals(2, map.size());
- map.put("B", "BB");
- assertEquals(2, map.size());
- map.put("B", "BC");
- assertEquals(2, map.size());
- map.remove("A");
- assertEquals(2, map.size());
- map.remove("B", "BC");
- assertEquals(2, map.size());
- }
-
- public void testSize_Key() {
- MultiValueMap map = new MultiValueMap();
- assertEquals(0, map.size("A"));
- assertEquals(0, map.size("B"));
- map.put("A", "AA");
- assertEquals(1, map.size("A"));
- assertEquals(0, map.size("B"));
- map.put("B", "BA");
- assertEquals(1, map.size("A"));
- assertEquals(1, map.size("B"));
- map.put("B", "BB");
- assertEquals(1, map.size("A"));
- assertEquals(2, map.size("B"));
- map.put("B", "BC");
- assertEquals(1, map.size("A"));
- assertEquals(3, map.size("B"));
- map.remove("A");
- assertEquals(0, map.size("A"));
- assertEquals(3, map.size("B"));
- map.remove("B", "BC");
- assertEquals(0, map.size("A"));
- assertEquals(2, map.size("B"));
- }
-
- public void testIterator_Key() {
- MultiValueMap map = new MultiValueMap();
- assertEquals(false, map.iterator("A").hasNext());
- map.put("A", "AA");
- Iterator it = map.iterator("A");
- assertEquals(true, it.hasNext());
- it.next();
- assertEquals(false, it.hasNext());
- }
-
- public void testContainsValue_Key() {
- MultiValueMap map = new MultiValueMap();
- assertEquals(false, map.containsValue("A", "AA"));
- assertEquals(false, map.containsValue("B", "BB"));
- map.put("A", "AA");
- assertEquals(true, map.containsValue("A", "AA"));
- assertEquals(false, map.containsValue("A", "AB"));
- }
-
- public void testPutAll_Map1() {
- MultiMap original = new MultiValueMap();
- original.put("key", "object1");
- original.put("key", "object2");
-
- MultiValueMap test = new MultiValueMap();
- test.put("keyA", "objectA");
- test.put("key", "object0");
- test.putAll(original);
-
- assertEquals(2, test.size());
- assertEquals(4, test.totalSize());
- assertEquals(1, test.getCollection("keyA").size());
- assertEquals(3, test.getCollection("key").size());
- assertEquals(true, test.containsValue("objectA"));
- assertEquals(true, test.containsValue("object0"));
- assertEquals(true, test.containsValue("object1"));
- assertEquals(true, test.containsValue("object2"));
- }
-
- public void testPutAll_Map2() {
- Map original = new HashMap();
- original.put("keyX", "object1");
- original.put("keyY", "object2");
-
- MultiValueMap test = new MultiValueMap();
- test.put("keyA", "objectA");
- test.put("keyX", "object0");
- test.putAll(original);
-
- assertEquals(3, test.size());
- assertEquals(4, test.totalSize());
- assertEquals(1, test.getCollection("keyA").size());
- assertEquals(2, test.getCollection("keyX").size());
- assertEquals(1, test.getCollection("keyY").size());
- assertEquals(true, test.containsValue("objectA"));
- assertEquals(true, test.containsValue("object0"));
- assertEquals(true, test.containsValue("object1"));
- assertEquals(true, test.containsValue("object2"));
- }
-
- public void testPutAll_KeyCollection() {
- MultiValueMap map = new MultiValueMap();
- Collection coll = Arrays.asList(new Object[] {"X", "Y", "Z"});
-
- assertEquals(true, map.putAll("A", coll));
- assertEquals(3, map.size("A"));
- assertEquals(true, map.containsValue("A", "X"));
- assertEquals(true, map.containsValue("A", "Y"));
- assertEquals(true, map.containsValue("A", "Z"));
-
- assertEquals(false, map.putAll("A", null));
- assertEquals(3, map.size("A"));
- assertEquals(true, map.containsValue("A", "X"));
- assertEquals(true, map.containsValue("A", "Y"));
- assertEquals(true, map.containsValue("A", "Z"));
-
- assertEquals(false, map.putAll("A", new ArrayList()));
- assertEquals(3, map.size("A"));
- assertEquals(true, map.containsValue("A", "X"));
- assertEquals(true, map.containsValue("A", "Y"));
- assertEquals(true, map.containsValue("A", "Z"));
-
- coll = Arrays.asList(new Object[] {"M"});
- assertEquals(true, map.putAll("A", coll));
- assertEquals(4, map.size("A"));
- assertEquals(true, map.containsValue("A", "X"));
- assertEquals(true, map.containsValue("A", "Y"));
- assertEquals(true, map.containsValue("A", "Z"));
- assertEquals(true, map.containsValue("A", "M"));
- }
-
- public void testRemove_KeyItem() {
- MultiValueMap map = new MultiValueMap();
- map.put("A", "AA");
- map.put("A", "AB");
- map.put("A", "AC");
- assertEquals(null, map.remove("C", "CA"));
- assertEquals(null, map.remove("A", "AD"));
- assertEquals("AC", map.remove("A", "AC"));
- assertEquals("AB", map.remove("A", "AB"));
- assertEquals("AA", map.remove("A", "AA"));
- assertEquals(new MultiValueMap(), map);
- }
-
-}
+/*
+ * 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.collections.map;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections.MultiMap;
+import org.apache.commons.collections.TestMultiHashMap;
+
+/**
+ * TestMultiValueMap.
+ *
+ * @author <a href="mailto:jcarman@apache.org">James Carman</a>
+ * @author Stephen Colebourne
+ * @since Commons Collections 3.2
+ */
+public class TestMultiValueMap extends TestCase {
+
+ public TestMultiValueMap(String testName) {
+ super(testName);
+ }
+
+ public static Test suite() {
+ return new TestSuite(TestMultiHashMap.class);
+ }
+
+ public static void main(String args[]) {
+ String[] testCaseName = { TestMultiHashMap.class.getName()};
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+ public void testNoMappingReturnsNull() {
+ final MultiValueMap map = createTestMap();
+ assertNull(map.get("whatever"));
+ }
+
+ public void testValueCollectionType() {
+ final MultiValueMap map = createTestMap(LinkedList.class);
+ assertTrue(map.get("one") instanceof LinkedList);
+ }
+
+ public void testMultipleValues() {
+ final MultiValueMap map = createTestMap(HashSet.class);
+ final HashSet expected = new HashSet();
+ expected.add("uno");
+ expected.add("un");
+ assertEquals(expected, map.get("one"));
+ }
+
+ public void testContainsValue() {
+ final MultiValueMap map = createTestMap(HashSet.class);
+ assertTrue(map.containsValue("uno"));
+ assertTrue(map.containsValue("un"));
+ assertTrue(map.containsValue("dos"));
+ assertTrue(map.containsValue("deux"));
+ assertTrue(map.containsValue("tres"));
+ assertTrue(map.containsValue("trois"));
+ assertFalse(map.containsValue("quatro"));
+ }
+
+ public void testKeyContainsValue() {
+ final MultiValueMap map = createTestMap(HashSet.class);
+ assertTrue(map.containsValue("one", "uno"));
+ assertTrue(map.containsValue("one", "un"));
+ assertTrue(map.containsValue("two", "dos"));
+ assertTrue(map.containsValue("two", "deux"));
+ assertTrue(map.containsValue("three", "tres"));
+ assertTrue(map.containsValue("three", "trois"));
+ assertFalse(map.containsValue("four", "quatro"));
+ }
+
+ public void testValues() {
+ final MultiValueMap map = createTestMap(HashSet.class);
+ final HashSet expected = new HashSet();
+ expected.add("uno");
+ expected.add("dos");
+ expected.add("tres");
+ expected.add("un");
+ expected.add("deux");
+ expected.add("trois");
+ final Collection c = map.values();
+ assertEquals(6, c.size());
+ assertEquals(expected, new HashSet(c));
+ }
+
+ private MultiValueMap createTestMap() {
+ return createTestMap(ArrayList.class);
+ }
+
+ private MultiValueMap createTestMap(Class collectionClass) {
+ final MultiValueMap map = MultiValueMap.decorate(new HashMap(), collectionClass);
+ map.put("one", "uno");
+ map.put("one", "un");
+ map.put("two", "dos");
+ map.put("two", "deux");
+ map.put("three", "tres");
+ map.put("three", "trois");
+ return map;
+ }
+
+ public void testKeyedIterator() {
+ final MultiValueMap map = createTestMap();
+ final ArrayList actual = new ArrayList(IteratorUtils.toList(map.iterator("one")));
+ final ArrayList expected = new ArrayList(Arrays.asList(new String[]{"uno", "un"}));
+ assertEquals(expected, actual);
+ }
+
+ public void testRemoveAllViaIterator() {
+ final MultiValueMap map = createTestMap();
+ for(Iterator i = map.values().iterator(); i.hasNext();) {
+ i.next();
+ i.remove();
+ }
+ assertNull(map.get("one"));
+ assertTrue(map.isEmpty());
+ }
+
+ public void testRemoveAllViaKeyedIterator() {
+ final MultiValueMap map = createTestMap();
+ for(Iterator i = map.iterator("one"); i.hasNext();) {
+ i.next();
+ i.remove();
+ }
+ assertNull(map.get("one"));
+ assertEquals(4, map.totalSize());
+ }
+
+ public void testTotalSizeA() {
+ assertEquals(6, createTestMap().totalSize());
+ }
+
+ //-----------------------------------------------------------------------
+ public void testMapEquals() {
+ MultiValueMap one = new MultiValueMap();
+ Integer value = new Integer(1);
+ one.put("One", value);
+ one.remove("One", value);
+
+ MultiValueMap two = new MultiValueMap();
+ assertEquals(two, one);
+ }
+
+ //-----------------------------------------------------------------------
+ public void testGetCollection() {
+ MultiValueMap map = new MultiValueMap();
+ map.put("A", "AA");
+ assertSame(map.get("A"), map.getCollection("A"));
+ }
+
+ public void testTotalSize() {
+ MultiValueMap map = new MultiValueMap();
+ assertEquals(0, map.totalSize());
+ map.put("A", "AA");
+ assertEquals(1, map.totalSize());
+ map.put("B", "BA");
+ assertEquals(2, map.totalSize());
+ map.put("B", "BB");
+ assertEquals(3, map.totalSize());
+ map.put("B", "BC");
+ assertEquals(4, map.totalSize());
+ map.remove("A");
+ assertEquals(3, map.totalSize());
+ map.remove("B", "BC");
+ assertEquals(2, map.totalSize());
+ }
+
+ public void testSize() {
+ MultiValueMap map = new MultiValueMap();
+ assertEquals(0, map.size());
+ map.put("A", "AA");
+ assertEquals(1, map.size());
+ map.put("B", "BA");
+ assertEquals(2, map.size());
+ map.put("B", "BB");
+ assertEquals(2, map.size());
+ map.put("B", "BC");
+ assertEquals(2, map.size());
+ map.remove("A");
+ assertEquals(2, map.size());
+ map.remove("B", "BC");
+ assertEquals(2, map.size());
+ }
+
+ public void testSize_Key() {
+ MultiValueMap map = new MultiValueMap();
+ assertEquals(0, map.size("A"));
+ assertEquals(0, map.size("B"));
+ map.put("A", "AA");
+ assertEquals(1, map.size("A"));
+ assertEquals(0, map.size("B"));
+ map.put("B", "BA");
+ assertEquals(1, map.size("A"));
+ assertEquals(1, map.size("B"));
+ map.put("B", "BB");
+ assertEquals(1, map.size("A"));
+ assertEquals(2, map.size("B"));
+ map.put("B", "BC");
+ assertEquals(1, map.size("A"));
+ assertEquals(3, map.size("B"));
+ map.remove("A");
+ assertEquals(0, map.size("A"));
+ assertEquals(3, map.size("B"));
+ map.remove("B", "BC");
+ assertEquals(0, map.size("A"));
+ assertEquals(2, map.size("B"));
+ }
+
+ public void testIterator_Key() {
+ MultiValueMap map = new MultiValueMap();
+ assertEquals(false, map.iterator("A").hasNext());
+ map.put("A", "AA");
+ Iterator it = map.iterator("A");
+ assertEquals(true, it.hasNext());
+ it.next();
+ assertEquals(false, it.hasNext());
+ }
+
+ public void testContainsValue_Key() {
+ MultiValueMap map = new MultiValueMap();
+ assertEquals(false, map.containsValue("A", "AA"));
+ assertEquals(false, map.containsValue("B", "BB"));
+ map.put("A", "AA");
+ assertEquals(true, map.containsValue("A", "AA"));
+ assertEquals(false, map.containsValue("A", "AB"));
+ }
+
+ public void testPutAll_Map1() {
+ MultiMap original = new MultiValueMap();
+ original.put("key", "object1");
+ original.put("key", "object2");
+
+ MultiValueMap test = new MultiValueMap();
+ test.put("keyA", "objectA");
+ test.put("key", "object0");
+ test.putAll(original);
+
+ assertEquals(2, test.size());
+ assertEquals(4, test.totalSize());
+ assertEquals(1, test.getCollection("keyA").size());
+ assertEquals(3, test.getCollection("key").size());
+ assertEquals(true, test.containsValue("objectA"));
+ assertEquals(true, test.containsValue("object0"));
+ assertEquals(true, test.containsValue("object1"));
+ assertEquals(true, test.containsValue("object2"));
+ }
+
+ public void testPutAll_Map2() {
+ Map original = new HashMap();
+ original.put("keyX", "object1");
+ original.put("keyY", "object2");
+
+ MultiValueMap test = new MultiValueMap();
+ test.put("keyA", "objectA");
+ test.put("keyX", "object0");
+ test.putAll(original);
+
+ assertEquals(3, test.size());
+ assertEquals(4, test.totalSize());
+ assertEquals(1, test.getCollection("keyA").size());
+ assertEquals(2, test.getCollection("keyX").size());
+ assertEquals(1, test.getCollection("keyY").size());
+ assertEquals(true, test.containsValue("objectA"));
+ assertEquals(true, test.containsValue("object0"));
+ assertEquals(true, test.containsValue("object1"));
+ assertEquals(true, test.containsValue("object2"));
+ }
+
+ public void testPutAll_KeyCollection() {
+ MultiValueMap map = new MultiValueMap();
+ Collection coll = Arrays.asList(new Object[] {"X", "Y", "Z"});
+
+ assertEquals(true, map.putAll("A", coll));
+ assertEquals(3, map.size("A"));
+ assertEquals(true, map.containsValue("A", "X"));
+ assertEquals(true, map.containsValue("A", "Y"));
+ assertEquals(true, map.containsValue("A", "Z"));
+
+ assertEquals(false, map.putAll("A", null));
+ assertEquals(3, map.size("A"));
+ assertEquals(true, map.containsValue("A", "X"));
+ assertEquals(true, map.containsValue("A", "Y"));
+ assertEquals(true, map.containsValue("A", "Z"));
+
+ assertEquals(false, map.putAll("A", new ArrayList()));
+ assertEquals(3, map.size("A"));
+ assertEquals(true, map.containsValue("A", "X"));
+ assertEquals(true, map.containsValue("A", "Y"));
+ assertEquals(true, map.containsValue("A", "Z"));
+
+ coll = Arrays.asList(new Object[] {"M"});
+ assertEquals(true, map.putAll("A", coll));
+ assertEquals(4, map.size("A"));
+ assertEquals(true, map.containsValue("A", "X"));
+ assertEquals(true, map.containsValue("A", "Y"));
+ assertEquals(true, map.containsValue("A", "Z"));
+ assertEquals(true, map.containsValue("A", "M"));
+ }
+
+ public void testRemove_KeyItem() {
+ MultiValueMap map = new MultiValueMap();
+ map.put("A", "AA");
+ map.put("A", "AB");
+ map.put("A", "AC");
+ assertEquals(null, map.remove("C", "CA"));
+ assertEquals(null, map.remove("A", "AD"));
+ assertEquals("AC", map.remove("A", "AC"));
+ assertEquals("AB", map.remove("A", "AB"));
+ assertEquals("AA", map.remove("A", "AA"));
+ assertEquals(new MultiValueMap(), map);
+ }
+
+}
[28/34] commons-collections git commit: PR: COLLECTIONS-334
Synchronizing access to locks in StaticBucketMap.size()
Posted by ch...@apache.org.
PR: COLLECTIONS-334
Synchronizing access to locks in StaticBucketMap.size()
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1076039 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/470db289
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/470db289
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/470db289
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 470db289c3fead9f22444232ef28c1ec4c32dfe2
Parents: bcc68d4
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 1 22:35:01 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 1 22:35:01 2011 +0000
----------------------------------------------------------------------
src/java/org/apache/commons/collections/map/StaticBucketMap.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/470db289/src/java/org/apache/commons/collections/map/StaticBucketMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/StaticBucketMap.java b/src/java/org/apache/commons/collections/map/StaticBucketMap.java
index 4a130c3..1a0d379 100644
--- a/src/java/org/apache/commons/collections/map/StaticBucketMap.java
+++ b/src/java/org/apache/commons/collections/map/StaticBucketMap.java
@@ -182,7 +182,9 @@ public final class StaticBucketMap implements Map {
int cnt = 0;
for (int i = 0; i < buckets.length; i++) {
- cnt += locks[i].size;
+ synchronized(locks[i]) {
+ cnt += locks[i].size;
+ }
}
return cnt;
}
[13/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestAll.java b/src/test/org/apache/commons/collections/bidimap/TestAll.java
index 18fcf64..d66a3a7 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestAll.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
index 5a76a41..ce269c9 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
index 485e0c8..1eb1c56 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
index 3c18f04..b069d02 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
index b16187b..9200f77 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
index 0568ca6..6cbfcda 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
index 38c5042..0bf4637 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
index 1f218a8..8649d2a 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestAll.java b/src/test/org/apache/commons/collections/buffer/TestAll.java
index cfe8412..3e70986 100644
--- a/src/test/org/apache/commons/collections/buffer/TestAll.java
+++ b/src/test/org/apache/commons/collections/buffer/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
index 2e0f825..61c61db 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
index a788ef0..c423f7b 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
index 50cb16d..af744c0 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
index f6800b3..236da39 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBoundedFifoBuffer2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
index d0138d1..31badeb 100644
--- a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
index 2daaa79..46ebc04 100644
--- a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
index cf3a653..e267268 100644
--- a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
index ac75e9e..1ec6dc1 100644
--- a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
index b2db8d6..7ad1e76 100644
--- a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
index c620721..2c175bf 100644
--- a/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestUnboundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
index f86f03a..a925cfe 100644
--- a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
index 859aecc..db3cb19 100644
--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/TestAll.java b/src/test/org/apache/commons/collections/collection/TestAll.java
index 97c3cbc..6332119 100644
--- a/src/test/org/apache/commons/collections/collection/TestAll.java
+++ b/src/test/org/apache/commons/collections/collection/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
index 5f83be3..fe6cfd1 100644
--- a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
index d33552e..5784383 100644
--- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
index 83aa5cd..56e1dc3 100644
--- a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
index c4da219..5b8a7b2 100644
--- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
index 382e5ea..57b2dda 100644
--- a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
index 05489d0..e03c2ec 100644
--- a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestAll.java b/src/test/org/apache/commons/collections/comparators/TestAll.java
index 7b10967..65c2d89 100644
--- a/src/test/org/apache/commons/collections/comparators/TestAll.java
+++ b/src/test/org/apache/commons/collections/comparators/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
index 8e73794..c89abd9 100644
--- a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
index b7b0635..d5771e4 100644
--- a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
index 5efd2a0..54b9b16 100644
--- a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
+++ b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java b/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
index 63ffa13..9a9ec9d 100644
--- a/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestNullComparator.java b/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
index b5882bb..5375bf7 100644
--- a/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestNullComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
index 412b295..894ee68 100644
--- a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
index dde798b..5b83381 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
index 8d39f1f..4091433 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
index da97742..09ce46a 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
index 0a6273b..1768937 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestAll.java b/src/test/org/apache/commons/collections/iterators/TestAll.java
index b980195..57aaf0f 100644
--- a/src/test/org/apache/commons/collections/iterators/TestAll.java
+++ b/src/test/org/apache/commons/collections/iterators/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
index 92475db..1368b2c 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
index 4bec2c4..47dfffb 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
index c4e33e2..f802d67 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
index 98a18c5..bfd43e6 100644
--- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
index adb1a1c..b844a7d 100644
--- a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
index f5fef88..d4c10bd 100644
--- a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
index c3ee7e1..fcf45f8 100644
--- a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
index fad4e1c..7d288af 100644
--- a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
+++ b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
index dc2aff2..58372fe 100644
--- a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
+++ b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java b/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
index a2eb2b9..f5ba923 100644
--- a/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java b/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
index 350748a..2dbfeab 100644
--- a/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
index 6736cb7..a3eda43 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
index d40e01b..7ab81da 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
index 209f8a0..f99be8a 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
index 5456363..21b7400 100644
--- a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java b/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
index 3e07ed7..86a6f7a 100644
--- a/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
index 9717429..c67a846 100644
--- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
index 065eb81..7466690 100644
--- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
+++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
index a2ae1fb..ed7114c 100644
--- a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
index 88f01ea..403852c 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
index e219893..3685ea0 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
index 0117ae9..1ad30f3 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
index 250a798..761215d 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
index 052d06b..bab3662 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
index a3e752a..69d528a 100644
--- a/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/AbstractTestMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestAll.java b/src/test/org/apache/commons/collections/keyvalue/TestAll.java
index 3ccfbf6..0fe3350 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestAll.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
index 706a0bb..e6d8d89 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[16/34] commons-collections git commit: Merge in the build from the
trunk, finish updating license headers and prepare site for 3.2.1 release
Posted by ch...@apache.org.
Merge in the build from the trunk, finish updating license headers and prepare site for 3.2.1 release
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@646782 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/d9d85d17
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/d9d85d17
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/d9d85d17
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: d9d85d17a169480517b2fb5180afb144bec0c964
Parents: 91e368d
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Thu Apr 10 12:58:57 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Thu Apr 10 12:58:57 2008 +0000
----------------------------------------------------------------------
DEVELOPERS-GUIDE.html | 15 +-
NOTICE.txt | 3 +
PROPOSAL.html | 11 +-
README.txt | 5 +-
RELEASE-NOTES.html | 111 +-------
STATUS.html | 19 +-
build-testframework.xml | 70 +++++
build.xml | 49 ++--
maven.xml | 51 ++--
pom.xml | 438 ++++++++++++++++++++++++++++++++
project.properties | 30 ++-
project.xml | 60 ++---
src/assembly/bin.xml | 45 ++++
src/assembly/src.xml | 52 ++++
src/site/resources/images/logo.png | Bin 0 -> 13809 bytes
src/site/site.xml | 46 ++++
xdocs/building.xml | 54 +++-
xdocs/compatibility.xml | 13 +-
xdocs/cvs-usage.xml | 21 +-
xdocs/download_collections.xml | 145 +++++++++++
xdocs/history.xml | 17 +-
xdocs/index.xml | 30 +--
xdocs/issue-tracking.xml | 139 ++++++----
xdocs/navigation.xml | 21 +-
xdocs/pick.xml | 47 ++--
xdocs/proposal.xml | 19 +-
xdocs/release_3_2.xml | 13 +-
xdocs/release_3_2_1.xml | 49 ++++
xdocs/style/project.css | 2 +-
xdocs/tasks.xml | 13 +-
xdocs/userguide.xml | 13 +-
31 files changed, 1220 insertions(+), 381 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/DEVELOPERS-GUIDE.html
----------------------------------------------------------------------
diff --git a/DEVELOPERS-GUIDE.html b/DEVELOPERS-GUIDE.html
index 0a4d9ae..70d4a86 100644
--- a/DEVELOPERS-GUIDE.html
+++ b/DEVELOPERS-GUIDE.html
@@ -1,9 +1,10 @@
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -15,13 +16,13 @@
-->
<html>
<head>
-<title>Developers guide for Jakarta Commons "Collections" Package</title>
+<title>Developers guide for Apache Commons "Collections" Package</title>
</head>
<body bgcolor="white">
<div align="center">
-<h1>The Jakarta Commons <em>Collections</em> Package</h1>
+<h1>The Apache Commons <em>Collections</em> Package</h1>
<h2>Developers Guide</h2>
$Id$<br />
<a href="#Introduction">[Introduction]</a>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 3f59805..a9e0fff 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,2 +1,5 @@
+Apache Commons Collections
+Copyright 2001-2008 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/PROPOSAL.html
----------------------------------------------------------------------
diff --git a/PROPOSAL.html b/PROPOSAL.html
index 484540c..822f573 100644
--- a/PROPOSAL.html
+++ b/PROPOSAL.html
@@ -1,9 +1,10 @@
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 7d7c453..a3cb31d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
-Jakarta Commons Collections
+Apache Commons Collections
===========================
-Welcome to the Collections component of the Jakarta Commons project.
+Welcome to the Collections component of the Apache Commons project.
This component contains many new collections and collection utilities.
Two jar files are produced by this component.
@@ -49,3 +49,4 @@ It can be found here :
http://maven.apache.org/
Once installed, the jars may be built with 'maven jar'.
+
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/RELEASE-NOTES.html
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.html b/RELEASE-NOTES.html
index 9b804ab..d7fb3b0 100644
--- a/RELEASE-NOTES.html
+++ b/RELEASE-NOTES.html
@@ -1,9 +1,10 @@
<!--
- Copyright 2003-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -15,10 +16,10 @@
-->
<html>
<head>
-<title>RELEASE NOTES: COLLECTIONS 3.2</title>
+<title>RELEASE NOTES: COLLECTIONS 3.2.1</title>
</head>
<body>
-<center><h2>RELEASE NOTES: COLLECTIONS 3.2</h2></center>
+<center><h2>RELEASE NOTES: COLLECTIONS 3.2.1</h2></center>
<p>
Commons collections is a project to develop and maintain collection classes
@@ -26,104 +27,14 @@ based on and inspired by the JDK collection framework.
This project is JDK1.2 compatible, and does not use JDK1.5 generics.
</p>
<p>
-This release adds various new classes and fixes a number of bugs.
-All feedback should be directed to commons-user at jakarta.apache.org.
+This v3.2.1 release is simply a re-packaging of the v3.2 release, with appropriate
+OSGi meta data added to the jar's manifest file.
</p>
<hr />
<center><h3>COMPATIBILITY</h3></center>
<p>
-This release is fully source and binary compatible with v3.1.
-(Checks performed using JDiff and Clirr, thanks).
-Please check the bug fixes to ensure you weren't relying on the behaviour of a bug.
-</p>
-<p>
-There are two new <i>deprecations</i>:<br />
-BeanMap is now deprecated and will be removed in v4.0.
-The class is now available in commons-beanutils (full jar version).
-This change was made to ensure that all bean related collections were in one place (ie. beanutils).
-If this causes major headaches to anyone please contact commons-dev at jakarta.apache.org.
-</p>
-<p>
-MultiHashMap is now deprecated and will be removed in v4.0.
-The class is now available as MultiValueMap in the map subpackage.
-This new version of the class is a decorator and can wrap maps other than HashMap
-making it much more flexible.
-If this causes major headaches to anyone please contact commons-dev at jakarta.apache.org.
+This release is fully source and binary compatible with v3.2.
</p>
-
-<center><h3>NEW CLASSES</h3></center>
-<ul>
-<li>MultiValueMap - Decorator implementation of MultiMap providing control over the map and collection implementations, updated MapUtils to match [29440]</li>
-<li>DefaultedMap - Returns a default value when the key is not found, without adding the default value to the map itself [30911]</li>
-<li>GrowthList - Decorator that causes set and indexed add to expand the list rather than throw IndexOutOfBoundsException [34171]</li>
-<li>LoopingListIterator - When the end of the list is reached the iteration continues from the start, updated IteratorUtils to match [30166]</li>
-<li>ReverseListIterator - A list iterator that returns the elements from the list in reverse order [39224]</li>
-<li>BoundedBuffer - A new wrapper class which can make any buffer bounded, updated BufferUtils to match [37473]</li>
-</ul>
-
-<center><h3>ENHANCEMENTS</h3></center>
-<ul>
-<li>CollectionUtils.addIgnoreNull - Adds to the collection if the value being added is not null [30020]</li>
-<li>MapUtils.putAll - Puts an array of key/value pairs into a map [30882]</li>
-<li>CollectionUtils/MapUtils.isEmpty/isNotEmpty - Null-safe checks of collection emptyness [35890]</li>
-<li>CollectionUtils.sizeIsEmpty - Checks if a collection, array, map, iterator or enumeration is empty</li>
-<li>CollectionUtils/ListUtils - retainAll/removeAll that don't change original colllection</li>
-<li>ExtendedProperties - Accepts List elements (does not enforce Vector) as values [36812]</li>
-<li>ExtendedProperties - new Methods getList(String key) and getList(String key, List defaults) [36812]</li>
-<li>ExtendedProperties - No longer uses an exception in normal processing [30497]</li>
-<li>BlockingBuffer - now includes stack trace if InterupttedException occurs [33700]</li>
-<li>BlockingBuffer - new methods that allow get and remove with a timeout, updated BufferUtils to match [27691]</li>
-<li>BlockingBuffer - now allows you to specify a default timeout value for get/remove operations [37607]</li>
-<li>TransformedMap/TransformedSortedMap - new factory decorateTransform() that transforms any existing entries in the map [30959]</li>
-<li>ListOrderedMap - values can now be accessed as a List using valueList() [37015]</li>
-<li>ListOrderedMap - additional list-like method, setValue(int,Object)</li>
-<li>ListOrderedMap - additional method, put(int,Object,Object)</li>
-<li>PriorityBuffer - now Serializable [36163]</li>
-<li>ListIteratorWrapper - now implements ResettableListIterator [39449]</li>
-<li>IfClosure - add single argument constructor, updated CllosureUtils to match [38495]</li>
-<li>All/Any/One/None Predicate - allow construction with zero or one predicates [37979]</li>
-</ul>
-
-<center><h3>BUG FIXES</h3></center>
-<ul>
-<li>FastArrayList - Fix iterators and views to work better in multithreaded environments</li>
-<li>FastArrayList - Fix iterator remove where ConcurrentModificationException not as expected [34690]</li>
-<li>CursorableLinkedList (list subpackage) - Fix iterator remove/set not throwing IllegalStateException after next-previous-removeByIndex [35766]</li>
-<li>TreeList/CursorableLinkedList/NodeCachingLinkedList/AbstractLinkedList - Fix iterator remove not working properly when called after previous [35258]</li>
-<li>TreeList - remove(int) could break class invariants, breaking iterator previous [35258]</li>
-<li>SetUniqueList.set(int,Object) - Destroyed set status in certain circumstances [33294]</li>
-<li>AbstractLinkedMap.init() - Now calls createEntry() to create the map entry object [33706]</li>
-<li>AbstractHashedMap deserialization - Fix to prevent doubling of internal data array [34265]</li>
-<li>AbstractHashedMap initialization - Fix to setup threshold correctly, improving performance [35012]</li>
-<li>BeanMap.initialize() - Internal variable now correctly initialised with only write methods that actually exist [15895]</li>
-<li>MultiHashMap.remove(key, item) - Was returning the item even when nothing was removed [32366]</li>
-<li>MultiHashMap.putAll(multimap) - Was adding the collection as a single item rather than individually [35631]</li>
-<li>MultiHashMap - Enable compilation using J#</li>
-<li>Flat3Map.equals() - Fix to make flat mode comparison actually work [34917]</li>
-<li>TransformedMap.putAll - Now allows putAll of an empty map [34686]</li>
-<li>StaticBucketMap.containsKey - Fix incorrect null checking [37567]</li>
-<li>AbstractMapBag.BagIterator.remove - Removing the last entry used to break the class invariants [35747]</li>
-<li>BoundedFifoBuffer/CircularFifoBuffer - Fix serialization to work in case where buffer serialized when full [31433]</li>
-<li>BoundedFifoBuffer - Fix iterator remove bug causing ArrayIndexOutOfBounds error [33071]</li>
-<li>UnboundedFifoBuffer - Fix iterator remove bug causing ArrayIndexOutOfBounds error [35733]</li>
-<li>UnboundedFifoBuffer - Fix deserialization to work with subsequant object manipulation [35763]</li>
-<li>BlockingBuffer - Fix internal locking code (internal fix, no effect on users of BlockingBuffer) [37028]</li>
-<li>IteratorChain.remove() - Fix to avoid IllegalStateException when one of the underlying iterators is a FilterIterator [34267]</li>
-<li>FilterIterator - Correctly handle setting of iterator and predicate after object creation [38074]</li>
-<li>ExtendedProperties.convertProperties() - Fix to handle default properties maps correctly [32204]</li>
-<li>Add casts to avoid some JDK1.5 compilation warnings [35474]</li>
-<li>Make serialization version ids private [37106]</li>
-</ul>
-
-<center><h3>JAVADOC</h3></center>
-<ul>
-<li>MapUtils.safeAddToMap - Better comment</li>
-<li>MapUtils.transformed*Map - Better comment</li>
-<li>ListOrderedSet.decorate(List) - Better comment [32073]</li>
-<li>BlockingBuffer - Add comments</li>
-<li>Maps - synchronization comments [32573]</li>
-<li>SwitchTransformer - defaultTransformer comment fix [39207]</li>
-</ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/STATUS.html
----------------------------------------------------------------------
diff --git a/STATUS.html b/STATUS.html
index 1dcf539..930d048 100644
--- a/STATUS.html
+++ b/STATUS.html
@@ -1,9 +1,10 @@
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -15,13 +16,13 @@
-->
<html>
<head>
-<title>Status File for Jakarta Commons "Collections" Package</title>
+<title>Status File for Apache Commons "Collections" Package</title>
<head>
<body bgcolor="white">
<div align="center">
-<h1>The Jakarta Commons <em>Collections</em> Package</h1>
+<h1>The Apache Commons <em>Collections</em> Package</h1>
$Id$<br>
<a href="#Introduction">[Introduction]</a>
<a href="#Dependencies">[Dependencies]</a>
@@ -59,9 +60,9 @@ components for development and use:</p>
<h3>3. RELEASE INFO</h3>
<p>Current Release:
-<a href="http://jakarta.apache.org/site/binindex.cgi">Version 3.1</a>
+<a href="http://jakarta.apache.org/site/binindex.cgi">Version 3.2</a>
-<p>Planned Next Release: 3.2</p>
+<p>Planned Next Release: 3.3</p>
<a name="Committers"></a>
<h3>4. COMMITTERS</h3>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/build-testframework.xml
----------------------------------------------------------------------
diff --git a/build-testframework.xml b/build-testframework.xml
new file mode 100644
index 0000000..71834ee
--- /dev/null
+++ b/build-testframework.xml
@@ -0,0 +1,70 @@
+<!--
+ 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.
+-->
+<project name="Collections Test Framework jar" default="jar" basedir=".">
+
+
+<!--
+ $Id$
+-->
+
+
+<!-- ========== Component Declarations ==================================== -->
+
+
+ <!-- The current version number of this component -->
+ <property name="component.version" value=""/>
+
+ <!-- The base directory for compiled test classes -->
+ <property name="test.classes" value="target/test-classes"/>
+
+ <!-- The base directory for distribution targets -->
+ <property name="dist.home" value="target"/>
+
+ <!-- JDK versions -->
+ <property name="maven.compile.source" value=""/>
+ <property name="maven.compile.target" value=""/>
+
+
+<!-- ========== Executable Targets ======================================== -->
+
+ <target name="jar" description="Create Collections Test Framework jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${test.classes}/META-INF"/>
+ <copy file="LICENSE.txt" tofile="${test.classes}/META-INF/LICENSE.txt"/>
+ <copy file="NOTICE.txt" tofile="${test.classes}/META-INF/NOTICE.txt"/>
+ <jar jarfile="${dist.home}/commons-collections-testframework-${component.version}.jar">
+ <manifest>
+ <attribute name="Specification-Title" value="Commons Collections Test Framework"/>
+ <attribute name="Specification-Version" value="${component.version}"/>
+ <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
+ <attribute name="Implementation-Title" value="Commons Collections Test Framework"/>
+ <attribute name="Implementation-Version" value="${component.version}"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+ <attribute name="Implementation-Vendor-Id" value="org.apache"/>
+ <attribute name="X-Compile-Source-JDK" value="${maven.compile.source}"/>
+ <attribute name="X-Compile-Target-JDK" value="${maven.compile.target}"/>
+ </manifest>
+ <fileset dir="${test.classes}">
+ <include name="**/LICENSE.txt"/>
+ <include name="**/NOTICE.txt"/>
+ <include name="**/AbstractTest*.class"/>
+ <include name="**/BulkTest*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4ed927c..2895d14 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,10 @@
<!--
- Copyright 2001-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -32,10 +33,10 @@
<property name="component.title" value="Commons Collections"/>
<!-- The full title of this component -->
- <property name="component.title.full" value="Apache Jakarta Commons Collections"/>
+ <property name="component.title.full" value="Apache Commons Collections"/>
<!-- The current version number of this component -->
- <property name="component.version" value="3.2"/>
+ <property name="component.version" value="3.2.1"/>
<!-- The base directory for component configuration files -->
<property name="source.conf" value="src/conf"/>
@@ -373,7 +374,7 @@
<property name="tf.name" value="commons-collections-testframework"/>
<property name="tf.package" value="org.apache.commons.collections"/>
<property name="tf.title" value="Commons Collections Test Framework"/>
- <property name="tf.title.full" value="Apache Jakarta Commons Collections Test Framework"/>
+ <property name="tf.title.full" value="Apache Commons Collections Test Framework"/>
<property name="tf.version" value="${component.version}"/>
<property name="tf.build.conf" value="${build.home}/tfconf"/>
@@ -431,28 +432,15 @@
</fileset>
</copy>
- <mkdir dir="${tf.build.tf}/META-INF"/>
- <copy file="LICENSE.txt"
- tofile="${tf.build.tf}/META-INF/LICENSE.txt"/>
- <copy file="NOTICE.txt"
- tofile="${tf.build.tf}/META-INF/NOTICE.txt"/>
-
- <tstamp/>
- <mkdir dir="${tf.build.conf}"/>
- <copy todir="${tf.build.conf}" filtering="on">
- <filterset>
- <filter token="name" value="${tf.name}"/>
- <filter token="title" value="${tf.title}"/>
- <filter token="package" value="${tf.package}"/>
- <filter token="version" value="${tf.version}"/>
- </filterset>
- <fileset dir="${source.conf}" includes="*.MF"/>
- </copy>
-
<!-- NOTE: A jar built using JDK1.4 is incompatible with JDK1.2 -->
- <jar jarfile="${tf.build.jar.name}"
- basedir="${tf.build.tf}"
- manifest="${tf.build.conf}/MANIFEST.MF"/>
+ <ant antfile="build-testframework.xml" target="jar">
+ <property name="test.classes" value="${tf.build.tf}"/>
+ <property name="dist.home" value="${build.home}"/>
+ <property name="component.version" value="${tf.version}"/>
+ <property name="maven.compile.source" value="1.2"/>
+ <property name="maven.compile.target" value="1.2"/>
+ </ant>
+
</target>
<!-- ====================================================================== -->
@@ -539,9 +527,12 @@
<include name="PROPOSAL.html"/>
<include name="STATUS.html"/>
<include name="build.xml"/>
+ <include name="build-testframework.xml"/>
+ <include name="checkstyle.xml"/>
<include name="maven.xml"/>
<include name="project.xml"/>
<include name="project.properties"/>
+ <include name="pom.xml"/>
</fileset>
</copy>
<copy todir="${build.dist.src.work}">
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index e2ca085..171949b 100644
--- a/maven.xml
+++ b/maven.xml
@@ -1,9 +1,10 @@
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -28,37 +29,11 @@
<!-- ============== JAR ================== -->
<postGoal name="jar:jar">
- <j:set var="finalName" value="${pom.getPluginContext('maven-jar-plugin').getVariable('maven.final.name')}"/>
- <j:set var="finalVersion" value="${finalName.substring(20)}" />
- <j:set var="testfwkBase" value="${pom.artifactId}-testframework" />
- <j:set var="testfwkName" value="${testfwkBase}-${finalVersion}" />
-
- <ant:jar
- jarfile="${maven.build.dir}/${testfwkName}.jar">
- <j:set var="licenseFileName"><license:fileName/></j:set>
- <util:file name="${licenseFileName}" var="licenseFile"/>
- <ant:metainf dir="${licenseFile.canonicalFile.parent}">
- <ant:include name="${licenseFile.canonicalFile.name}"/>
- </ant:metainf>
- <ant:manifest>
- <ant:attribute name="Built-By" value="${user.name}"/>
- <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
- <ant:attribute name="Package" value="${pom.package}"/>
- <ant:attribute name="Build-Jdk" value="${java.version}"/>
- <!-- added supplementary entries -->
- <ant:attribute name="Extension-Name" value="Commons Collections Test Framework"/>
- <ant:attribute name="Specification-Version" value="${pom.specificationVersion}"/>
- <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
- <ant:attribute name="Specification-Title" value="Commons Collections Test Framework"/>
- <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
- <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
- <ant:attribute name="Implementation-Vendor-Id" value="${pom.organization.identifier}"/>
- </ant:manifest>
- <ant:fileset dir="${maven.build.dir}/test-classes">
- <ant:include name="**/AbstractTest*.class"/>
- <ant:include name="**/BulkTest*.class"/>
- </ant:fileset>
- </ant:jar>
+ <ant:ant antfile="build-testframework.xml" target="jar">
+ <property name="component.version" value="${pom.currentVersion}"/>
+ <property name="test.classes" value="${maven.build.dir}/test-classes"/>
+ <property name="dist.home" value="${maven.build.dir}"/>
+ </ant:ant>
</postGoal>
<postGoal name="jar:install">
@@ -123,6 +98,10 @@
<!-- Copy Files -->
<ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir=".">
+ <ant:include name="build-testframework.xml"/>
+ <ant:include name="checkstyle.xml"/>
+ <ant:include name="pom.xml"/>
+ <ant:include name="NOTICE.txt"/>
<ant:include name="RELEASE-NOTES.html"/>
<ant:include name="DEVELOPERS-GUIDE.html"/>
<ant:include name="PROPOSAL.html"/>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..2fa89ae
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,438 @@
+<?xml version="1.0"?>
+<!--
+ 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 collectionsuage governing permissions and
+ limitations under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>9</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <name>Commons Collections</name>
+
+ <inceptionYear>2001</inceptionYear>
+ <description>Types that extend and augment the Java Collections Framework.</description>
+
+ <url>http://commons.apache.org/collections/</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/COLLECTIONS</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/collections/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/collections/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/collections/trunk</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>Stephen Colebourne</name>
+ <id>scolebourne</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Morgan Delagrange</name>
+ <id>morgand</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Matthew Hawthorne</name>
+ <id>matth</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Geir Magnusson</name>
+ <id>geirm</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Craig McClanahan</name>
+ <id>craigmcc</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Phil Steitz</name>
+ <id>psteitz</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Arun M. Thomas</name>
+ <id>amamment</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Rodney Waldhoff</name>
+ <id>rwaldhoff</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Henri Yandell</name>
+ <id>bayard</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>James Carman</name>
+ <id>jcarman</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Robert Burrell Donkin</name>
+ <id>rdonkin</id>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Rafael U. C. Afonso</name>
+ </contributor>
+ <contributor>
+ <name>Max Rydahl Andersen</name>
+ </contributor>
+ <contributor>
+ <name>Federico Barbieri</name>
+ </contributor>
+ <contributor>
+ <name>Arron Bates</name>
+ </contributor>
+ <contributor>
+ <name>Nicola Ken Barozzi</name>
+ </contributor>
+ <contributor>
+ <name>Sebastian Bazley</name>
+ </contributor>
+ <contributor>
+ <name>Matt Benson</name>
+ </contributor>
+ <contributor>
+ <name>Ola Berg</name>
+ </contributor>
+ <contributor>
+ <name>Christopher Berry</name>
+ </contributor>
+ <contributor>
+ <name>Nathan Beyer</name>
+ </contributor>
+ <contributor>
+ <name>Janek Bogucki</name>
+ </contributor>
+ <contributor>
+ <name>Chuck Burdick</name>
+ </contributor>
+ <contributor>
+ <name>Dave Bryson</name>
+ </contributor>
+ <contributor>
+ <name>Julien Buret</name>
+ </contributor>
+ <contributor>
+ <name>Jonathan Carlson</name>
+ </contributor>
+ <contributor>
+ <name>Ram Chidambaram</name>
+ </contributor>
+ <contributor>
+ <name>Steve Clark</name>
+ </contributor>
+ <contributor>
+ <name>Eric Crampton</name>
+ </contributor>
+ <contributor>
+ <name>Dimiter Dimitrov</name>
+ </contributor>
+ <contributor>
+ <name>Peter Donald</name>
+ </contributor>
+ <contributor>
+ <name>Steve Downey</name>
+ </contributor>
+ <contributor>
+ <name>Rich Dougherty</name>
+ </contributor>
+ <contributor>
+ <name>Tom Dunham</name>
+ </contributor>
+ <contributor>
+ <name>Stefano Fornari</name>
+ </contributor>
+ <contributor>
+ <name>Andrew Freeman</name>
+ </contributor>
+ <contributor>
+ <name>Gerhard Froehlich</name>
+ </contributor>
+ <contributor>
+ <name>Paul Jack</name>
+ </contributor>
+ <contributor>
+ <name>Eric Johnson</name>
+ </contributor>
+ <contributor>
+ <name>Kent Johnson</name>
+ </contributor>
+ <contributor>
+ <name>Marc Johnson</name>
+ </contributor>
+ <contributor>
+ <name>Nissim Karpenstein</name>
+ </contributor>
+ <contributor>
+ <name>Shinobu Kawai</name>
+ </contributor>
+ <contributor>
+ <name>Mohan Kishore</name>
+ </contributor>
+ <contributor>
+ <name>Simon Kitching</name>
+ </contributor>
+ <contributor>
+ <name>Thomas Knych</name>
+ </contributor>
+ <contributor>
+ <name>Serge Knystautas</name>
+ </contributor>
+ <contributor>
+ <name>Peter KoBek</name>
+ </contributor>
+ <contributor>
+ <name>Jordan Krey</name>
+ </contributor>
+ <contributor>
+ <name>Olaf Krische</name>
+ </contributor>
+ <contributor>
+ <name>Guilhem Lavaux</name>
+ </contributor>
+ <contributor>
+ <name>Paul Legato</name>
+ </contributor>
+ <contributor>
+ <name>David Leppik</name>
+ </contributor>
+ <contributor>
+ <name>Berin Loritsch</name>
+ </contributor>
+ <contributor>
+ <name>Hendrik Maryns</name>
+ </contributor>
+ <contributor>
+ <name>Stefano Mazzocchi</name>
+ </contributor>
+ <contributor>
+ <name>Brian McCallister</name>
+ </contributor>
+ <contributor>
+ <name>Steven Melzer</name>
+ </contributor>
+ <contributor>
+ <name>Leon Messerschmidt</name>
+ </contributor>
+ <contributor>
+ <name>Mauricio S. Moura</name>
+ </contributor>
+ <contributor>
+ <name>Kasper Nielsen</name>
+ </contributor>
+ <contributor>
+ <name>Stanislaw Osinski</name>
+ </contributor>
+ <contributor>
+ <name>Alban Peignier</name>
+ </contributor>
+ <contributor>
+ <name>Mike Pettypiece</name>
+ </contributor>
+ <contributor>
+ <name>Steve Phelps</name>
+ </contributor>
+ <contributor>
+ <name>Ilkka Priha</name>
+ </contributor>
+ <contributor>
+ <name>Jonas Van Poucke</name>
+ </contributor>
+ <contributor>
+ <name>Will Pugh</name>
+ </contributor>
+ <contributor>
+ <name>Herve Quiroz</name>
+ </contributor>
+ <contributor>
+ <name>Daniel Rall</name>
+ </contributor>
+ <contributor>
+ <name>Robert Ribnitz</name>
+ </contributor>
+ <contributor>
+ <name>Huw Roberts</name>
+ </contributor>
+ <contributor>
+ <name>Henning P. Schmiedehausen</name>
+ </contributor>
+ <contributor>
+ <name>Howard Lewis Ship</name>
+ </contributor>
+ <contributor>
+ <name>Joe Raysa</name>
+ </contributor>
+ <contributor>
+ <name>Thomas Schapitz</name>
+ </contributor>
+ <contributor>
+ <name>Jon Schewe</name>
+ </contributor>
+ <contributor>
+ <name>Andreas Schlosser</name>
+ </contributor>
+ <contributor>
+ <name>Christian Siefkes</name>
+ </contributor>
+ <contributor>
+ <name>Michael Smith</name>
+ </contributor>
+ <contributor>
+ <name>Stephen Smith</name>
+ </contributor>
+ <contributor>
+ <name>Jan Sorensen</name>
+ </contributor>
+ <contributor>
+ <name>Jon S. Stevens </name>
+ </contributor>
+ <contributor>
+ <name>James Strachan</name>
+ </contributor>
+ <contributor>
+ <name>Leo Sutic</name>
+ </contributor>
+ <contributor>
+ <name>Chris Tilden</name>
+ </contributor>
+ <contributor>
+ <name>Neil O'Toole</name>
+ </contributor>
+ <contributor>
+ <name>Jeff Turner</name>
+ </contributor>
+ <contributor>
+ <name>Kazuya Ujihara</name>
+ </contributor>
+ <contributor>
+ <name>Jeff Varszegi</name>
+ </contributor>
+ <contributor>
+ <name>Ralph Wagner</name>
+ </contributor>
+ <contributor>
+ <name>David Weinrich</name>
+ </contributor>
+ <contributor>
+ <name>Dieter Wimberger</name>
+ </contributor>
+ <contributor>
+ <name>Serhiy Yevtushenko</name>
+ </contributor>
+ <contributor>
+ <name>Jason van Zyl</name>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compile.source>1.2</maven.compile.source>
+ <maven.compile.target>1.2</maven.compile.target>
+ <commons.componentid>collections</commons.componentid>
+ <commons.release.version>3.2.1</commons.release.version>
+ <commons.binary.suffix>-bin</commons.binary.suffix>
+ <commons.jira.id>COLLECTIONS</commons.jira.id>
+ <commons.jira.pid>12310465</commons.jira.pid>
+ </properties>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/apache/commons/collections/TestAllPackages.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="build-testframework.xml" target="jar">
+ <property name="component.version" value="${project.version}"/>
+ <property name="test.classes" value="${project.build.directory}/test-classes"/>
+ <property name="dist.home" value="${project.build.directory}"/>
+ <property name="maven.compile.source" value="${maven.compile.source}"/>
+ <property name="maven.compile.target" value="${maven.compile.target}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/project.properties
----------------------------------------------------------------------
diff --git a/project.properties b/project.properties
index 2ea296a..535e222 100644
--- a/project.properties
+++ b/project.properties
@@ -1,22 +1,25 @@
-# Copyright 2003-2005 The Apache Software Foundation
+# 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
#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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.
+# 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.
+
+maven.repo.remote=http://repo1.maven.org/maven
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
-maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.developmentProcessUrl=http://commons.apache.org/charter.html
maven.xdoc.poweredby.image=maven-feather.png
maven.xdoc.copy.excludes=images/file.gif,images/folder-closed.gif,images/folder-open.gif,images/icon_alert.gif,images/icon_alertsml.gif,images/icon_arrowfolder1_sml.gif,images/icon_arrowfolder2_sml.gif,images/icon_arrowmembers1_sml.gif,images/icon_arrowmembers2_sml.gif,images/icon_arrowusergroups1_sml.gif,images/icon_arrowusergroups2_sml.gif,images/icon_confirmsml.gif,images/icon_help_lrg.gif,images/icon_infosml.gif,images/icon_members_sml.gif,images/icon_sortleft.gif,images/icon_sortright.gif,images/icon_usergroups_sml.gif,images/icon_waste_lrg.gif,images/icon_waste_sml.gif,images/none.png,images/nw_maj.gif,images/nw_maj_hi.gif,images/nw_med.gif,images/nw_med_hi.gif,images/nw_med_rond.gif,images/nw_min.gif,images/nw_min_036.gif,images/nw_min_hi.gif,images/poweredby_036.gif,images/product_logo.gif,images/se_maj_rond.gif,images/sw_min.gif,images/logos/**
maven.xdoc.copy.excludes.classic=images/external-classic.png,images/help_logo.gif,images/icon_arrowfolderclosed1_sml.gif,images/icon_arrowwaste1_sml.gif,images/icon_arrowwaste2_sml.gif,images/icon_doc_lrg.gif,images/icon_doc_sml.gif,images/icon_error_lrg.gif,images/icon_folder_lrg.gif,images/icon_folder_sml.gif,images/icon_help_sml.gif,images/icon_info_lrg.gif,images/icon_members_lrg.gif,images/icon_sortdown.gif,images/icon_sortup.gif,images/icon_success_lrg.gif,images/icon_usergroups_lrg.gif,images/icon_arrowfolderopen2_sml.gif,images/icon_warning_lrg.gif,images/newwindow-classic.png,images/nw_maj_rond.gif,images/strich.gif,images/sw_maj_rond.gif,images/sw_med_rond.gif
@@ -51,7 +54,8 @@ maven.compile.target = 1.1
# Specifies the source version for the Java compiler.
# Corresponds to the source attribute for the ant javac task.
# Valid values are 1.3, 1.4, 1.5.
-maven.compile.source = 1.3
+maven.compile.source = 1.2
+maven.compile.target = 1.2
maven.compile.debug=on
maven.compile.deprecation=off
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/project.xml
----------------------------------------------------------------------
diff --git a/project.xml b/project.xml
index 588be23..1dcabed 100644
--- a/project.xml
+++ b/project.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2002-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -18,20 +19,20 @@
<pomVersion>3</pomVersion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <currentVersion>3.2</currentVersion>
+ <currentVersion>3.2.1</currentVersion>
<inceptionYear>2001</inceptionYear>
<name>Collections</name>
<shortDescription>Commons Collections</shortDescription>
<description>Types that extend and augment the Java Collections Framework.</description>
<logo>/images/logo.png</logo>
- <url>http://jakarta.apache.org/commons/collections/</url>
+ <url>http://commons.apache.org/collections/</url>
<package>org.apache.commons.collections</package>
<organization>
<name>The Apache Software Foundation</name>
- <url>http://jakarta.apache.org</url>
- <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
+ <url>http://commons.apache.org/</url>
+ <logo>http://commons.apache.org/images/logo.png</logo>
</organization>
<licenses>
@@ -42,29 +43,29 @@
</license>
</licenses>
- <gumpRepositoryId>jakarta</gumpRepositoryId>
- <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
+ <gumpRepositoryId>commons</gumpRepositoryId>
+ <issueTrackingUrl>http://issues.apache.org/jira/</issueTrackingUrl>
<siteAddress>people.apache.org</siteAddress>
- <siteDirectory>/www/jakarta.apache.org/commons/collections/</siteDirectory>
- <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/collections/</distributionDirectory>
+ <siteDirectory>/www/commons.apache.org/collections/</siteDirectory>
+ <distributionDirectory>/www/people.apache.org/builds/commons/collections/</distributionDirectory>
<repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk</connection>
- <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/collections/trunk</connection>
+ <url>http://svn.apache.org/repos/asf/commons/proper/collections/trunk</url>
</repository>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
- <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
- <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
+ <subscribe>dev-subscribe@commons.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
- <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
- <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
+ <subscribe>user-subscribe@commons.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
</mailingList>
</mailingLists>
@@ -299,6 +300,9 @@
<name>Berin Loritsch</name>
</contributor>
<contributor>
+ <name>Hendrik Maryns</name>
+ </contributor>
+ <contributor>
<name>Stefano Mazzocchi</name>
</contributor>
<contributor>
@@ -448,7 +452,7 @@
</dependencies>
<build>
- <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
+ <nagEmailAddress>dev@commons.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<integrationUnitTestSourceDirectory/>
@@ -470,18 +474,16 @@
</build>
<reports>
- <!--report>maven-changelog-plugin</report-->
- <!--report>maven-changes-plugin</report-->
- <!--report>maven-developer-activity-plugin</report-->
- <!--report>maven-file-activity-plugin</report-->
- <!--report>maven-checkstyle-plugin</report-->
+ <!--report>maven-changes-plugin</report--> <!-- commented out until changes.xml exists -->
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-pmd-plugin</report>
+ <!--report>maven-findbugs-plugin</report--> <!-- commented out due to license -->
<report>maven-javadoc-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-jxr-plugin</report>
<report>maven-license-plugin</report>
- <!--report>maven-cobertura-plugin</report>
- <report>maven-jdiff-plugin</report-->
+ <!--report>maven-cobertura-plugin</report--> <!-- commented out due to license -->
</reports>
</project>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
new file mode 100644
index 0000000..ba5c51a
--- /dev/null
+++ b/src/assembly/bin.xml
@@ -0,0 +1,45 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE-NOTES.html</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
new file mode 100644
index 0000000..3f9c664
--- /dev/null
+++ b/src/assembly/src.xml
@@ -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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>build.xml</include>
+ <include>build-testframework.xml</include>
+ <include>checkstyle.xml</include>
+ <include>DEVELOPERS-GUIDE.html</include>
+ <include>LICENSE.txt</include>
+ <include>maven.xml</include>
+ <include>NOTICE.txt</include>
+ <include>pom.xml</include>
+ <include>project.properties</include>
+ <include>project.xml</include>
+ <include>PROPOSAL.html</include>
+ <include>README.txt</include>
+ <include>RELEASE-NOTES.html</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>data</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>xdocs</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/src/site/resources/images/logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png
new file mode 100644
index 0000000..44654dc
Binary files /dev/null and b/src/site/resources/images/logo.png differ
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..c9102e6
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<project name="Collections">
+ <bannerRight>
+ <name>Commons Collections</name>
+ <src>/images/logo.png</src>
+ <href>/index.html</href>
+ </bannerRight>
+
+ <body>
+ <menu name="Collections">
+ <item name="Overview" href="/index.html"/>
+ <item name="Download" href="http://commons.apache.org/downloads/download_collections.cgi"/>
+ <item name="Users guide" href="/userguide.html"/>
+ <item name="History" href="/history.html"/>
+ <item name="Javadoc (3.2 release)" href="api-release/index.html"/>
+ </menu>
+
+ <menu name="Development">
+ <item name="Building" href="/building.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ <item name="Tasks" href="/tasks.html"/>
+ <item name="Proposal" href="/proposal.html"/>
+ <item name="Source Repository" href="/source-repository.html"/>
+ <item name="Javadoc (SVN latest)" href="apidocs/index.html"/>
+ </menu>
+
+ </body>
+
+</project>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/building.xml
----------------------------------------------------------------------
diff --git a/xdocs/building.xml b/xdocs/building.xml
index 26fec89..32e28ed 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!--
-Copyright 2005-2006 The Apache Software Foundation.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+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
@@ -17,7 +18,7 @@ limitations under the License.
<document>
<properties>
<title>Building</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
<!-- ================================================== -->
@@ -28,7 +29,7 @@ limitations under the License.
is used for site generation.
</p>
<p>
- You may also be interested in the <a href="release_3_2.html">v3.2 release notes</a>.
+ You may also be interested in the <a href="release_3_2_1.html">v3.2.1 release notes</a>.
</p>
</section>
<!-- ================================================== -->
@@ -47,15 +48,44 @@ limitations under the License.
</p>
</section>
<!-- ================================================== -->
-<section name="Maven Goals">
+<section name="Maven 2 Goals">
<p>
- To build the Javadocs, change into Collection's root directory and run "maven javadoc".
- The result will be in "target/docs/apidocs".
+ The following <strong><i>Maven 2</i></strong> commands can be used to build collections:
</p>
+ <ul>
+ <li><code>mvn clean</code> - clean up</li>
+ <li><code>mvn test</code> - compile and run the unit tests</li>
+ <li><code>mvn site</code> - create io documentation</li>
+ <li><code>mvn package</code> - build the jar</li>
+ <li><code>mvn install</code> - build the jar and install in local maven repository</li>
+ <li><code>mvn site assembly:assembly</code> - Create the source and binary distributions</li>
+ </ul>
+</section>
+<!-- ================================================== -->
+<section name="Maven 1 Goals">
+ <p>
+ The following <strong><i>Maven 1</i></strong> commands can be used to build collections:
+ </p>
+ <ul>
+ <li><code>maven clean</code> - clean up</li>
+ <li><code>maven test</code> - compile and run the unit tests</li>
+ <li><code>maven site</code> - create io documentation</li>
+ <li><code>maven jar</code> - build the jar</li>
+ <li><code>maven dist</code> - Create the source and binary distributions</li>
+ </ul>
+</section>
+<!-- ================================================== -->
+<section name="Ant Goals">
<p>
- To build the full website, run "maven site".
- The result will be in "target/docs".
+ The following <strong><i>Ant</i></strong> commands can be used to build collections:
</p>
+ <ul>
+ <li><code>ant clean</code> - clean up</li>
+ <li><code>ant test</code> - compile and run the unit tests</li>
+ <li><code>ant javadoc</code> - create javadocs</li>
+ <li><code>ant jar</code> - build the jar</li>
+ <li><code>ant dist</code> - Create the source and binary distributions</li>
+ </ul>
</section>
<!-- ================================================== -->
</body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/compatibility.xml
----------------------------------------------------------------------
diff --git a/xdocs/compatibility.xml b/xdocs/compatibility.xml
index fa697ac..50fe0e4 100644
--- a/xdocs/compatibility.xml
+++ b/xdocs/compatibility.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -19,7 +20,7 @@
<properties>
<title>Compatibility</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/cvs-usage.xml
----------------------------------------------------------------------
diff --git a/xdocs/cvs-usage.xml b/xdocs/cvs-usage.xml
index 9a75b99..fa86eb2 100644
--- a/xdocs/cvs-usage.xml
+++ b/xdocs/cvs-usage.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!--
-Copyright 2005 The Apache Software Foundation.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+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
@@ -17,26 +18,26 @@ limitations under the License.
<document>
<properties>
<title>Source repository</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
<!-- ================================================== -->
<section name="Source repository">
<p>
- Jakarta Commons Collections is hosted on the Apache
+ Apache Commons Collections is hosted on the Apache
<a href="http://subversion.tigris.org/">subversion</a> repository.
</p>
<p>
The project URL is:<br />
- <code>http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk</code>
+ <code>http://svn.apache.org/repos/asf/commons/proper/collections/trunk</code>
</p>
<p>
The best way to view the repository is via the
- <a href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/collections/trunk/">subversion viewer</a>.
+ <a href="http://svn.apache.org/viewvc/commons/proper/collections/trunk/">subversion viewer</a>.
</p>
<p>
The alternative is to use the
- <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk/">native subversion</a> display.
+ <a href="http://svn.apache.org/repos/asf/commons/proper/collections/trunk/">native subversion</a> display.
</p>
</section>
<!-- ================================================== -->
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/download_collections.xml
----------------------------------------------------------------------
diff --git a/xdocs/download_collections.xml b/xdocs/download_collections.xml
new file mode 100644
index 0000000..cc67f38
--- /dev/null
+++ b/xdocs/download_collections.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!--
+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.
+-->
+<!--
+ +======================================================================+
+ |**** ****|
+ |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
+ |**** DO NOT EDIT DIRECTLY ****|
+ |**** ****|
+ +======================================================================+
+ | TEMPLATE FILE: download-page-template.xml |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ | |
+ | 1) Re-generate using: mvn commons:download-page |
+ | |
+ | 2) Set the following properties in the component's pom: |
+ | - commons.componentid (required, alphabetic, lower case) |
+ | - commons.release.version (required) |
+ | - commons.binary.suffix (optional) |
+ | (defaults to "-bin", set to "" for pre-maven2 releases) |
+ | |
+ | 3) Example Properties |
+ | |
+ | <properties> |
+ | <commons.componentid>math</commons.componentid> |
+ | <commons.release.version>1.2</commons.release.version> |
+ | </properties> |
+ | |
+ +======================================================================+
+-->
+<document>
+ <properties>
+ <title>Download Commons Collections</title>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+ <section name="Download Commons Collections">
+ <p>
+ We recommend you use a mirror to download our release
+ builds, but you <strong>must</strong> verify the integrity of
+ the downloaded files using signatures downloaded from our main
+ distribution directories. Recent releases (48 hours) may not yet
+ be available from the mirrors.
+ </p>
+
+ <p>
+ You are currently using <b>[preferred]</b>. If you
+ encounter a problem with this mirror, please select another
+ mirror. If all mirrors are failing, there are <i>backup</i>
+ mirrors (at the end of the mirrors list) that should be
+ available.
+ <br></br>
+ [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
+ </p>
+
+ <form action="[location]" method="get" id="SelectMirror">
+ <p>
+ Other mirrors:
+ <select name="Preferred">
+ [if-any http]
+ [for http]<option value="[http]">[http]</option>[end]
+ [end]
+ [if-any ftp]
+ [for ftp]<option value="[ftp]">[ftp]</option>[end]
+ [end]
+ [if-any backup]
+ [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+ [end]
+ </select>
+ <input type="submit" value="Change"></input>
+ </p>
+ </form>
+
+ <p>
+ The <code>KEYS</code> link links to the code signing keys used to sign the product.
+ The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
+ The <code>MD5</code> link downloads the checksum from the main site.
+ </p>
+
+ <p>
+ For more information concerning Commons Collections, see the
+ <a href="index.html" class="name">Commons Collections</a> web site.
+ </p>
+
+ <p>
+ <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
+ <ul class="downloads">
+ <li class="group"><div class="links"><span class="label">Binary</span></div>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz">3.2.1.tar.gz</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.1-bin.zip">3.2.1.zip</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.zip.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li class="group"><div class="links"><span class="label">Source</span></div>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/collections/source/commons-collections-3.2.1-src.tar.gz">3.2.1.tar.gz</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.tar.gz.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/collections/source/commons-collections-3.2.1-src.zip">3.2.1.zip</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.1-src.zip.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/collections/">browse download area</a></li>
+ <li><a href="http://archive.apache.org/dist/commons/collections/">archives...</a></li>
+ </ul>
+ </p>
+ </section>
+ </body>
+</document>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/history.xml
----------------------------------------------------------------------
diff --git a/xdocs/history.xml b/xdocs/history.xml
index 1164b9f..b7568a4 100644
--- a/xdocs/history.xml
+++ b/xdocs/history.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2004-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -19,7 +20,7 @@
<properties>
<title>History</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
@@ -99,6 +100,10 @@ Other changes included more classes implementing Serializable and a ReferenceIde
Notably MultiValueMap is a new more flexible implementation of MultiHashMap.
</p>
+<p>
+<b>Collections 3.2.1</b> Re-packaged release of v3.2 which is OSGi enabled.
+</p>
+
</section>
</body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/index.xml
----------------------------------------------------------------------
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 0b60869..eec03d5 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!--
- Copyright 2002-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -17,7 +18,7 @@
<document>
<properties>
<title>Home</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
<!-- ================================================== -->
@@ -59,24 +60,24 @@ as are various <a href="maven-reports.html">project reports</a>.
The JavaDoc API documents are available online:
</p>
<ul>
-<li>The <a href="api-release/index.html">current release 3.2</a></li>
+<li>The <a href="api-release/index.html">current release 3.2.1</a></li>
<li>The latest 2.x release - <a href="api-2.1.1/index.html">version 2.1.1</a></li>
<li>The <a href="apidocs/index.html">latest SVN</a></li>
</ul>
<p>
The <a href="cvs-usage.html">subversion repository</a> can be
-<a href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/collections/trunk/">browsed</a>.
+<a href="http://svn.apache.org/viewvc/commons/proper/collections/trunk/">browsed</a>.
</p>
</section>
<!-- ================================================== -->
<section name="Releases">
<p>
-The latest version is v3.2. -
-<a href="http://jakarta.apache.org/site/downloads/downloads_commons-collections.cgi">Download now!</a><br />
-The <a href="release_3_2.html">release notes</a> are also available.
+The latest version is v3.2.1 -
+<a href="http://commons.apache.org/downloads/download_collections.cgi">Download now!</a><br />
+The <a href="release_3_2_1.html">release notes</a> are also available.
</p>
<p>
-For previous releases, see the <a href="http://archive.apache.org/dist/jakarta/commons/collections/">Apache Archive</a>
+For previous releases, see the <a href="http://archive.apache.org/dist/commons/collections/">Apache Archive</a>
</p>
</section>
<!-- ================================================== -->
@@ -89,9 +90,8 @@ Please remember that the lists are shared between all commons components,
so prefix your email by [collections].
</p>
<p>
-Issues may be reported via <a href="issue-tracking.html">ASF Bugzilla</a>.
-Please remember that Bugzilla is shared between all commons components,
-so prefix your issue by [collections].
+Issues may be reported via <a href="issue-tracking.html">ASF JIRA</a>.
+Please read the instructions carefully to submit a useful bug report or enhancement request.
</p>
</section>
<!-- ================================================== -->
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/issue-tracking.xml
----------------------------------------------------------------------
diff --git a/xdocs/issue-tracking.xml b/xdocs/issue-tracking.xml
index 0de2441..92ad6e5 100644
--- a/xdocs/issue-tracking.xml
+++ b/xdocs/issue-tracking.xml
@@ -1,61 +1,102 @@
<?xml version="1.0"?>
<!--
-Copyright 2005-2006 The Apache Software Foundation.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+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 iouage governing permissions and
+See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ +======================================================================+
+ |**** ****|
+ |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
+ |**** DO NOT EDIT DIRECTLY ****|
+ |**** ****|
+ +======================================================================+
+ | TEMPLATE FILE: issue-tracking-template.xml |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ | |
+ | 1) Re-generate using: mvn commons:jira-page |
+ | |
+ | 2) Set the following properties in the component's pom: |
+ | - commons.jira.id (required, alphabetic, upper case) |
+ | - commons.jira.pid (required, numeric) |
+ | |
+ | 3) Example Properties |
+ | |
+ | <properties> |
+ | <commons.jira.id>MATH</commons.jira.id> |
+ | <commons.jira.pid>12310485</commons.jira.pid> |
+ | </properties> |
+ | |
+ +======================================================================+
+-->
<document>
- <properties>
- <title>Issue tracking</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
- </properties>
-<body>
-<!-- ================================================== -->
-<section name="Issue tracking">
-<p>
- Commons Collections uses <a href="http://issues.apache.org/bugzilla/">ASF Bugzilla</a> for tracking issues.
- To use Bugzilla you may need to <a href="http://issues.apache.org/bugzilla/createaccount.cgi">create an account</a>.
-</p>
-<p>
- If you would like to report a bug, or raise an enhancement request with
- Commons Collections please do the following:
- <ol>
- <li><a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&product=Commons&component=Collections">Search existing open bugs</a>.
- If you find your issue listed then please add a comment with your details.</li>
- <li><a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/">Search the mailing list archive</a>.
- You may find your issue or idea has already been discussed.</li>
- <li><a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Commons&component=Collections&version=3.2&short_desc=%5Bcollections%5D%20%22Your%20subject%20heading%20here%22&comment=Please%20provide%20details%20here.%20Its%20best%20to%20submit%20patches%20that%20alter%0D%0Aexisting%20file%20content%20in%20%22unified%20diff%22%20format.%20%0D%0A%0D%0ASubmissions%20that%20provide%20new%20files%20can%20be%20supplied%20as%20direct%20file%0D%0Aattachments%20or%20archives%20in%20zip%20or%20tar.gz%20format.%20please%20be%20kind%20%0D%0Aenough%20to%20identify%20the%20format%20of%20the%20attached%20archive%20as%20bugzilla%0D%0Atends%20to%20strip%20these%20characterstics%20by%20removing%20the%20files%20extension.">Submit a bug report or enhancement request</a>.
- Please prefix all new issues with [collections] in the summary line.
- </li>
- </ol>
-</p>
-<p>
- Please also remember these points:
- <ul>
- <li>the more information you provide, the better we can help you</li>
- <li>test cases are vital, particularly for any proposed enhancements</li>
- <li>the developers of Commons Collections are all unpaid volunteers</li>
- </ul>
-</p>
-<p>
- You may also find these links useful:
- <ul>
- <li><a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&product=Commons&component=Collections">All Open Collections bugs</a></li>
- <li><a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=Commons&component=Collections">All Closed Collections bugs</a></li>
- <li><a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&product=Commons&component=Collections">All Collections bugs</a></li>
- </ul>
-</p>
-</section>
-<!-- ================================================== -->
-</body>
+ <properties>
+ <title>Commons Collections Issue tracking</title>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+
+ <section name="Commons Collections Issue tracking">
+ <p>
+ Commons Collections uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+ See the <a href="http://issues.apache.org/jira/browse/COLLECTIONS">Commons Collections JIRA project page</a>.
+ </p>
+
+ <p>
+ To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+ (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
+ created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+ page to get a new password).
+ </p>
+
+ <p>
+ If you would like to report a bug, or raise an enhancement request with
+ Commons Collections please do the following:
+ <ol>
+ <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>.
+ If you find your issue listed then please add a comment with your details.</li>
+ <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
+ You may find your issue or idea has already been discussed.</li>
+ <li>Decide if your issue is a bug or an enhancement.</li>
+ <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&issuetype=1&priority=4&assignee=-1">bug report</a>
+ or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li>
+ </ol>
+ </p>
+
+ <p>
+ Please also remember these points:
+ <ul>
+ <li>the more information you provide, the better we can help you</li>
+ <li>test cases are vital, particularly for any proposed enhancements</li>
+ <li>the developers of Commons Collections are all unpaid volunteers</li>
+ </ul>
+ </p>
+
+ <p>
+ For more information on subversion and creating patches see the
+ <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.
+ </p>
+
+ <p>
+ You may also find these links useful:
+ <ul>
+ <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Commons Collections bugs</a></li>
+ <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Commons Collections bugs</a></li>
+ <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC">All Commons Collections bugs</a></li>
+ </ul>
+ </p>
+ </section>
+ </body>
</document>
[02/34] commons-collections git commit: Moving to TLP
Posted by ch...@apache.org.
Moving to TLP
git-svn-id: https://svn.apache.org/repos/asf/commons/commons/proper/collections/tags/COLLECTIONS_3_2@560657 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/32ba5e8f
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/32ba5e8f
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/32ba5e8f
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 32ba5e8f663c51b400a26f657581b8f1be10ded0
Parents: 4b64112
Author: Henri Yandell <ba...@apache.org>
Authored: Sun Jul 29 03:40:41 2007 +0000
Committer: Henri Yandell <ba...@apache.org>
Committed: Sun Jul 29 03:40:41 2007 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[23/34] commons-collections git commit: Remove duplicate ant section
and change primary build system to maven as suggested by Sebb
Posted by ch...@apache.org.
Remove duplicate ant section and change primary build system to maven as suggested by Sebb
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@647515 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/2acfde1e
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/2acfde1e
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/2acfde1e
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 2acfde1ecb5692309af98e139bf0c99cae3a7312
Parents: bc0620d
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Sun Apr 13 00:45:12 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Sun Apr 13 00:45:12 2008 +0000
----------------------------------------------------------------------
xdocs/building.xml | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/2acfde1e/xdocs/building.xml
----------------------------------------------------------------------
diff --git a/xdocs/building.xml b/xdocs/building.xml
index 32e28ed..c24510a 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -24,30 +24,15 @@ limitations under the License.
<!-- ================================================== -->
<section name="Building Commons Collections">
<p>
- Commons Collections uses <a href="http://ant.apache.org">Ant</a> as its
- primary build system, however <a href="http://maven.apache.org">Maven</a>
- is used for site generation.
+ Commons Collections uses <a href="http://maven.apache.org">Maven 2</a> as its
+ primary build system, however an <a href="http://ant.apache.org">Ant</a>
+ build is also available.
</p>
<p>
You may also be interested in the <a href="release_3_2_1.html">v3.2.1 release notes</a>.
</p>
</section>
<!-- ================================================== -->
-<section name="Ant Goals">
- <p>
- To build a jar file, change into Collection's root directory and run "ant jar".
- The result will be in the "build" subdirectory.
- </p>
- <p>
- All tests can be run with "ant test".
- A single test can be run with "ant -Dtestcase=org.apache.commons.collections.TestXxx test".
- </p>
- <p>
- To build the Javadocs, run "ant javadoc".
- The result will be in "build/docs/apidocs".
- </p>
-</section>
-<!-- ================================================== -->
<section name="Maven 2 Goals">
<p>
The following <strong><i>Maven 2</i></strong> commands can be used to build collections:
[25/34] commons-collections git commit: Adding .settings directory
(Eclipse specific) to svn:ignore.
Posted by ch...@apache.org.
Adding .settings directory (Eclipse specific) to svn:ignore.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1076028 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/dabecd27
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/dabecd27
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/dabecd27
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: dabecd278bc5b8a59f318b2692911156ef8b0da0
Parents: 8434eec
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 1 21:47:08 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 1 21:47:08 2011 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/34] commons-collections git commit: Moving back :)
Posted by ch...@apache.org.
Moving back :)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/tags/COLLECTIONS_3_2@560658 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/3d5aeb1c
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/3d5aeb1c
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/3d5aeb1c
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 3d5aeb1c19c114902f83aff73f64acfd8579843b
Parents: 4b64112 32ba5e8
Author: Henri Yandell <ba...@apache.org>
Authored: Sun Jul 29 03:42:15 2007 +0000
Committer: Henri Yandell <ba...@apache.org>
Committed: Sun Jul 29 03:42:15 2007 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[27/34] commons-collections git commit: PR: COLLECTIONS-335 Setting
TreeBidiMap.entrySet now, as is the case in the trunk.
Posted by ch...@apache.org.
PR: COLLECTIONS-335
Setting TreeBidiMap.entrySet now, as is the case in the trunk.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1076036 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/bcc68d48
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/bcc68d48
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/bcc68d48
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: bcc68d48bb2990d44adffd9ba9e29f155b214d13
Parents: f4a6f21
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 1 22:27:53 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 1 22:27:53 2011 +0000
----------------------------------------------------------------------
src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bcc68d48/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index 0a630af..349e397 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -392,7 +392,8 @@ public class TreeBidiMap implements OrderedBidiMap {
*/
public Set entrySet() {
if (entrySet == null) {
- return new EntryView(this, KEY, MAPENTRY);
+ entrySet = new EntryView(this, KEY, MAPENTRY);
+ return entrySet;
}
return entrySet;
}
[14/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
Fix license headers to conform to current policy
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@646780 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/91e368d0
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/91e368d0
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/91e368d0
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 91e368d0b759082c87eae8f411633e3de6de86bf
Parents: 392d63a
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Thu Apr 10 12:48:07 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Thu Apr 10 12:48:07 2008 +0000
----------------------------------------------------------------------
.../commons/collections/AbstractTestObject.java | 11 +++++-----
.../apache/commons/collections/BulkTest.java | 11 +++++-----
.../commons/collections/LocalTestNode.java | 11 +++++-----
.../commons/collections/MapPerformance.java | 11 +++++-----
.../org/apache/commons/collections/TestAll.java | 11 +++++-----
.../commons/collections/TestAllPackages.java | 11 +++++-----
.../commons/collections/TestArrayList.java | 11 +++++-----
.../commons/collections/TestArrayStack.java | 11 +++++-----
.../commons/collections/TestBagUtils.java | 11 +++++-----
.../apache/commons/collections/TestBeanMap.java | 11 +++++-----
.../commons/collections/TestBinaryHeap.java | 11 +++++-----
.../collections/TestBoundedFifoBuffer.java | 11 +++++-----
.../collections/TestBoundedFifoBuffer2.java | 11 +++++-----
.../commons/collections/TestBufferUtils.java | 11 +++++-----
.../commons/collections/TestClosureUtils.java | 11 +++++-----
.../collections/TestCollectionUtils.java | 11 +++++-----
.../collections/TestCursorableLinkedList.java | 11 +++++-----
.../collections/TestDoubleOrderedMap.java | 11 +++++-----
.../collections/TestEnumerationUtils.java | 11 +++++-----
.../collections/TestExtendedProperties.java | 11 +++++-----
.../commons/collections/TestFactoryUtils.java | 11 +++++-----
.../commons/collections/TestFastArrayList.java | 11 +++++-----
.../commons/collections/TestFastArrayList1.java | 11 +++++-----
.../commons/collections/TestFastHashMap.java | 11 +++++-----
.../commons/collections/TestFastHashMap1.java | 11 +++++-----
.../commons/collections/TestFastTreeMap.java | 11 +++++-----
.../commons/collections/TestFastTreeMap1.java | 11 +++++-----
.../apache/commons/collections/TestHashBag.java | 11 +++++-----
.../commons/collections/TestIteratorUtils.java | 11 +++++-----
.../apache/commons/collections/TestLRUMap.java | 11 +++++-----
.../commons/collections/TestLinkedList.java | 11 +++++-----
.../commons/collections/TestListUtils.java | 11 +++++-----
.../commons/collections/TestMapUtils.java | 11 +++++-----
.../commons/collections/TestMultiHashMap.java | 11 +++++-----
.../commons/collections/TestPredicateUtils.java | 11 +++++-----
.../commons/collections/TestReferenceMap.java | 11 +++++-----
.../collections/TestSequencedHashMap.java | 11 +++++-----
.../commons/collections/TestSetUtils.java | 11 +++++-----
.../collections/TestStaticBucketMap.java | 11 +++++-----
.../collections/TestTransformerUtils.java | 11 +++++-----
.../apache/commons/collections/TestTreeBag.java | 11 +++++-----
.../apache/commons/collections/TestTreeMap.java | 11 +++++-----
.../collections/TestTypedCollection.java | 11 +++++-----
.../collections/TestUnboundedFifoBuffer.java | 11 +++++-----
.../collections/bag/AbstractTestBag.java | 11 +++++-----
.../collections/bag/AbstractTestSortedBag.java | 11 +++++-----
.../apache/commons/collections/bag/TestAll.java | 11 +++++-----
.../commons/collections/bag/TestHashBag.java | 11 +++++-----
.../collections/bag/TestPredicatedBag.java | 11 +++++-----
.../bag/TestPredicatedSortedBag.java | 11 +++++-----
.../collections/bag/TestTransformedBag.java | 11 +++++-----
.../bag/TestTransformedSortedBag.java | 11 +++++-----
.../commons/collections/bag/TestTreeBag.java | 11 +++++-----
.../commons/collections/bag/TestTypedBag.java | 11 +++++-----
.../collections/bag/TestTypedSortedBag.java | 11 +++++-----
.../bidimap/AbstractTestBidiMap.java | 11 +++++-----
.../bidimap/AbstractTestOrderedBidiMap.java | 11 +++++-----
.../bidimap/AbstractTestSortedBidiMap.java | 11 +++++-----
.../TestAbstractOrderedBidiMapDecorator.java | 11 +++++-----
.../commons/collections/bidimap/TestAll.java | 11 +++++-----
.../bidimap/TestDualHashBidiMap.java | 11 +++++-----
.../bidimap/TestDualTreeBidiMap.java | 11 +++++-----
.../bidimap/TestDualTreeBidiMap2.java | 11 +++++-----
.../collections/bidimap/TestTreeBidiMap.java | 11 +++++-----
.../bidimap/TestUnmodifiableBidiMap.java | 11 +++++-----
.../bidimap/TestUnmodifiableOrderedBidiMap.java | 11 +++++-----
.../bidimap/TestUnmodifiableSortedBidiMap.java | 11 +++++-----
.../commons/collections/buffer/TestAll.java | 11 +++++-----
.../collections/buffer/TestBlockingBuffer.java | 11 +++++-----
.../collections/buffer/TestBoundedBuffer.java | 11 +++++-----
.../buffer/TestBoundedFifoBuffer.java | 11 +++++-----
.../buffer/TestBoundedFifoBuffer2.java | 11 +++++-----
.../buffer/TestCircularFifoBuffer.java | 11 +++++-----
.../buffer/TestPredicatedBuffer.java | 11 +++++-----
.../collections/buffer/TestPriorityBuffer.java | 11 +++++-----
.../buffer/TestSynchronizedBuffer.java | 11 +++++-----
.../buffer/TestTransformedBuffer.java | 11 +++++-----
.../buffer/TestUnboundedFifoBuffer.java | 11 +++++-----
.../buffer/TestUnmodifiableBuffer.java | 11 +++++-----
.../collection/AbstractTestCollection.java | 11 +++++-----
.../commons/collections/collection/TestAll.java | 11 +++++-----
.../collection/TestCompositeCollection.java | 11 +++++-----
.../collection/TestPredicatedCollection.java | 11 +++++-----
.../collection/TestSynchronizedCollection.java | 11 +++++-----
.../collection/TestTransformedCollection.java | 11 +++++-----
.../collection/TestUnmodifiableCollection.java | 11 +++++-----
.../comparators/AbstractTestComparator.java | 11 +++++-----
.../collections/comparators/TestAll.java | 11 +++++-----
.../comparators/TestBooleanComparator.java | 11 +++++-----
.../comparators/TestComparableComparator.java | 11 +++++-----
.../comparators/TestComparatorChain.java | 11 +++++-----
.../comparators/TestFixedOrderComparator.java | 11 +++++-----
.../comparators/TestNullComparator.java | 11 +++++-----
.../comparators/TestReverseComparator.java | 11 +++++-----
.../iterators/AbstractTestIterator.java | 11 +++++-----
.../iterators/AbstractTestListIterator.java | 11 +++++-----
.../iterators/AbstractTestMapIterator.java | 11 +++++-----
.../AbstractTestOrderedMapIterator.java | 11 +++++-----
.../commons/collections/iterators/TestAll.java | 11 +++++-----
.../iterators/TestArrayIterator.java | 11 +++++-----
.../iterators/TestArrayIterator2.java | 11 +++++-----
.../iterators/TestArrayListIterator.java | 11 +++++-----
.../iterators/TestArrayListIterator2.java | 11 +++++-----
.../iterators/TestCollatingIterator.java | 11 +++++-----
.../iterators/TestFilterIterator.java | 11 +++++-----
.../iterators/TestFilterListIterator.java | 11 +++++-----
.../iterators/TestIteratorChain.java | 11 +++++-----
.../iterators/TestListIteratorWrapper.java | 11 +++++-----
.../iterators/TestLoopingIterator.java | 11 +++++-----
.../iterators/TestLoopingListIterator.java | 11 +++++-----
.../iterators/TestObjectArrayIterator.java | 11 +++++-----
.../iterators/TestObjectArrayListIterator.java | 11 +++++-----
.../iterators/TestObjectArrayListIterator2.java | 11 +++++-----
.../iterators/TestObjectGraphIterator.java | 11 +++++-----
.../iterators/TestReverseListIterator.java | 11 +++++-----
.../iterators/TestSingletonIterator.java | 11 +++++-----
.../iterators/TestSingletonIterator2.java | 11 +++++-----
.../iterators/TestSingletonListIterator.java | 11 +++++-----
.../iterators/TestUniqueFilterIterator.java | 11 +++++-----
.../iterators/TestUnmodifiableIterator.java | 11 +++++-----
.../iterators/TestUnmodifiableListIterator.java | 11 +++++-----
.../iterators/TestUnmodifiableMapIterator.java | 11 +++++-----
.../TestUnmodifiableOrderedMapIterator.java | 11 +++++-----
.../keyvalue/AbstractTestMapEntry.java | 11 +++++-----
.../commons/collections/keyvalue/TestAll.java | 11 +++++-----
.../keyvalue/TestDefaultKeyValue.java | 11 +++++-----
.../keyvalue/TestDefaultMapEntry.java | 11 +++++-----
.../collections/keyvalue/TestMultiKey.java | 11 +++++-----
.../collections/keyvalue/TestTiedMapEntry.java | 11 +++++-----
.../keyvalue/TestUnmodifiableMapEntry.java | 11 +++++-----
.../collections/list/AbstractTestList.java | 11 +++++-----
.../list/TestAbstractLinkedList.java | 11 +++++-----
.../commons/collections/list/TestAll.java | 11 +++++-----
.../list/TestCursorableLinkedList.java | 11 +++++-----
.../collections/list/TestFixedSizeList.java | 11 +++++-----
.../collections/list/TestGrowthList.java | 11 +++++-----
.../list/TestNodeCachingLinkedList.java | 11 +++++-----
.../collections/list/TestPredicatedList.java | 11 +++++-----
.../collections/list/TestSetUniqueList.java | 11 +++++-----
.../collections/list/TestSynchronizedList.java | 11 +++++-----
.../collections/list/TestTransformedList.java | 11 +++++-----
.../commons/collections/list/TestTreeList.java | 11 +++++-----
.../commons/collections/list/TestTypedList.java | 11 +++++-----
.../collections/list/TestUnmodifiableList.java | 11 +++++-----
.../map/AbstractTestIterableMap.java | 11 +++++-----
.../collections/map/AbstractTestMap.java | 11 +++++-----
.../collections/map/AbstractTestOrderedMap.java | 11 +++++-----
.../collections/map/AbstractTestSortedMap.java | 11 +++++-----
.../apache/commons/collections/map/TestAll.java | 11 +++++-----
.../collections/map/TestCaseInsensitiveMap.java | 11 +++++-----
.../collections/map/TestCompositeMap.java | 11 +++++-----
.../collections/map/TestDefaultedMap.java | 11 +++++-----
.../collections/map/TestFixedSizeMap.java | 11 +++++-----
.../collections/map/TestFixedSizeSortedMap.java | 11 +++++-----
.../commons/collections/map/TestFlat3Map.java | 11 +++++-----
.../commons/collections/map/TestHashedMap.java | 11 +++++-----
.../collections/map/TestIdentityMap.java | 11 +++++-----
.../commons/collections/map/TestLRUMap.java | 11 +++++-----
.../commons/collections/map/TestLazyMap.java | 11 +++++-----
.../collections/map/TestLazySortedMap.java | 13 ++++++------
.../commons/collections/map/TestLinkedMap.java | 11 +++++-----
.../collections/map/TestListOrderedMap.java | 11 +++++-----
.../collections/map/TestListOrderedMap2.java | 11 +++++-----
.../collections/map/TestMultiKeyMap.java | 11 +++++-----
.../collections/map/TestMultiValueMap.java | 21 ++++++++++----------
.../collections/map/TestPredicatedMap.java | 11 +++++-----
.../map/TestPredicatedSortedMap.java | 13 ++++++------
.../map/TestReferenceIdentityMap.java | 11 +++++-----
.../collections/map/TestReferenceMap.java | 11 +++++-----
.../collections/map/TestSingletonMap.java | 11 +++++-----
.../collections/map/TestStaticBucketMap.java | 11 +++++-----
.../collections/map/TestTransformedMap.java | 11 +++++-----
.../map/TestTransformedSortedMap.java | 11 +++++-----
.../collections/map/TestUnmodifiableMap.java | 11 +++++-----
.../map/TestUnmodifiableOrderedMap.java | 11 +++++-----
.../map/TestUnmodifiableSortedMap.java | 11 +++++-----
.../apache/commons/collections/overview.html | 15 +++++++-------
.../collections/set/AbstractTestSet.java | 11 +++++-----
.../collections/set/AbstractTestSortedSet.java | 11 +++++-----
.../apache/commons/collections/set/TestAll.java | 11 +++++-----
.../collections/set/TestCompositeSet.java | 11 +++++-----
.../collections/set/TestListOrderedSet.java | 11 +++++-----
.../collections/set/TestListOrderedSet2.java | 11 +++++-----
.../collections/set/TestMapBackedSet.java | 11 +++++-----
.../collections/set/TestMapBackedSet2.java | 11 +++++-----
.../collections/set/TestPredicatedSet.java | 11 +++++-----
.../set/TestPredicatedSortedSet.java | 11 +++++-----
.../collections/set/TestSynchronizedSet.java | 11 +++++-----
.../set/TestSynchronizedSortedSet.java | 11 +++++-----
.../collections/set/TestTransformedSet.java | 11 +++++-----
.../set/TestTransformedSortedSet.java | 11 +++++-----
.../commons/collections/set/TestTypedSet.java | 11 +++++-----
.../collections/set/TestTypedSortedSet.java | 11 +++++-----
.../collections/set/TestUnmodifiableSet.java | 11 +++++-----
.../set/TestUnmodifiableSortedSet.java | 11 +++++-----
195 files changed, 1179 insertions(+), 984 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/AbstractTestObject.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/AbstractTestObject.java b/src/test/org/apache/commons/collections/AbstractTestObject.java
index 7cf6dda..41647af 100644
--- a/src/test/org/apache/commons/collections/AbstractTestObject.java
+++ b/src/test/org/apache/commons/collections/AbstractTestObject.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/BulkTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/BulkTest.java b/src/test/org/apache/commons/collections/BulkTest.java
index 4a11685..092694f 100644
--- a/src/test/org/apache/commons/collections/BulkTest.java
+++ b/src/test/org/apache/commons/collections/BulkTest.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/LocalTestNode.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/LocalTestNode.java b/src/test/org/apache/commons/collections/LocalTestNode.java
index 5e7ab65..20dfdcd 100644
--- a/src/test/org/apache/commons/collections/LocalTestNode.java
+++ b/src/test/org/apache/commons/collections/LocalTestNode.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/MapPerformance.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/MapPerformance.java b/src/test/org/apache/commons/collections/MapPerformance.java
index 543629e..1ea9a5e 100644
--- a/src/test/org/apache/commons/collections/MapPerformance.java
+++ b/src/test/org/apache/commons/collections/MapPerformance.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestAll.java b/src/test/org/apache/commons/collections/TestAll.java
index 74f2635..734319f 100644
--- a/src/test/org/apache/commons/collections/TestAll.java
+++ b/src/test/org/apache/commons/collections/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestAllPackages.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestAllPackages.java b/src/test/org/apache/commons/collections/TestAllPackages.java
index 5d112f8..f081862 100644
--- a/src/test/org/apache/commons/collections/TestAllPackages.java
+++ b/src/test/org/apache/commons/collections/TestAllPackages.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestArrayList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/TestArrayList.java
index ffcdb91..200234b 100644
--- a/src/test/org/apache/commons/collections/TestArrayList.java
+++ b/src/test/org/apache/commons/collections/TestArrayList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestArrayStack.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestArrayStack.java b/src/test/org/apache/commons/collections/TestArrayStack.java
index 716fa2d..447f636 100644
--- a/src/test/org/apache/commons/collections/TestArrayStack.java
+++ b/src/test/org/apache/commons/collections/TestArrayStack.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestBagUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestBagUtils.java b/src/test/org/apache/commons/collections/TestBagUtils.java
index 234a7a1..309e21c 100644
--- a/src/test/org/apache/commons/collections/TestBagUtils.java
+++ b/src/test/org/apache/commons/collections/TestBagUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestBeanMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestBeanMap.java b/src/test/org/apache/commons/collections/TestBeanMap.java
index 8905a8d..06a53a9 100644
--- a/src/test/org/apache/commons/collections/TestBeanMap.java
+++ b/src/test/org/apache/commons/collections/TestBeanMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestBinaryHeap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestBinaryHeap.java b/src/test/org/apache/commons/collections/TestBinaryHeap.java
index 43ea2a6..04b8dff 100644
--- a/src/test/org/apache/commons/collections/TestBinaryHeap.java
+++ b/src/test/org/apache/commons/collections/TestBinaryHeap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
index b294e44..1acf2d8 100644
--- a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
index b0ade0b..e0235cf 100644
--- a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
+++ b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestBufferUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestBufferUtils.java b/src/test/org/apache/commons/collections/TestBufferUtils.java
index 9600da8..fdbbabe 100644
--- a/src/test/org/apache/commons/collections/TestBufferUtils.java
+++ b/src/test/org/apache/commons/collections/TestBufferUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestClosureUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestClosureUtils.java b/src/test/org/apache/commons/collections/TestClosureUtils.java
index f4dafd8..9c8c992 100644
--- a/src/test/org/apache/commons/collections/TestClosureUtils.java
+++ b/src/test/org/apache/commons/collections/TestClosureUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestCollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java
index e3a2d6f..38f992e 100644
--- a/src/test/org/apache/commons/collections/TestCollectionUtils.java
+++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
index 84dbae8..8be8a6d 100644
--- a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
+++ b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
index cf92be7..8606b77 100644
--- a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
+++ b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestEnumerationUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestEnumerationUtils.java b/src/test/org/apache/commons/collections/TestEnumerationUtils.java
index dda2b9b..64caa47 100644
--- a/src/test/org/apache/commons/collections/TestEnumerationUtils.java
+++ b/src/test/org/apache/commons/collections/TestEnumerationUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestExtendedProperties.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestExtendedProperties.java b/src/test/org/apache/commons/collections/TestExtendedProperties.java
index ab093c0..856c0dd 100644
--- a/src/test/org/apache/commons/collections/TestExtendedProperties.java
+++ b/src/test/org/apache/commons/collections/TestExtendedProperties.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFactoryUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFactoryUtils.java b/src/test/org/apache/commons/collections/TestFactoryUtils.java
index de783e1..e1b8f89 100644
--- a/src/test/org/apache/commons/collections/TestFactoryUtils.java
+++ b/src/test/org/apache/commons/collections/TestFactoryUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFastArrayList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFastArrayList.java b/src/test/org/apache/commons/collections/TestFastArrayList.java
index 25f8846..f41a4bb 100644
--- a/src/test/org/apache/commons/collections/TestFastArrayList.java
+++ b/src/test/org/apache/commons/collections/TestFastArrayList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFastArrayList1.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFastArrayList1.java b/src/test/org/apache/commons/collections/TestFastArrayList1.java
index fb97f5d..771371f 100644
--- a/src/test/org/apache/commons/collections/TestFastArrayList1.java
+++ b/src/test/org/apache/commons/collections/TestFastArrayList1.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFastHashMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFastHashMap.java b/src/test/org/apache/commons/collections/TestFastHashMap.java
index 4be82a0..d10319d 100644
--- a/src/test/org/apache/commons/collections/TestFastHashMap.java
+++ b/src/test/org/apache/commons/collections/TestFastHashMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFastHashMap1.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFastHashMap1.java b/src/test/org/apache/commons/collections/TestFastHashMap1.java
index cfbdb5b..5eda6b2 100644
--- a/src/test/org/apache/commons/collections/TestFastHashMap1.java
+++ b/src/test/org/apache/commons/collections/TestFastHashMap1.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFastTreeMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFastTreeMap.java b/src/test/org/apache/commons/collections/TestFastTreeMap.java
index 9462a63..45e5aee 100644
--- a/src/test/org/apache/commons/collections/TestFastTreeMap.java
+++ b/src/test/org/apache/commons/collections/TestFastTreeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestFastTreeMap1.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestFastTreeMap1.java b/src/test/org/apache/commons/collections/TestFastTreeMap1.java
index bb2a8d9..eae0375 100644
--- a/src/test/org/apache/commons/collections/TestFastTreeMap1.java
+++ b/src/test/org/apache/commons/collections/TestFastTreeMap1.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestHashBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestHashBag.java b/src/test/org/apache/commons/collections/TestHashBag.java
index eda31e2..6e21122 100644
--- a/src/test/org/apache/commons/collections/TestHashBag.java
+++ b/src/test/org/apache/commons/collections/TestHashBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestIteratorUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestIteratorUtils.java b/src/test/org/apache/commons/collections/TestIteratorUtils.java
index fbb5192..b61dded 100644
--- a/src/test/org/apache/commons/collections/TestIteratorUtils.java
+++ b/src/test/org/apache/commons/collections/TestIteratorUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestLRUMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestLRUMap.java b/src/test/org/apache/commons/collections/TestLRUMap.java
index c5db876..48347d9 100644
--- a/src/test/org/apache/commons/collections/TestLRUMap.java
+++ b/src/test/org/apache/commons/collections/TestLRUMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestLinkedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/TestLinkedList.java
index fe97623..c38120d 100644
--- a/src/test/org/apache/commons/collections/TestLinkedList.java
+++ b/src/test/org/apache/commons/collections/TestLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestListUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestListUtils.java b/src/test/org/apache/commons/collections/TestListUtils.java
index 2d0d16b..58cc040 100644
--- a/src/test/org/apache/commons/collections/TestListUtils.java
+++ b/src/test/org/apache/commons/collections/TestListUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestMapUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestMapUtils.java b/src/test/org/apache/commons/collections/TestMapUtils.java
index b240f2e..888cde4 100644
--- a/src/test/org/apache/commons/collections/TestMapUtils.java
+++ b/src/test/org/apache/commons/collections/TestMapUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestMultiHashMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
index 4b6fa26..722bec0 100644
--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
+++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestPredicateUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestPredicateUtils.java b/src/test/org/apache/commons/collections/TestPredicateUtils.java
index 0b21aef..0440ab5 100644
--- a/src/test/org/apache/commons/collections/TestPredicateUtils.java
+++ b/src/test/org/apache/commons/collections/TestPredicateUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestReferenceMap.java b/src/test/org/apache/commons/collections/TestReferenceMap.java
index 5b0c0ef..017f75d 100644
--- a/src/test/org/apache/commons/collections/TestReferenceMap.java
+++ b/src/test/org/apache/commons/collections/TestReferenceMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestSequencedHashMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestSequencedHashMap.java b/src/test/org/apache/commons/collections/TestSequencedHashMap.java
index 3720ea3..f48c630 100644
--- a/src/test/org/apache/commons/collections/TestSequencedHashMap.java
+++ b/src/test/org/apache/commons/collections/TestSequencedHashMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestSetUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestSetUtils.java b/src/test/org/apache/commons/collections/TestSetUtils.java
index 7e4a6ae..a19df85 100644
--- a/src/test/org/apache/commons/collections/TestSetUtils.java
+++ b/src/test/org/apache/commons/collections/TestSetUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestStaticBucketMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/TestStaticBucketMap.java
index 6dec918..2a9bcc5 100644
--- a/src/test/org/apache/commons/collections/TestStaticBucketMap.java
+++ b/src/test/org/apache/commons/collections/TestStaticBucketMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestTransformerUtils.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestTransformerUtils.java b/src/test/org/apache/commons/collections/TestTransformerUtils.java
index 61587e5..7afe81a 100644
--- a/src/test/org/apache/commons/collections/TestTransformerUtils.java
+++ b/src/test/org/apache/commons/collections/TestTransformerUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestTreeBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestTreeBag.java b/src/test/org/apache/commons/collections/TestTreeBag.java
index 1dc0067..59d83fb 100644
--- a/src/test/org/apache/commons/collections/TestTreeBag.java
+++ b/src/test/org/apache/commons/collections/TestTreeBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestTreeMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestTreeMap.java b/src/test/org/apache/commons/collections/TestTreeMap.java
index 74407a1..b44b035 100644
--- a/src/test/org/apache/commons/collections/TestTreeMap.java
+++ b/src/test/org/apache/commons/collections/TestTreeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestTypedCollection.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestTypedCollection.java b/src/test/org/apache/commons/collections/TestTypedCollection.java
index d353b35..2893b24 100644
--- a/src/test/org/apache/commons/collections/TestTypedCollection.java
+++ b/src/test/org/apache/commons/collections/TestTypedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
index 6462566..8f1b04d 100644
--- a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
index 419defb..5bcbf59 100644
--- a/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
+++ b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
index 36daee5..47df937 100644
--- a/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestAll.java b/src/test/org/apache/commons/collections/bag/TestAll.java
index ee9682c..0114eb0 100644
--- a/src/test/org/apache/commons/collections/bag/TestAll.java
+++ b/src/test/org/apache/commons/collections/bag/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestHashBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestHashBag.java b/src/test/org/apache/commons/collections/bag/TestHashBag.java
index a3a807e..d53aa23 100644
--- a/src/test/org/apache/commons/collections/bag/TestHashBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestHashBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
index 3a1d07f..160173d 100644
--- a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
index 087c030..793d659 100644
--- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
index f08497e..24145f9 100644
--- a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
index bc749b1..b886c3a 100644
--- a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestTreeBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestTreeBag.java b/src/test/org/apache/commons/collections/bag/TestTreeBag.java
index 296d1b9..6a9e042 100644
--- a/src/test/org/apache/commons/collections/bag/TestTreeBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTreeBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestTypedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestTypedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedBag.java
index 0c9b737..eebc15b 100644
--- a/src/test/org/apache/commons/collections/bag/TestTypedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTypedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
index 4a1141c..0d4a12d 100644
--- a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
index d5888b1..1df4d2f 100644
--- a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
index 3b13ab5..ced2978 100644
--- a/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
index 81daba2..405d04d 100644
--- a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
index 6d6427d..f324a00 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[21/34] commons-collections git commit: m1 build corrections
Posted by ch...@apache.org.
m1 build corrections
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@647180 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/e3bbfdf4
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/e3bbfdf4
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/e3bbfdf4
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: e3bbfdf4913ed0265a5039b0b6e45bf4e365d9a6
Parents: 7d97c86
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Fri Apr 11 14:29:05 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Fri Apr 11 14:29:05 2008 +0000
----------------------------------------------------------------------
maven.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/e3bbfdf4/maven.xml
----------------------------------------------------------------------
diff --git a/maven.xml b/maven.xml
index 171949b..2ca0bb8 100644
--- a/maven.xml
+++ b/maven.xml
@@ -75,6 +75,7 @@
<ant:copy todir="${maven.dist.bin.assembly.dir}">
<ant:fileset dir=".">
<ant:include name="RELEASE-NOTES.html"/>
+ <ant:include name="NOTICE.txt"/>
</ant:fileset>
</ant:copy>
@@ -110,13 +111,6 @@
</ant:fileset>
</ant:copy>
- <!-- Copy Jars -->
- <ant:copy todir="${maven.dist.src.assembly.dir}">
- <ant:fileset dir="${maven.build.dir}">
- <ant:include name="*.jar"/>
- </ant:fileset>
- </ant:copy>
-
<!-- Copy XDocs -->
<ant:copy todir="${maven.dist.src.assembly.dir}/xdocs">
<ant:fileset dir="xdocs" />
[15/34] commons-collections git commit: Merge in the build from the
trunk, finish updating license headers and prepare site for 3.2.1 release
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/navigation.xml
----------------------------------------------------------------------
diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml
index c857700..6db2b1a 100644
--- a/xdocs/navigation.xml
+++ b/xdocs/navigation.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2002-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -14,22 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM 'http://commons.apache.org/build/maven-build.dtd'>
<project name="Commons Collections">
<title>Commons Collections</title>
<body>
<links>
- <item name="Jakarta Commons" href="http://jakarta.apache.org/commons/"/>
+ <item name="Apache Commons" href="http://commons.apache.org/"/>
</links>
<menu name="Commons Collections">
<item name="Overview" href="/index.html"/>
- <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-collections.cgi"/>
+ <item name="Download" href="http://commons.apache.org/downloads/download_collections.cgi"/>
<item name="User guide" href="/userguide.html"/>
<item name="History" href="/history.html"/>
- <item name="Javadoc (3.2 release)" href="api-release/index.html"/>
+ <item name="Javadoc (3.2.1 release)" href="api-release/index.html"/>
</menu>
<menu name="Development">
@@ -38,7 +39,7 @@
<item name="Team" href="/team-list.html"/>
<item name="Tasks" href="/tasks.html"/>
<item name="Proposal" href="/proposal.html"/>
- <item name="SVN repository" href="http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/collections/trunk/"/>
+ <item name="SVN repository" href="http://svn.apache.org/viewvc/commons/proper/collections/trunk/"/>
<item name="Javadoc (SVN latest)" href="apidocs/index.html"/>
</menu>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/pick.xml
----------------------------------------------------------------------
diff --git a/xdocs/pick.xml b/xdocs/pick.xml
index 46bc791..4aa2531 100644
--- a/xdocs/pick.xml
+++ b/xdocs/pick.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -19,7 +20,7 @@
<properties>
<title>Choosing a collection</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
@@ -89,19 +90,19 @@ For example you could convert a country code to text <i>but not</i> text to coun
<h3>BidiMap interface</h3>
<p>
-The <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/BidiMap.html">BidiMap</a> interface and implementations in Commons Collections allow you to lookup data in both directions. There are three implementations:
+The <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/BidiMap.html">BidiMap</a> interface and implementations in Commons Collections allow you to lookup data in both directions. There are three implementations:
<table>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualHashBidiMap.html">DualHashBidiMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualHashBidiMap.html">DualHashBidiMap</a></td>
<td>Uses two <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/HashMap.html">HashMap</a> objects internally. This implementation is a useful general purpose BidiMap that can store any object. The objects are stored in any order, and the order may change over time.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualTreeBidiMap.html">DualTreeBidiMap</a></td>
-<td>Uses two <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/TreeMap.html">TreeMap</a> objects internally which means that keys and values must implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html">Comparable</a>, unless a comparator is supplied. If considering this class, the TreeBidiMap is usually a better choice. However, this is the only implementation of the <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/SortedBidiMap.html">SortedBidiMap</a> interface.</td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/DualTreeBidiMap.html">DualTreeBidiMap</a></td>
+<td>Uses two <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/TreeMap.html">TreeMap</a> objects internally which means that keys and values must implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html">Comparable</a>, unless a comparator is supplied. If considering this class, the TreeBidiMap is usually a better choice. However, this is the only implementation of the <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/SortedBidiMap.html">SortedBidiMap</a> interface.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/TreeBidiMap.html">TreeBidiMap</a></td>
-<td>Dedicated implementation that requires keys and values to implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html">Comparable</a>, unless a comparator is supplied. This is an efficient implementation using a data structure that avoids duplicating data. The keys and values are held and viewed in sorted order, and the class implements the <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/OrderedBidiMap.html">OrderedBidiMap</a> interface.</td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/bidimap/TreeBidiMap.html">TreeBidiMap</a></td>
+<td>Dedicated implementation that requires keys and values to implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html">Comparable</a>, unless a comparator is supplied. This is an efficient implementation using a data structure that avoids duplicating data. The keys and values are held and viewed in sorted order, and the class implements the <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/OrderedBidiMap.html">OrderedBidiMap</a> interface.</td>
</tr>
</table>
</p>
@@ -119,11 +120,11 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html">Map</a> i
<td>This map is the most commonly used and fastest implementation. It is suitable for most situations and can store any object. Objects are stored in any order, and the order may change over time.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/HashedMap.html">HashedMap</a></td>
-<td>The Commons Collections hash map implementation which is very similar in design to HashMap, but also supports easy iteration via a <a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/MapIterator.html">MapIterator</a>. This implementation is also designed to be subclassed. Use this map if you want to use the extra iterator, or to subclass. Otherwise, there is no advantage (or disadvantage) compared to the JDK HashMap.</td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/HashedMap.html">HashedMap</a></td>
+<td>The Commons Collections hash map implementation which is very similar in design to HashMap, but also supports easy iteration via a <a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/MapIterator.html">MapIterator</a>. This implementation is also designed to be subclassed. Use this map if you want to use the extra iterator, or to subclass. Otherwise, there is no advantage (or disadvantage) compared to the JDK HashMap.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/IdentityMap.html">IdentityMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/IdentityMap.html">IdentityMap</a></td>
<td>This map operates exactly as per HashedMap but compares keys and values using == not .equals().</td>
</tr>
<tr>
@@ -135,7 +136,7 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html">Map</a> i
<td>This map ensures that the keys are always sorted, and iteration order is consistent. All keys must implement <a href="http://java.sun.com/j2se/1.4/docs/api/java/lang/Comparable.html">Comparable</a>, unless a comparator is supplied. This map should be used if you need the map to be sorted.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LinkedMap.html">LinkedMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LinkedMap.html">LinkedMap</a></td>
<td>This map maintains the order that each object is added to the map. When the map is viewed via an iterator, the insertion order will be seen. This map should be used if you need to retain the insertion order.</td>
</tr>
<tr>
@@ -143,15 +144,15 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html">Map</a> i
<td>This map, available from JDK 1.4, maintains the order that each object is added to the map. When the map is viewed via an iterator, the insertion order will be seen. Commons collections' LinkedMap provides the same functionality for JDK1.2 onwards and provides a MapIterator.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ListOrderedMap.html">ListOrderedMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ListOrderedMap.html">ListOrderedMap</a></td>
<td>This map decorates another map to maintains the order that each object is added to the map. The order is maintained using a list. This map should be used if you need to retain the insertion order but you also need the special features of another map.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LRUMap.html">LRUMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/LRUMap.html">LRUMap</a></td>
<td>This map places a maximum size limit on the map and removes the least recently used (LRU) key-value when it is full. This map should be used for caches where you want to limit the maximum memory size used, and are happy with the least recently used algorithm for removals.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceMap.html">ReferenceMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceMap.html">ReferenceMap</a></td>
<td>This map enables keys and values to be garbage collected whilst still held in the map. This can be useful for building memory sensitive caches. This map should be used for caches where you want to allow garbage collection from the map.</td>
</tr>
<tr>
@@ -159,19 +160,19 @@ The <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/Map.html">Map</a> i
<td>This map stores each key-value pair with a key that can be garbage collected. This can be useful for building memory sensitive caches. ReferenceMap provides the same functionality but with much more flexibility.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceIdentityMap.html">ReferenceIdentityMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/ReferenceIdentityMap.html">ReferenceIdentityMap</a></td>
<td>This map operates exactly as per ReferenceMap but compares keys and values using == not .equals().</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/SingletonMap.html">SingletonMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/SingletonMap.html">SingletonMap</a></td>
<td>This map is restricted to storing one key-value pair. It may contain no more than and no less than one pair. It provides a MapIterator. This map should be used if you want to return one key-value pair and must use the Map interface.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/Flat3Map.html">Flat3Map</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/Flat3Map.html">Flat3Map</a></td>
<td>This map is optimised to store one, two or three key-value pairs and outperforms HashMap at these sizes. For size four and above performance is about 5% slower than HashMap. This map also has good garbage collection characteristics when below size four. It provides a MapIterator. This map should be used if are 99% sure that the map will be size three or less.</td>
</tr>
<tr>
-<td><a href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/StaticBucketMap.html">StaticBucketMap</a></td>
+<td><a href="http://commons.apache.org/collections/apidocs-COLLECTIONS_3_1/org/apache/commons/collections/map/StaticBucketMap.html">StaticBucketMap</a></td>
<td>This map is optimised to work well in a heavily loaded multi-threaded environment. It provides synchronization internally, locking on a per 'bucket' basis, where the buckets are fixed at construction time. You should use this class if you can predict the size of the map and you are working in a very intensive multi-threaded environment.</td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/proposal.xml
----------------------------------------------------------------------
diff --git a/xdocs/proposal.xml b/xdocs/proposal.xml
index d16b9be..e3300e1 100644
--- a/xdocs/proposal.xml
+++ b/xdocs/proposal.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0"?>
+<!--
+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.
+-->
<document>
<properties>
<title>Proposal</title>
@@ -45,7 +62,7 @@
production deployment. It utilizes the JUnit unit testing framework for
developing and executing unit tests, but this is of interest only to
developers of the component. Collections will also be a dependency for
-several future proposed components for the Jakarta Commons subproject. </p>
+several future proposed components for the Apache Commons subproject. </p>
<p>No external configuration files are utilized.</p>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/release_3_2.xml
----------------------------------------------------------------------
diff --git a/xdocs/release_3_2.xml b/xdocs/release_3_2.xml
index b3e78b6..f56871c 100644
--- a/xdocs/release_3_2.xml
+++ b/xdocs/release_3_2.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!--
-Copyright 2006 The Apache Software Foundation.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+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
@@ -17,7 +18,7 @@ limitations under the License.
<document>
<properties>
<title>Release notes for v3.2</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/release_3_2_1.xml
----------------------------------------------------------------------
diff --git a/xdocs/release_3_2_1.xml b/xdocs/release_3_2_1.xml
new file mode 100644
index 0000000..bba96e2
--- /dev/null
+++ b/xdocs/release_3_2_1.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+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.
+-->
+<document>
+ <properties>
+ <title>Release notes for v3.2.1</title>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Release notes for v3.2.1">
+<p>
+These are the release notes for Commons Collections v3.2.1:
+</p>
+<hr />
+<p>
+Commons collections is a project to develop and maintain collection classes
+based on and inspired by the JDK collection framework.
+This project is JDK1.2 compatible, and does not use JDK1.5 generics.
+</p>
+<p>
+This v3.2.1 release is simply a re-packaging of the v3.2 release, with appropriate
+OSGi meta data added to the jar's manifest file.
+</p>
+<hr />
+
+<center><h3>COMPATIBILITY</h3></center>
+<p>
+This release is fully source and binary compatible with v3.2. For changes since the
+v3.1 see the <a href="release_3_2.html">v3.2 Release Notes</a>.
+</p>
+</section>
+
+</body>
+</document>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/style/project.css
----------------------------------------------------------------------
diff --git a/xdocs/style/project.css b/xdocs/style/project.css
index 0130204..c1d541c 100644
--- a/xdocs/style/project.css
+++ b/xdocs/style/project.css
@@ -1 +1 @@
-@import url("http://jakarta.apache.org/style/jakarta-maven.css");
+@import url("http://commons.apache.org/style/commons-maven.css");
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/tasks.xml
----------------------------------------------------------------------
diff --git a/xdocs/tasks.xml b/xdocs/tasks.xml
index e82a989..4b212e9 100644
--- a/xdocs/tasks.xml
+++ b/xdocs/tasks.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<!--
- Copyright 2003-2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -19,7 +20,7 @@
<properties>
<title>Tasks outstanding</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/d9d85d17/xdocs/userguide.xml
----------------------------------------------------------------------
diff --git a/xdocs/userguide.xml b/xdocs/userguide.xml
index 95701a5..544d64a 100644
--- a/xdocs/userguide.xml
+++ b/xdocs/userguide.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 2003-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -19,7 +20,7 @@
<properties>
<title>User guide</title>
- <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
</properties>
<body>
[18/34] commons-collections git commit: Remove tab characters
Posted by ch...@apache.org.
Remove tab characters
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@647116 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/cba26a15
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/cba26a15
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/cba26a15
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: cba26a1583d8c2296a82ad647c58cc5698171de3
Parents: 2cad4a1
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Fri Apr 11 11:23:08 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Fri Apr 11 11:23:08 2008 +0000
----------------------------------------------------------------------
.../collections/CursorableLinkedList.java | 28 ++++++------
.../commons/collections/PredicateUtils.java | 2 +-
.../collections/comparators/NullComparator.java | 2 +-
.../collections/iterators/ArrayIterator.java | 4 +-
.../iterators/ArrayListIterator.java | 2 +-
.../collections/iterators/IteratorChain.java | 2 +-
.../iterators/ObjectArrayListIterator.java | 2 +-
.../iterators/ObjectGraphIterator.java | 2 +-
.../iterators/SingletonIterator.java | 2 +-
.../commons/collections/map/CompositeMap.java | 48 ++++++++++----------
10 files changed, 47 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/CursorableLinkedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/CursorableLinkedList.java b/src/java/org/apache/commons/collections/CursorableLinkedList.java
index 0abe4ed..bc420ca 100644
--- a/src/java/org/apache/commons/collections/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/collections/CursorableLinkedList.java
@@ -78,11 +78,11 @@ public class CursorableLinkedList implements List, Serializable {
* @param element element to be inserted.
*
* @throws ClassCastException if the class of the specified element
- * prevents it from being added to this list.
+ * prevents it from being added to this list.
* @throws IllegalArgumentException if some aspect of the specified
- * element prevents it from being added to this list.
+ * element prevents it from being added to this list.
* @throws IndexOutOfBoundsException if the index is out of range
- * (index < 0 || index > size()).
+ * (index < 0 || index > size()).
*/
public void add(int index, Object element) {
if(index == _size) {
@@ -109,7 +109,7 @@ public class CursorableLinkedList implements List, Serializable {
* @return <tt>true</tt> if this list changed as a result of the call.
*
* @throws ClassCastException if the class of an element in the specified
- * collection prevents it from being added to this list.
+ * collection prevents it from being added to this list.
* @throws IllegalArgumentException if some aspect of an element in the
* specified collection prevents it from being added to this
* list.
@@ -137,18 +137,18 @@ public class CursorableLinkedList implements List, Serializable {
* collection is this list, and it's nonempty.)
*
* @param index index at which to insert first element from the specified
- * collection.
+ * collection.
* @param c elements to be inserted into this list.
* @return <tt>true</tt> if this list changed as a result of the call.
*
* @throws ClassCastException if the class of one of elements of the
- * specified collection prevents it from being added to this
- * list.
+ * specified collection prevents it from being added to this
+ * list.
* @throws IllegalArgumentException if some aspect of one of elements of
* the specified collection prevents it from being added to
* this list.
* @throws IndexOutOfBoundsException if the index is out of range (index
- * < 0 || index > size()).
+ * < 0 || index > size()).
*/
public boolean addAll(int index, Collection c) {
if(c.isEmpty()) {
@@ -291,7 +291,7 @@ public class CursorableLinkedList implements List, Serializable {
* @see #listIterator(int)
* @see CursorableLinkedList.Cursor
* @throws IndexOutOfBoundsException if the index is out of range (index
- * < 0 || index > size()).
+ * < 0 || index > size()).
*/
public CursorableLinkedList.Cursor cursor(int i) {
return new Cursor(i);
@@ -333,7 +333,7 @@ public class CursorableLinkedList implements List, Serializable {
* @return the element at the specified position in this list.
*
* @throws IndexOutOfBoundsException if the index is out of range (index
- * < 0 || index >= size()).
+ * < 0 || index >= size()).
*/
public Object get(int index) {
return getListableAt(index).value();
@@ -450,7 +450,7 @@ public class CursorableLinkedList implements List, Serializable {
*
* @param o element to search for.
* @return the index in this list of the last occurrence of the specified
- * element, or -1 if this list does not contain this element.
+ * element, or -1 if this list does not contain this element.
*/
public int lastIndexOf(Object o) {
int ndx = _size-1;
@@ -617,11 +617,11 @@ public class CursorableLinkedList implements List, Serializable {
* @return the element previously at the specified position.
*
* @throws ClassCastException if the class of the specified element
- * prevents it from being added to this list.
+ * prevents it from being added to this list.
* @throws IllegalArgumentException if some aspect of the specified
- * element prevents it from being added to this list.
+ * element prevents it from being added to this list.
* @throws IndexOutOfBoundsException if the index is out of range
- * (index < 0 || index >= size()).
+ * (index < 0 || index >= size()).
*/
public Object set(int index, Object element) {
Listable elt = getListableAt(index);
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/PredicateUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/PredicateUtils.java b/src/java/org/apache/commons/collections/PredicateUtils.java
index 9561d6b..193637f 100644
--- a/src/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/java/org/apache/commons/collections/PredicateUtils.java
@@ -527,7 +527,7 @@ public class PredicateUtils {
* @param predicate the predicate to call with the result of the transform
* @return the predicate
* @throws IllegalArgumentException if the transformer or the predicate is null
- * @since Commons Collections 3.1
+ * @since Commons Collections 3.1
*/
public static Predicate transformedPredicate(Transformer transformer, Predicate predicate) {
return TransformedPredicate.getInstance(transformer, predicate);
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/comparators/NullComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/NullComparator.java b/src/java/org/apache/commons/collections/comparators/NullComparator.java
index b6cd8ed..d52c6db 100644
--- a/src/java/org/apache/commons/collections/comparators/NullComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/NullComparator.java
@@ -168,7 +168,7 @@ public class NullComparator implements Comparator, Serializable {
if(!obj.getClass().equals(this.getClass())) { return false; }
NullComparator other = (NullComparator)obj;
-
+
return ((this.nullsAreHigh == other.nullsAreHigh) &&
(this.nonNullComparator.equals(other.nonNullComparator)));
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
index c81abd5..7f6e52d 100644
--- a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
@@ -48,9 +48,9 @@ public class ArrayIterator implements ResettableIterator {
/** The start index to loop from */
protected int startIndex = 0;
/** The end index to loop to */
- protected int endIndex = 0;
+ protected int endIndex = 0;
/** The current iterator index */
- protected int index = 0;
+ protected int index = 0;
// Constructors
// ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
index 1567ee4..75e29c2 100644
--- a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
@@ -45,7 +45,7 @@ import org.apache.commons.collections.ResettableListIterator;
* @author Phil Steitz
*/
public class ArrayListIterator extends ArrayIterator
- implements ListIterator, ResettableListIterator {
+ implements ListIterator, ResettableListIterator {
/**
* Holds the index of the last item returned by a call to <code>next()</code>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/iterators/IteratorChain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
index 890634d..25d92c8 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -50,7 +50,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
*/
public class IteratorChain implements Iterator {
- /** The chain of iterators */
+ /** The chain of iterators */
protected final List iteratorChain = new ArrayList();
/** The index of the current iterator */
protected int currentIteratorIndex = 0;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
index c148100..662a28c 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
@@ -42,7 +42,7 @@ import org.apache.commons.collections.ResettableListIterator;
* @author Phil Steitz
*/
public class ObjectArrayListIterator extends ObjectArrayIterator
- implements ListIterator, ResettableListIterator {
+ implements ListIterator, ResettableListIterator {
/**
* Holds the index of the last item returned by a call to <code>next()</code>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
index 3c60393..9f0da86 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
@@ -79,7 +79,7 @@ public class ObjectGraphIterator implements Iterator {
/** The stack of iterators */
protected final ArrayStack stack = new ArrayStack(8);
- /** The root object in the tree */
+ /** The root object in the tree */
protected Object root;
/** The transformer to use */
protected Transformer transformer;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
index bd594c2..9726f4f 100644
--- a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.ResettableIterator;
* @author Rodney Waldhoff
*/
public class SingletonIterator
- implements Iterator, ResettableIterator {
+ implements Iterator, ResettableIterator {
/** Whether remove is allowed */
private final boolean removeAllowed;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/cba26a15/src/java/org/apache/commons/collections/map/CompositeMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/CompositeMap.java b/src/java/org/apache/commons/collections/map/CompositeMap.java
index c1a2f17..7fa3c46 100644
--- a/src/java/org/apache/commons/collections/map/CompositeMap.java
+++ b/src/java/org/apache/commons/collections/map/CompositeMap.java
@@ -185,7 +185,7 @@ public class CompositeMap implements Map {
* key.
*
* @throws ClassCastException if the key is of an inappropriate type for
- * this map (optional).
+ * this map (optional).
* @throws NullPointerException if the key is <tt>null</tt> and this map
* does not not permit <tt>null</tt> keys (optional).
*/
@@ -210,7 +210,7 @@ public class CompositeMap implements Map {
* @return <tt>true</tt> if this map maps one or more keys to the
* specified value.
* @throws ClassCastException if the value is of an inappropriate type for
- * this map (optional).
+ * this map (optional).
* @throws NullPointerException if the value is <tt>null</tt> and this map
* does not not permit <tt>null</tt> values (optional).
*/
@@ -263,12 +263,12 @@ public class CompositeMap implements Map {
*
* @param key key whose associated value is to be returned.
* @return the value to which this map maps the specified key, or
- * <tt>null</tt> if the map contains no mapping for this key.
+ * <tt>null</tt> if the map contains no mapping for this key.
*
* @throws ClassCastException if the key is of an inappropriate type for
- * this map (optional).
+ * this map (optional).
* @throws NullPointerException key is <tt>null</tt> and this map does not
- * not permit <tt>null</tt> keys (optional).
+ * not permit <tt>null</tt> keys (optional).
*
* @see #containsKey(Object)
*/
@@ -329,16 +329,16 @@ public class CompositeMap implements Map {
* @param key key with which the specified value is to be associated.
* @param value value to be associated with the specified key.
* @return previous value associated with specified key, or <tt>null</tt>
- * if there was no mapping for key. A <tt>null</tt> return can
- * also indicate that the map previously associated <tt>null</tt>
- * with the specified key, if the implementation supports
- * <tt>null</tt> values.
+ * if there was no mapping for key. A <tt>null</tt> return can
+ * also indicate that the map previously associated <tt>null</tt>
+ * with the specified key, if the implementation supports
+ * <tt>null</tt> values.
*
* @throws UnsupportedOperationException if no MapMutator has been specified
* @throws ClassCastException if the class of the specified key or value
- * prevents it from being stored in this map.
+ * prevents it from being stored in this map.
* @throws IllegalArgumentException if some aspect of this key or value
- * prevents it from being stored in this map.
+ * prevents it from being stored in this map.
* @throws NullPointerException this map does not permit <tt>null</tt>
* keys or values, and the specified key or value is
* <tt>null</tt>.
@@ -361,13 +361,13 @@ public class CompositeMap implements Map {
* @param map Mappings to be stored in this map.
*
* @throws UnsupportedOperationException if the <tt>putAll</tt> method is
- * not supported by this map.
+ * not supported by this map.
*
* @throws ClassCastException if the class of a key or value in the
- * specified map prevents it from being stored in this map.
+ * specified map prevents it from being stored in this map.
*
* @throws IllegalArgumentException some aspect of a key or value in the
- * specified map prevents it from being stored in this map.
+ * specified map prevents it from being stored in this map.
* @throws NullPointerException the specified map is <tt>null</tt>, or if
* this map does not permit <tt>null</tt> keys or values, and the
* specified map contains <tt>null</tt> keys or values.
@@ -395,10 +395,10 @@ public class CompositeMap implements Map {
*
* @param key key whose mapping is to be removed from the map.
* @return previous value associated with specified key, or <tt>null</tt>
- * if there was no mapping for key.
+ * if there was no mapping for key.
*
* @throws ClassCastException if the key is of an inappropriate type for
- * the composited map (optional).
+ * the composited map (optional).
* @throws NullPointerException if the key is <tt>null</tt> and the composited map
* does not not permit <tt>null</tt> keys (optional).
* @throws UnsupportedOperationException if the <tt>remove</tt> method is
@@ -501,16 +501,16 @@ public class CompositeMap implements Map {
* @param key key with which the specified value is to be associated.
* @param value value to be associated with the specified key.
* @return previous value associated with specified key, or <tt>null</tt>
- * if there was no mapping for key. A <tt>null</tt> return can
- * also indicate that the map previously associated <tt>null</tt>
- * with the specified key, if the implementation supports
- * <tt>null</tt> values.
+ * if there was no mapping for key. A <tt>null</tt> return can
+ * also indicate that the map previously associated <tt>null</tt>
+ * with the specified key, if the implementation supports
+ * <tt>null</tt> values.
*
* @throws UnsupportedOperationException if not defined
* @throws ClassCastException if the class of the specified key or value
- * prevents it from being stored in this map.
+ * prevents it from being stored in this map.
* @throws IllegalArgumentException if some aspect of this key or value
- * prevents it from being stored in this map.
+ * prevents it from being stored in this map.
* @throws NullPointerException this map does not permit <tt>null</tt>
* keys or values, and the specified key or value is
* <tt>null</tt>.
@@ -526,9 +526,9 @@ public class CompositeMap implements Map {
*
* @throws UnsupportedOperationException if not defined
* @throws ClassCastException if the class of the specified key or value
- * prevents it from being stored in this map.
+ * prevents it from being stored in this map.
* @throws IllegalArgumentException if some aspect of this key or value
- * prevents it from being stored in this map.
+ * prevents it from being stored in this map.
* @throws NullPointerException this map does not permit <tt>null</tt>
* keys or values, and the specified key or value is
* <tt>null</tt>.
[30/34] commons-collections git commit: PR: COLLECTIONS-332
Documented the dependency of ListOrderedMap on the standard Map contract of
using equals() and hashCode().
Posted by ch...@apache.org.
PR: COLLECTIONS-332
Documented the dependency of ListOrderedMap on the standard Map contract of using equals() and hashCode().
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1079578 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/1c23c026
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/1c23c026
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/1c23c026
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 1c23c026ff3d37408364c9e4a735ea2970b96770
Parents: a5f5ec9
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 8 22:21:32 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 8 22:21:32 2011 +0000
----------------------------------------------------------------------
.../apache/commons/collections/map/ListOrderedMap.java | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/1c23c026/src/java/org/apache/commons/collections/map/ListOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
index 09d3262..8b76e16 100644
--- a/src/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
@@ -59,16 +59,6 @@ import org.apache.commons.collections.list.UnmodifiableList;
* using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
* exceptions when accessed by concurrent threads without synchronization.
* <p>
- * <strong>Note that ListOrderedMap doesn't work with {@link IdentityMap},
- * {@link CaseInsensitiveMap}, or similar maps that violate the general
- * contract of {@link java.util.Map}.</strong> The <code>ListOrderedMap</code>
- * (or, more precisely, the underlying <code>List</code>) is relying on
- * {@link Object#java.lang.equals(Object) equals()}. This is fine, as long as the
- * decorated <code>Map</code> is also based on {@link Object#equals(Object) equals()},
- * and {@link Object#hashCode() hashCode()}, which {@link IdentityMap}, and
- * {@link CaseInsensitiveMap} don't: The former uses <code>==</code>, and
- * the latter uses {@link Object#equals(Object) equals()} on a lowercased
- * key.
* <p>
* This class is Serializable from Commons Collections 3.1.
*
[34/34] commons-collections git commit: Obsolete DOAP
Posted by ch...@apache.org.
Obsolete DOAP
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1719132 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/a0721ed9
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/a0721ed9
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/a0721ed9
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: a0721ed91ba36cbd32bc457c57062b8f1d6f1754
Parents: 27707a8
Author: Sebastian Bazley <se...@apache.org>
Authored: Thu Dec 10 18:11:03 2015 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Thu Dec 10 18:11:03 2015 +0000
----------------------------------------------------------------------
doap_collections.rdf | 34 ----------------------------------
1 file changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0721ed9/doap_collections.rdf
----------------------------------------------------------------------
diff --git a/doap_collections.rdf b/doap_collections.rdf
deleted file mode 100644
index 1606231..0000000
--- a/doap_collections.rdf
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:doap="http://usefulinc.com/ns/doap#" xml:lang="en">
- <Project rdf:about="http://jakarta.apache.org/commons/collections/">
- <name>Apache Jakarta Commons Collections</name>
- <homepage rdf:resource="http://jakarta.apache.org/commons/collections/"/>
- <programming-language>Java</programming-language>
- <category rdf:resource="http://projects.apache.org/category/library"/>
- <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
- <bug-database rdf:resource="http://issues.apache.org/bugzilla/buglist.cgi?product=Commons&component=collections"/>
- <download-page rdf:resource="http://jakarta.apache.org/site/downloads/downloads_commons-collections.cgi"/>
- <asfext:pmc rdf:resource="http://jakarta.apache.org/"/>
- <shortdesc xml:lang="en">Commons Collections</shortdesc>
- <description xml:lang="en">Types that extend and augment the Java Collections Framework.</description>
- <repository>
- <SVNRepository>
- <browse rdf:resource="http://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk"/>
- <location rdf:resource="http://svn.apache.org/repos/asf/jakarta/commons/proper/collections"/>
- </SVNRepository>
- </repository>
- <release>
- <revision>
- <name>commons-collections</name>
- <created>2004-06-23</created>
- <version>3.1</version>
- </revision>
- <revision>
- <name>commons-collections</name>
- <created>2004-06-23</created>
- <version>2.1.1</version>
- </revision>
- </release>
- <mailing-list rdf:resource="http://jakarta.apache.org/site/mail2.html#Commons"/>
- </Project>
-</rdf:RDF>
[32/34] commons-collections git commit: PR: COLLECTIONS-323
Submitted-By: Maarten Brak Allow to use an initial
capacity of 0 on certain maps.
Posted by ch...@apache.org.
PR: COLLECTIONS-323
Submitted-By: Maarten Brak <ma...@quinity.com>
Allow to use an initial capacity of 0 on certain maps.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1079602 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/a0603b15
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/a0603b15
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/a0603b15
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: a0603b1547ca7ad946b8d2ca87cec7116158a4c1
Parents: ef4dd46
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 8 23:37:01 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 8 23:37:01 2011 +0000
----------------------------------------------------------------------
pom.xml | 5 ++++-
.../apache/commons/collections/map/AbstractHashedMap.java | 10 +++++-----
.../apache/commons/collections/map/AbstractLinkedMap.java | 4 ++--
.../commons/collections/map/CaseInsensitiveMap.java | 4 ++--
.../org/apache/commons/collections/map/HashedMap.java | 4 ++--
.../org/apache/commons/collections/map/IdentityMap.java | 4 ++--
.../org/apache/commons/collections/map/LinkedMap.java | 4 ++--
.../commons/collections/map/TestCaseInsensitiveMap.java | 8 ++++++++
.../org/apache/commons/collections/map/TestHashedMap.java | 8 ++++++++
.../apache/commons/collections/map/TestIdentityMap.java | 8 ++++++++
.../org/apache/commons/collections/map/TestLinkedMap.java | 8 ++++++++
11 files changed, 51 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5c4a6d8..d26330a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,12 +148,15 @@
<name>Janek Bogucki</name>
</contributor>
<contributor>
- <name>Chuck Burdick</name>
+ <name>Maarten Brak</name>
</contributor>
<contributor>
<name>Dave Bryson</name>
</contributor>
<contributor>
+ <name>Chuck Burdick</name>
+ </contributor>
+ <contributor>
<name>Julien Buret</name>
</contributor>
<contributor>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
index d1e1a61..739548d 100644
--- a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
@@ -123,7 +123,7 @@ public class AbstractHashedMap extends AbstractMap implements IterableMap {
* default load factor.
*
* @param initialCapacity the initial capacity
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
*/
protected AbstractHashedMap(int initialCapacity) {
this(initialCapacity, DEFAULT_LOAD_FACTOR);
@@ -135,13 +135,13 @@ public class AbstractHashedMap extends AbstractMap implements IterableMap {
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is less than one
- * @throws IllegalArgumentException if the load factor is less than or equal to zero
+ * @throws IlleagalArgumentException if the initial capacity is negative
+ * @throws IllegalArgumentException if the load factor is less than or equal to zero
*/
protected AbstractHashedMap(int initialCapacity, float loadFactor) {
super();
- if (initialCapacity < 1) {
- throw new IllegalArgumentException("Initial capacity must be greater than 0");
+ if (initialCapacity < 0) {
+ throw new IllegalArgumentException("Initial capacity must be a non negative number");
}
if (loadFactor <= 0.0f || Float.isNaN(loadFactor)) {
throw new IllegalArgumentException("Load factor must be greater than 0");
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
index a5cfbe7..8248727 100644
--- a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
@@ -90,7 +90,7 @@ public class AbstractLinkedMap extends AbstractHashedMap implements OrderedMap {
* Constructs a new, empty map with the specified initial capacity.
*
* @param initialCapacity the initial capacity
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
*/
protected AbstractLinkedMap(int initialCapacity) {
super(initialCapacity);
@@ -102,7 +102,7 @@ public class AbstractLinkedMap extends AbstractHashedMap implements OrderedMap {
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
* @throws IllegalArgumentException if the load factor is less than zero
*/
protected AbstractLinkedMap(int initialCapacity, float loadFactor) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
index 2674349..9690cd3 100644
--- a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
+++ b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
@@ -78,7 +78,7 @@ public class CaseInsensitiveMap extends AbstractHashedMap implements Serializabl
* Constructs a new, empty map with the specified initial capacity.
*
* @param initialCapacity the initial capacity
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
*/
public CaseInsensitiveMap(int initialCapacity) {
super(initialCapacity);
@@ -90,7 +90,7 @@ public class CaseInsensitiveMap extends AbstractHashedMap implements Serializabl
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
* @throws IllegalArgumentException if the load factor is less than zero
*/
public CaseInsensitiveMap(int initialCapacity, float loadFactor) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/java/org/apache/commons/collections/map/HashedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/HashedMap.java b/src/java/org/apache/commons/collections/map/HashedMap.java
index f208b40..5300033 100644
--- a/src/java/org/apache/commons/collections/map/HashedMap.java
+++ b/src/java/org/apache/commons/collections/map/HashedMap.java
@@ -58,7 +58,7 @@ public class HashedMap
* Constructs a new, empty map with the specified initial capacity.
*
* @param initialCapacity the initial capacity
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
*/
public HashedMap(int initialCapacity) {
super(initialCapacity);
@@ -70,7 +70,7 @@ public class HashedMap
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
* @throws IllegalArgumentException if the load factor is less than zero
*/
public HashedMap(int initialCapacity, float loadFactor) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/java/org/apache/commons/collections/map/IdentityMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/IdentityMap.java b/src/java/org/apache/commons/collections/map/IdentityMap.java
index ee1fa3d..88979f5 100644
--- a/src/java/org/apache/commons/collections/map/IdentityMap.java
+++ b/src/java/org/apache/commons/collections/map/IdentityMap.java
@@ -60,7 +60,7 @@ public class IdentityMap
* Constructs a new, empty map with the specified initial capacity.
*
* @param initialCapacity the initial capacity
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
*/
public IdentityMap(int initialCapacity) {
super(initialCapacity);
@@ -72,7 +72,7 @@ public class IdentityMap
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
* @throws IllegalArgumentException if the load factor is less than zero
*/
public IdentityMap(int initialCapacity, float loadFactor) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/java/org/apache/commons/collections/map/LinkedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/LinkedMap.java b/src/java/org/apache/commons/collections/map/LinkedMap.java
index 682f3dc..1b170e7 100644
--- a/src/java/org/apache/commons/collections/map/LinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/LinkedMap.java
@@ -79,7 +79,7 @@ public class LinkedMap
* Constructs a new, empty map with the specified initial capacity.
*
* @param initialCapacity the initial capacity
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
*/
public LinkedMap(int initialCapacity) {
super(initialCapacity);
@@ -91,7 +91,7 @@ public class LinkedMap
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @throws IllegalArgumentException if the initial capacity is less than one
+ * @throws IllegalArgumentException if the initial capacity is negative
* @throws IllegalArgumentException if the load factor is less than zero
*/
public LinkedMap(int initialCapacity, float loadFactor) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
index b3f27a5..e4eb6bf 100644
--- a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
+++ b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
@@ -117,4 +117,12 @@ public class TestCaseInsensitiveMap extends AbstractTestIterableMap {
writeExternalFormToDisk((java.io.Serializable) map, "/home/phil/jakarta-commons/collections/data/test/CaseInsensitiveMap.fullCollection.version3.obj");
}
*/
+
+ /**
+ * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
+ */
+ public void testInitialCapacityZero() {
+ final CaseInsensitiveMap map = new CaseInsensitiveMap(0);
+ assertEquals(1, map.data.length);
+ }
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/test/org/apache/commons/collections/map/TestHashedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestHashedMap.java b/src/test/org/apache/commons/collections/map/TestHashedMap.java
index 49d2678..8eb7d81 100644
--- a/src/test/org/apache/commons/collections/map/TestHashedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestHashedMap.java
@@ -75,4 +75,12 @@ public class TestHashedMap extends AbstractTestIterableMap {
// resetFull();
// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/HashedMap.fullCollection.version3.obj");
// }
+
+ /**
+ * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
+ */
+ public void testInitialCapacityZero() {
+ final HashedMap map = new HashedMap(0);
+ assertEquals(1, map.data.length);
+ }
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/test/org/apache/commons/collections/map/TestIdentityMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
index b1e6c4e..c668fb0 100644
--- a/src/test/org/apache/commons/collections/map/TestIdentityMap.java
+++ b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
@@ -143,4 +143,12 @@ public class TestIdentityMap extends AbstractTestObject {
// map.put(I2A, I2B);
// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/IdentityMap.fullCollection.version3.obj");
// }
+
+ /**
+ * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
+ */
+ public void testInitialCapacityZero() {
+ final IdentityMap map = new IdentityMap(0);
+ assertEquals(1, map.data.length);
+ }
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a0603b15/src/test/org/apache/commons/collections/map/TestLinkedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestLinkedMap.java b/src/test/org/apache/commons/collections/map/TestLinkedMap.java
index a1d1c16..20fd169 100644
--- a/src/test/org/apache/commons/collections/map/TestLinkedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLinkedMap.java
@@ -272,4 +272,12 @@ public class TestLinkedMap extends AbstractTestOrderedMap {
// resetFull();
// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/LinkedMap.fullCollection.version3.obj");
// }
+
+ /**
+ * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
+ */
+ public void testInitialCapacityZero() {
+ final LinkedMap map = new LinkedMap(0);
+ assertEquals(1, map.data.length);
+ }
}
[05/34] commons-collections git commit: Create 3.2 Branch
Posted by ch...@apache.org.
Create 3.2 Branch
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@646391 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/2a5aaa63
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/2a5aaa63
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/2a5aaa63
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 2a5aaa6378b1207b4443f07b31482276b8124736
Parents: 8792072
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Wed Apr 9 14:55:59 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Wed Apr 9 14:55:59 2008 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
Fix license headers to conform to current policy
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@646777 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/392d63a6
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/392d63a6
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/392d63a6
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 392d63a6ebf58117b1df243e35721e27937f9b8a
Parents: 2a5aaa6
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Thu Apr 10 12:33:15 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Thu Apr 10 12:33:15 2008 +0000
----------------------------------------------------------------------
.../org/apache/commons/collections/ArrayStack.java | 11 ++++++-----
src/java/org/apache/commons/collections/Bag.java | 11 ++++++-----
src/java/org/apache/commons/collections/BagUtils.java | 11 ++++++-----
src/java/org/apache/commons/collections/BeanMap.java | 11 ++++++-----
src/java/org/apache/commons/collections/BidiMap.java | 11 ++++++-----
.../org/apache/commons/collections/BinaryHeap.java | 11 ++++++-----
.../apache/commons/collections/BoundedCollection.java | 11 ++++++-----
.../apache/commons/collections/BoundedFifoBuffer.java | 11 ++++++-----
.../org/apache/commons/collections/BoundedMap.java | 11 ++++++-----
src/java/org/apache/commons/collections/Buffer.java | 11 ++++++-----
.../commons/collections/BufferOverflowException.java | 11 ++++++-----
.../commons/collections/BufferUnderflowException.java | 11 ++++++-----
.../org/apache/commons/collections/BufferUtils.java | 11 ++++++-----
src/java/org/apache/commons/collections/Closure.java | 11 ++++++-----
.../org/apache/commons/collections/ClosureUtils.java | 11 ++++++-----
.../apache/commons/collections/CollectionUtils.java | 11 ++++++-----
.../apache/commons/collections/ComparatorUtils.java | 11 ++++++-----
.../commons/collections/CursorableLinkedList.java | 11 ++++++-----
.../org/apache/commons/collections/DefaultMapBag.java | 11 ++++++-----
.../apache/commons/collections/DefaultMapEntry.java | 11 ++++++-----
.../apache/commons/collections/DoubleOrderedMap.java | 11 ++++++-----
.../apache/commons/collections/EnumerationUtils.java | 11 ++++++-----
.../apache/commons/collections/ExtendedProperties.java | 11 ++++++-----
src/java/org/apache/commons/collections/Factory.java | 11 ++++++-----
.../org/apache/commons/collections/FactoryUtils.java | 11 ++++++-----
.../org/apache/commons/collections/FastArrayList.java | 11 ++++++-----
.../org/apache/commons/collections/FastHashMap.java | 11 ++++++-----
.../org/apache/commons/collections/FastTreeMap.java | 11 ++++++-----
.../apache/commons/collections/FunctorException.java | 11 ++++++-----
src/java/org/apache/commons/collections/HashBag.java | 11 ++++++-----
.../org/apache/commons/collections/IterableMap.java | 11 ++++++-----
.../org/apache/commons/collections/IteratorUtils.java | 11 ++++++-----
src/java/org/apache/commons/collections/KeyValue.java | 11 ++++++-----
src/java/org/apache/commons/collections/LRUMap.java | 11 ++++++-----
src/java/org/apache/commons/collections/ListUtils.java | 11 ++++++-----
.../org/apache/commons/collections/MapIterator.java | 11 ++++++-----
src/java/org/apache/commons/collections/MapUtils.java | 11 ++++++-----
.../org/apache/commons/collections/MultiHashMap.java | 11 ++++++-----
src/java/org/apache/commons/collections/MultiMap.java | 11 ++++++-----
.../org/apache/commons/collections/OrderedBidiMap.java | 11 ++++++-----
.../apache/commons/collections/OrderedIterator.java | 11 ++++++-----
.../org/apache/commons/collections/OrderedMap.java | 11 ++++++-----
.../apache/commons/collections/OrderedMapIterator.java | 11 ++++++-----
src/java/org/apache/commons/collections/Predicate.java | 11 ++++++-----
.../org/apache/commons/collections/PredicateUtils.java | 11 ++++++-----
.../org/apache/commons/collections/PriorityQueue.java | 11 ++++++-----
src/java/org/apache/commons/collections/ProxyMap.java | 11 ++++++-----
.../org/apache/commons/collections/ReferenceMap.java | 11 ++++++-----
.../apache/commons/collections/ResettableIterator.java | 11 ++++++-----
.../commons/collections/ResettableListIterator.java | 11 ++++++-----
.../apache/commons/collections/SequencedHashMap.java | 11 ++++++-----
src/java/org/apache/commons/collections/SetUtils.java | 11 ++++++-----
src/java/org/apache/commons/collections/SortedBag.java | 11 ++++++-----
.../org/apache/commons/collections/SortedBidiMap.java | 11 ++++++-----
.../apache/commons/collections/StaticBucketMap.java | 11 ++++++-----
.../commons/collections/SynchronizedPriorityQueue.java | 11 ++++++-----
.../org/apache/commons/collections/Transformer.java | 11 ++++++-----
.../apache/commons/collections/TransformerUtils.java | 11 ++++++-----
src/java/org/apache/commons/collections/TreeBag.java | 11 ++++++-----
.../commons/collections/UnboundedFifoBuffer.java | 11 ++++++-----
.../org/apache/commons/collections/Unmodifiable.java | 11 ++++++-----
.../commons/collections/bag/AbstractBagDecorator.java | 11 ++++++-----
.../apache/commons/collections/bag/AbstractMapBag.java | 11 ++++++-----
.../collections/bag/AbstractSortedBagDecorator.java | 11 ++++++-----
.../org/apache/commons/collections/bag/HashBag.java | 11 ++++++-----
.../apache/commons/collections/bag/PredicatedBag.java | 11 ++++++-----
.../commons/collections/bag/PredicatedSortedBag.java | 11 ++++++-----
.../commons/collections/bag/SynchronizedBag.java | 11 ++++++-----
.../commons/collections/bag/SynchronizedSortedBag.java | 11 ++++++-----
.../apache/commons/collections/bag/TransformedBag.java | 11 ++++++-----
.../commons/collections/bag/TransformedSortedBag.java | 11 ++++++-----
.../org/apache/commons/collections/bag/TreeBag.java | 11 ++++++-----
.../org/apache/commons/collections/bag/TypedBag.java | 11 ++++++-----
.../apache/commons/collections/bag/TypedSortedBag.java | 11 ++++++-----
.../commons/collections/bag/UnmodifiableBag.java | 11 ++++++-----
.../commons/collections/bag/UnmodifiableSortedBag.java | 11 ++++++-----
.../org/apache/commons/collections/bag/package.html | 11 ++++++-----
.../collections/bidimap/AbstractBidiMapDecorator.java | 11 ++++++-----
.../collections/bidimap/AbstractDualBidiMap.java | 11 ++++++-----
.../bidimap/AbstractOrderedBidiMapDecorator.java | 11 ++++++-----
.../bidimap/AbstractSortedBidiMapDecorator.java | 11 ++++++-----
.../commons/collections/bidimap/DualHashBidiMap.java | 11 ++++++-----
.../commons/collections/bidimap/DualTreeBidiMap.java | 11 ++++++-----
.../commons/collections/bidimap/TreeBidiMap.java | 11 ++++++-----
.../collections/bidimap/UnmodifiableBidiMap.java | 11 ++++++-----
.../bidimap/UnmodifiableOrderedBidiMap.java | 11 ++++++-----
.../collections/bidimap/UnmodifiableSortedBidiMap.java | 11 ++++++-----
.../apache/commons/collections/bidimap/package.html | 11 ++++++-----
.../collections/buffer/AbstractBufferDecorator.java | 11 ++++++-----
.../commons/collections/buffer/BlockingBuffer.java | 11 ++++++-----
.../commons/collections/buffer/BoundedBuffer.java | 11 ++++++-----
.../commons/collections/buffer/BoundedFifoBuffer.java | 11 ++++++-----
.../commons/collections/buffer/CircularFifoBuffer.java | 11 ++++++-----
.../commons/collections/buffer/PredicatedBuffer.java | 11 ++++++-----
.../commons/collections/buffer/PriorityBuffer.java | 11 ++++++-----
.../commons/collections/buffer/SynchronizedBuffer.java | 11 ++++++-----
.../commons/collections/buffer/TransformedBuffer.java | 11 ++++++-----
.../apache/commons/collections/buffer/TypedBuffer.java | 11 ++++++-----
.../collections/buffer/UnboundedFifoBuffer.java | 11 ++++++-----
.../commons/collections/buffer/UnmodifiableBuffer.java | 11 ++++++-----
.../org/apache/commons/collections/buffer/package.html | 11 ++++++-----
.../collection/AbstractCollectionDecorator.java | 11 ++++++-----
.../AbstractSerializableCollectionDecorator.java | 11 ++++++-----
.../collections/collection/CompositeCollection.java | 11 ++++++-----
.../collections/collection/PredicatedCollection.java | 11 ++++++-----
.../collections/collection/SynchronizedCollection.java | 11 ++++++-----
.../collections/collection/TransformedCollection.java | 11 ++++++-----
.../collections/collection/TypedCollection.java | 11 ++++++-----
.../collection/UnmodifiableBoundedCollection.java | 11 ++++++-----
.../collections/collection/UnmodifiableCollection.java | 11 ++++++-----
.../apache/commons/collections/collection/package.html | 11 ++++++-----
.../collections/comparators/BooleanComparator.java | 11 ++++++-----
.../collections/comparators/ComparableComparator.java | 11 ++++++-----
.../collections/comparators/ComparatorChain.java | 11 ++++++-----
.../collections/comparators/FixedOrderComparator.java | 11 ++++++-----
.../collections/comparators/NullComparator.java | 11 ++++++-----
.../collections/comparators/ReverseComparator.java | 11 ++++++-----
.../comparators/TransformingComparator.java | 11 ++++++-----
.../commons/collections/comparators/package.html | 11 ++++++-----
.../commons/collections/functors/AllPredicate.java | 11 ++++++-----
.../commons/collections/functors/AndPredicate.java | 11 ++++++-----
.../commons/collections/functors/AnyPredicate.java | 11 ++++++-----
.../commons/collections/functors/ChainedClosure.java | 11 ++++++-----
.../collections/functors/ChainedTransformer.java | 11 ++++++-----
.../commons/collections/functors/CloneTransformer.java | 11 ++++++-----
.../collections/functors/ClosureTransformer.java | 11 ++++++-----
.../commons/collections/functors/ConstantFactory.java | 11 ++++++-----
.../collections/functors/ConstantTransformer.java | 11 ++++++-----
.../commons/collections/functors/EqualPredicate.java | 11 ++++++-----
.../commons/collections/functors/ExceptionClosure.java | 11 ++++++-----
.../commons/collections/functors/ExceptionFactory.java | 11 ++++++-----
.../collections/functors/ExceptionPredicate.java | 11 ++++++-----
.../collections/functors/ExceptionTransformer.java | 11 ++++++-----
.../collections/functors/FactoryTransformer.java | 11 ++++++-----
.../commons/collections/functors/FalsePredicate.java | 11 ++++++-----
.../commons/collections/functors/ForClosure.java | 11 ++++++-----
.../commons/collections/functors/FunctorUtils.java | 11 ++++++-----
.../collections/functors/IdentityPredicate.java | 11 ++++++-----
.../apache/commons/collections/functors/IfClosure.java | 11 ++++++-----
.../collections/functors/InstanceofPredicate.java | 11 ++++++-----
.../collections/functors/InstantiateFactory.java | 11 ++++++-----
.../collections/functors/InstantiateTransformer.java | 11 ++++++-----
.../collections/functors/InvokerTransformer.java | 11 ++++++-----
.../commons/collections/functors/MapTransformer.java | 11 ++++++-----
.../commons/collections/functors/NOPClosure.java | 11 ++++++-----
.../commons/collections/functors/NOPTransformer.java | 11 ++++++-----
.../commons/collections/functors/NonePredicate.java | 11 ++++++-----
.../commons/collections/functors/NotNullPredicate.java | 11 ++++++-----
.../commons/collections/functors/NotPredicate.java | 11 ++++++-----
.../collections/functors/NullIsExceptionPredicate.java | 11 ++++++-----
.../collections/functors/NullIsFalsePredicate.java | 11 ++++++-----
.../collections/functors/NullIsTruePredicate.java | 11 ++++++-----
.../commons/collections/functors/NullPredicate.java | 11 ++++++-----
.../commons/collections/functors/OnePredicate.java | 11 ++++++-----
.../commons/collections/functors/OrPredicate.java | 11 ++++++-----
.../collections/functors/PredicateDecorator.java | 11 ++++++-----
.../collections/functors/PredicateTransformer.java | 11 ++++++-----
.../commons/collections/functors/PrototypeFactory.java | 11 ++++++-----
.../collections/functors/StringValueTransformer.java | 11 ++++++-----
.../commons/collections/functors/SwitchClosure.java | 11 ++++++-----
.../collections/functors/SwitchTransformer.java | 11 ++++++-----
.../collections/functors/TransformedPredicate.java | 11 ++++++-----
.../collections/functors/TransformerClosure.java | 11 ++++++-----
.../collections/functors/TransformerPredicate.java | 11 ++++++-----
.../commons/collections/functors/TruePredicate.java | 11 ++++++-----
.../commons/collections/functors/UniquePredicate.java | 11 ++++++-----
.../commons/collections/functors/WhileClosure.java | 11 ++++++-----
.../apache/commons/collections/functors/package.html | 11 ++++++-----
.../collections/iterators/AbstractEmptyIterator.java | 11 ++++++-----
.../iterators/AbstractIteratorDecorator.java | 11 ++++++-----
.../iterators/AbstractListIteratorDecorator.java | 11 ++++++-----
.../iterators/AbstractMapIteratorDecorator.java | 11 ++++++-----
.../iterators/AbstractOrderedMapIteratorDecorator.java | 11 ++++++-----
.../commons/collections/iterators/ArrayIterator.java | 11 ++++++-----
.../collections/iterators/ArrayListIterator.java | 11 ++++++-----
.../collections/iterators/CollatingIterator.java | 11 ++++++-----
.../commons/collections/iterators/EmptyIterator.java | 11 ++++++-----
.../collections/iterators/EmptyListIterator.java | 11 ++++++-----
.../collections/iterators/EmptyMapIterator.java | 11 ++++++-----
.../collections/iterators/EmptyOrderedIterator.java | 11 ++++++-----
.../collections/iterators/EmptyOrderedMapIterator.java | 11 ++++++-----
.../collections/iterators/EntrySetMapIterator.java | 11 ++++++-----
.../collections/iterators/EnumerationIterator.java | 11 ++++++-----
.../commons/collections/iterators/FilterIterator.java | 11 ++++++-----
.../collections/iterators/FilterListIterator.java | 11 ++++++-----
.../commons/collections/iterators/IteratorChain.java | 11 ++++++-----
.../collections/iterators/IteratorEnumeration.java | 11 ++++++-----
.../collections/iterators/ListIteratorWrapper.java | 11 ++++++-----
.../commons/collections/iterators/LoopingIterator.java | 11 ++++++-----
.../collections/iterators/LoopingListIterator.java | 11 ++++++-----
.../collections/iterators/ObjectArrayIterator.java | 11 ++++++-----
.../collections/iterators/ObjectArrayListIterator.java | 11 ++++++-----
.../collections/iterators/ObjectGraphIterator.java | 11 ++++++-----
.../commons/collections/iterators/ProxyIterator.java | 11 ++++++-----
.../collections/iterators/ProxyListIterator.java | 11 ++++++-----
.../collections/iterators/ReverseListIterator.java | 11 ++++++-----
.../collections/iterators/SingletonIterator.java | 11 ++++++-----
.../collections/iterators/SingletonListIterator.java | 11 ++++++-----
.../collections/iterators/TransformIterator.java | 11 ++++++-----
.../collections/iterators/UniqueFilterIterator.java | 11 ++++++-----
.../collections/iterators/UnmodifiableIterator.java | 11 ++++++-----
.../iterators/UnmodifiableListIterator.java | 11 ++++++-----
.../collections/iterators/UnmodifiableMapIterator.java | 11 ++++++-----
.../iterators/UnmodifiableOrderedMapIterator.java | 11 ++++++-----
.../apache/commons/collections/iterators/package.html | 11 ++++++-----
.../commons/collections/keyvalue/AbstractKeyValue.java | 11 ++++++-----
.../commons/collections/keyvalue/AbstractMapEntry.java | 11 ++++++-----
.../keyvalue/AbstractMapEntryDecorator.java | 11 ++++++-----
.../commons/collections/keyvalue/DefaultKeyValue.java | 11 ++++++-----
.../commons/collections/keyvalue/DefaultMapEntry.java | 11 ++++++-----
.../apache/commons/collections/keyvalue/MultiKey.java | 11 ++++++-----
.../commons/collections/keyvalue/TiedMapEntry.java | 11 ++++++-----
.../collections/keyvalue/UnmodifiableMapEntry.java | 11 ++++++-----
.../apache/commons/collections/keyvalue/package.html | 11 ++++++-----
.../commons/collections/list/AbstractLinkedList.java | 11 ++++++-----
.../collections/list/AbstractListDecorator.java | 11 ++++++-----
.../list/AbstractSerializableListDecorator.java | 11 ++++++-----
.../commons/collections/list/CursorableLinkedList.java | 11 ++++++-----
.../apache/commons/collections/list/FixedSizeList.java | 11 ++++++-----
.../apache/commons/collections/list/GrowthList.java | 11 ++++++-----
.../org/apache/commons/collections/list/LazyList.java | 11 ++++++-----
.../collections/list/NodeCachingLinkedList.java | 11 ++++++-----
.../commons/collections/list/PredicatedList.java | 11 ++++++-----
.../apache/commons/collections/list/SetUniqueList.java | 11 ++++++-----
.../commons/collections/list/SynchronizedList.java | 11 ++++++-----
.../commons/collections/list/TransformedList.java | 11 ++++++-----
.../org/apache/commons/collections/list/TreeList.java | 11 ++++++-----
.../org/apache/commons/collections/list/TypedList.java | 11 ++++++-----
.../commons/collections/list/UnmodifiableList.java | 11 ++++++-----
.../org/apache/commons/collections/list/package.html | 11 ++++++-----
.../commons/collections/map/AbstractHashedMap.java | 11 ++++++-----
.../map/AbstractInputCheckedMapDecorator.java | 11 ++++++-----
.../commons/collections/map/AbstractLinkedMap.java | 11 ++++++-----
.../commons/collections/map/AbstractMapDecorator.java | 11 ++++++-----
.../collections/map/AbstractOrderedMapDecorator.java | 11 ++++++-----
.../commons/collections/map/AbstractReferenceMap.java | 11 ++++++-----
.../collections/map/AbstractSortedMapDecorator.java | 11 ++++++-----
.../commons/collections/map/CaseInsensitiveMap.java | 11 ++++++-----
.../apache/commons/collections/map/CompositeMap.java | 11 ++++++-----
.../apache/commons/collections/map/DefaultedMap.java | 11 ++++++-----
.../apache/commons/collections/map/FixedSizeMap.java | 11 ++++++-----
.../commons/collections/map/FixedSizeSortedMap.java | 11 ++++++-----
.../org/apache/commons/collections/map/Flat3Map.java | 11 ++++++-----
.../org/apache/commons/collections/map/HashedMap.java | 11 ++++++-----
.../apache/commons/collections/map/IdentityMap.java | 11 ++++++-----
.../org/apache/commons/collections/map/LRUMap.java | 11 ++++++-----
.../org/apache/commons/collections/map/LazyMap.java | 11 ++++++-----
.../apache/commons/collections/map/LazySortedMap.java | 11 ++++++-----
.../org/apache/commons/collections/map/LinkedMap.java | 11 ++++++-----
.../apache/commons/collections/map/ListOrderedMap.java | 11 ++++++-----
.../apache/commons/collections/map/MultiKeyMap.java | 11 ++++++-----
.../apache/commons/collections/map/MultiValueMap.java | 11 ++++++-----
.../apache/commons/collections/map/PredicatedMap.java | 11 ++++++-----
.../commons/collections/map/PredicatedSortedMap.java | 11 ++++++-----
.../commons/collections/map/ReferenceIdentityMap.java | 11 ++++++-----
.../apache/commons/collections/map/ReferenceMap.java | 11 ++++++-----
.../apache/commons/collections/map/SingletonMap.java | 11 ++++++-----
.../commons/collections/map/StaticBucketMap.java | 11 ++++++-----
.../apache/commons/collections/map/TransformedMap.java | 11 ++++++-----
.../commons/collections/map/TransformedSortedMap.java | 11 ++++++-----
.../org/apache/commons/collections/map/TypedMap.java | 11 ++++++-----
.../apache/commons/collections/map/TypedSortedMap.java | 11 ++++++-----
.../commons/collections/map/UnmodifiableEntrySet.java | 11 ++++++-----
.../commons/collections/map/UnmodifiableMap.java | 11 ++++++-----
.../collections/map/UnmodifiableOrderedMap.java | 11 ++++++-----
.../commons/collections/map/UnmodifiableSortedMap.java | 11 ++++++-----
.../org/apache/commons/collections/map/package.html | 11 ++++++-----
src/java/org/apache/commons/collections/overview.html | 13 +++++++------
src/java/org/apache/commons/collections/package.html | 11 ++++++-----
.../set/AbstractSerializableSetDecorator.java | 11 ++++++-----
.../commons/collections/set/AbstractSetDecorator.java | 11 ++++++-----
.../collections/set/AbstractSortedSetDecorator.java | 11 ++++++-----
.../apache/commons/collections/set/CompositeSet.java | 11 ++++++-----
.../apache/commons/collections/set/ListOrderedSet.java | 11 ++++++-----
.../apache/commons/collections/set/MapBackedSet.java | 11 ++++++-----
.../apache/commons/collections/set/PredicatedSet.java | 11 ++++++-----
.../commons/collections/set/PredicatedSortedSet.java | 11 ++++++-----
.../commons/collections/set/SynchronizedSet.java | 11 ++++++-----
.../commons/collections/set/SynchronizedSortedSet.java | 11 ++++++-----
.../apache/commons/collections/set/TransformedSet.java | 11 ++++++-----
.../commons/collections/set/TransformedSortedSet.java | 11 ++++++-----
.../org/apache/commons/collections/set/TypedSet.java | 11 ++++++-----
.../apache/commons/collections/set/TypedSortedSet.java | 11 ++++++-----
.../commons/collections/set/UnmodifiableSet.java | 11 ++++++-----
.../commons/collections/set/UnmodifiableSortedSet.java | 11 ++++++-----
.../org/apache/commons/collections/set/package.html | 11 ++++++-----
286 files changed, 1717 insertions(+), 1431 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ArrayStack.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ArrayStack.java b/src/java/org/apache/commons/collections/ArrayStack.java
index 2bd77b6..ae192a9 100644
--- a/src/java/org/apache/commons/collections/ArrayStack.java
+++ b/src/java/org/apache/commons/collections/ArrayStack.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Bag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Bag.java b/src/java/org/apache/commons/collections/Bag.java
index 18750d5..d5f77c7 100644
--- a/src/java/org/apache/commons/collections/Bag.java
+++ b/src/java/org/apache/commons/collections/Bag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BagUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BagUtils.java b/src/java/org/apache/commons/collections/BagUtils.java
index 0fa921a..4642cbe 100644
--- a/src/java/org/apache/commons/collections/BagUtils.java
+++ b/src/java/org/apache/commons/collections/BagUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BeanMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BeanMap.java b/src/java/org/apache/commons/collections/BeanMap.java
index a4ec1c0..2bf5938 100644
--- a/src/java/org/apache/commons/collections/BeanMap.java
+++ b/src/java/org/apache/commons/collections/BeanMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BidiMap.java b/src/java/org/apache/commons/collections/BidiMap.java
index aaddef2..384929c 100644
--- a/src/java/org/apache/commons/collections/BidiMap.java
+++ b/src/java/org/apache/commons/collections/BidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BinaryHeap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BinaryHeap.java b/src/java/org/apache/commons/collections/BinaryHeap.java
index 22d23ee..92d3860 100644
--- a/src/java/org/apache/commons/collections/BinaryHeap.java
+++ b/src/java/org/apache/commons/collections/BinaryHeap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BoundedCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BoundedCollection.java b/src/java/org/apache/commons/collections/BoundedCollection.java
index 773c61e..0326aad 100644
--- a/src/java/org/apache/commons/collections/BoundedCollection.java
+++ b/src/java/org/apache/commons/collections/BoundedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
index 71007c6..33ba9f8 100644
--- a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BoundedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BoundedMap.java b/src/java/org/apache/commons/collections/BoundedMap.java
index 385fe8d..a98bd0b 100644
--- a/src/java/org/apache/commons/collections/BoundedMap.java
+++ b/src/java/org/apache/commons/collections/BoundedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Buffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Buffer.java b/src/java/org/apache/commons/collections/Buffer.java
index 900d42c..d1a228b 100644
--- a/src/java/org/apache/commons/collections/Buffer.java
+++ b/src/java/org/apache/commons/collections/Buffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BufferOverflowException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BufferOverflowException.java b/src/java/org/apache/commons/collections/BufferOverflowException.java
index 9c17d5a..cadecc5 100644
--- a/src/java/org/apache/commons/collections/BufferOverflowException.java
+++ b/src/java/org/apache/commons/collections/BufferOverflowException.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BufferUnderflowException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BufferUnderflowException.java b/src/java/org/apache/commons/collections/BufferUnderflowException.java
index 8f700ed..b0d5647 100644
--- a/src/java/org/apache/commons/collections/BufferUnderflowException.java
+++ b/src/java/org/apache/commons/collections/BufferUnderflowException.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/BufferUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/BufferUtils.java b/src/java/org/apache/commons/collections/BufferUtils.java
index 802e0ef..eb8b157 100644
--- a/src/java/org/apache/commons/collections/BufferUtils.java
+++ b/src/java/org/apache/commons/collections/BufferUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Closure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Closure.java b/src/java/org/apache/commons/collections/Closure.java
index 9475df9..2743ff9 100644
--- a/src/java/org/apache/commons/collections/Closure.java
+++ b/src/java/org/apache/commons/collections/Closure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ClosureUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ClosureUtils.java b/src/java/org/apache/commons/collections/ClosureUtils.java
index 734354b..12e4cd3 100644
--- a/src/java/org/apache/commons/collections/ClosureUtils.java
+++ b/src/java/org/apache/commons/collections/ClosureUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/CollectionUtils.java b/src/java/org/apache/commons/collections/CollectionUtils.java
index 43a2f0c..3b736b4 100644
--- a/src/java/org/apache/commons/collections/CollectionUtils.java
+++ b/src/java/org/apache/commons/collections/CollectionUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ComparatorUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ComparatorUtils.java b/src/java/org/apache/commons/collections/ComparatorUtils.java
index b6f8bfb..eb6f205 100644
--- a/src/java/org/apache/commons/collections/ComparatorUtils.java
+++ b/src/java/org/apache/commons/collections/ComparatorUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/CursorableLinkedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/CursorableLinkedList.java b/src/java/org/apache/commons/collections/CursorableLinkedList.java
index f2b6dde..0abe4ed 100644
--- a/src/java/org/apache/commons/collections/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/collections/CursorableLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/DefaultMapBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/DefaultMapBag.java b/src/java/org/apache/commons/collections/DefaultMapBag.java
index 8097358..8ba7b68 100644
--- a/src/java/org/apache/commons/collections/DefaultMapBag.java
+++ b/src/java/org/apache/commons/collections/DefaultMapBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/DefaultMapEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/DefaultMapEntry.java b/src/java/org/apache/commons/collections/DefaultMapEntry.java
index 3d6b5b0..dc461a3 100644
--- a/src/java/org/apache/commons/collections/DefaultMapEntry.java
+++ b/src/java/org/apache/commons/collections/DefaultMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/DoubleOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/DoubleOrderedMap.java b/src/java/org/apache/commons/collections/DoubleOrderedMap.java
index e444aae..e7f4464 100644
--- a/src/java/org/apache/commons/collections/DoubleOrderedMap.java
+++ b/src/java/org/apache/commons/collections/DoubleOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/EnumerationUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/EnumerationUtils.java b/src/java/org/apache/commons/collections/EnumerationUtils.java
index 1fc5487..7741fab 100644
--- a/src/java/org/apache/commons/collections/EnumerationUtils.java
+++ b/src/java/org/apache/commons/collections/EnumerationUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ExtendedProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ExtendedProperties.java b/src/java/org/apache/commons/collections/ExtendedProperties.java
index ab66e26..da420bc 100644
--- a/src/java/org/apache/commons/collections/ExtendedProperties.java
+++ b/src/java/org/apache/commons/collections/ExtendedProperties.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Factory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Factory.java b/src/java/org/apache/commons/collections/Factory.java
index 08c4f97..af4fe1c 100644
--- a/src/java/org/apache/commons/collections/Factory.java
+++ b/src/java/org/apache/commons/collections/Factory.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/FactoryUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/FactoryUtils.java b/src/java/org/apache/commons/collections/FactoryUtils.java
index a4aeb56..c8b2e72 100644
--- a/src/java/org/apache/commons/collections/FactoryUtils.java
+++ b/src/java/org/apache/commons/collections/FactoryUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/FastArrayList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/FastArrayList.java b/src/java/org/apache/commons/collections/FastArrayList.java
index 53403c5..4b11bc4 100644
--- a/src/java/org/apache/commons/collections/FastArrayList.java
+++ b/src/java/org/apache/commons/collections/FastArrayList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/FastHashMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/FastHashMap.java b/src/java/org/apache/commons/collections/FastHashMap.java
index 04b4e37..274770a 100644
--- a/src/java/org/apache/commons/collections/FastHashMap.java
+++ b/src/java/org/apache/commons/collections/FastHashMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/FastTreeMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/FastTreeMap.java b/src/java/org/apache/commons/collections/FastTreeMap.java
index 788e6e5..8667ba9 100644
--- a/src/java/org/apache/commons/collections/FastTreeMap.java
+++ b/src/java/org/apache/commons/collections/FastTreeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/FunctorException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/FunctorException.java b/src/java/org/apache/commons/collections/FunctorException.java
index 2db1c07..36b4b4a 100644
--- a/src/java/org/apache/commons/collections/FunctorException.java
+++ b/src/java/org/apache/commons/collections/FunctorException.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/HashBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/HashBag.java b/src/java/org/apache/commons/collections/HashBag.java
index db252a9..cd58bdb 100644
--- a/src/java/org/apache/commons/collections/HashBag.java
+++ b/src/java/org/apache/commons/collections/HashBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/IterableMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/IterableMap.java b/src/java/org/apache/commons/collections/IterableMap.java
index 193d84e..a4e7fe7 100644
--- a/src/java/org/apache/commons/collections/IterableMap.java
+++ b/src/java/org/apache/commons/collections/IterableMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/IteratorUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/IteratorUtils.java b/src/java/org/apache/commons/collections/IteratorUtils.java
index fe18721..7949611 100644
--- a/src/java/org/apache/commons/collections/IteratorUtils.java
+++ b/src/java/org/apache/commons/collections/IteratorUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/KeyValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/KeyValue.java b/src/java/org/apache/commons/collections/KeyValue.java
index 2b68b02..266a795 100644
--- a/src/java/org/apache/commons/collections/KeyValue.java
+++ b/src/java/org/apache/commons/collections/KeyValue.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/LRUMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/LRUMap.java b/src/java/org/apache/commons/collections/LRUMap.java
index 00c13dc..a15719a 100644
--- a/src/java/org/apache/commons/collections/LRUMap.java
+++ b/src/java/org/apache/commons/collections/LRUMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ListUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ListUtils.java b/src/java/org/apache/commons/collections/ListUtils.java
index b97d56a..e721600 100644
--- a/src/java/org/apache/commons/collections/ListUtils.java
+++ b/src/java/org/apache/commons/collections/ListUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/MapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/MapIterator.java b/src/java/org/apache/commons/collections/MapIterator.java
index 56327be..ace6c1c 100644
--- a/src/java/org/apache/commons/collections/MapIterator.java
+++ b/src/java/org/apache/commons/collections/MapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/MapUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/MapUtils.java b/src/java/org/apache/commons/collections/MapUtils.java
index 07bf3b4..9d38491 100644
--- a/src/java/org/apache/commons/collections/MapUtils.java
+++ b/src/java/org/apache/commons/collections/MapUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/MultiHashMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
index e23bfa5..25158b4 100644
--- a/src/java/org/apache/commons/collections/MultiHashMap.java
+++ b/src/java/org/apache/commons/collections/MultiHashMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/MultiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
index 2170166..8cd7212 100644
--- a/src/java/org/apache/commons/collections/MultiMap.java
+++ b/src/java/org/apache/commons/collections/MultiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/OrderedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/OrderedBidiMap.java b/src/java/org/apache/commons/collections/OrderedBidiMap.java
index cfc3677..68574c9 100644
--- a/src/java/org/apache/commons/collections/OrderedBidiMap.java
+++ b/src/java/org/apache/commons/collections/OrderedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/OrderedIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/OrderedIterator.java b/src/java/org/apache/commons/collections/OrderedIterator.java
index c14b592..317cfb4 100644
--- a/src/java/org/apache/commons/collections/OrderedIterator.java
+++ b/src/java/org/apache/commons/collections/OrderedIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/OrderedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/OrderedMap.java b/src/java/org/apache/commons/collections/OrderedMap.java
index bb37b0f..6904f17 100644
--- a/src/java/org/apache/commons/collections/OrderedMap.java
+++ b/src/java/org/apache/commons/collections/OrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/OrderedMapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/OrderedMapIterator.java b/src/java/org/apache/commons/collections/OrderedMapIterator.java
index b454f18..332c92c 100644
--- a/src/java/org/apache/commons/collections/OrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/OrderedMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Predicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Predicate.java b/src/java/org/apache/commons/collections/Predicate.java
index 1d6aa19..8b5e7fb 100644
--- a/src/java/org/apache/commons/collections/Predicate.java
+++ b/src/java/org/apache/commons/collections/Predicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/PredicateUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/PredicateUtils.java b/src/java/org/apache/commons/collections/PredicateUtils.java
index 5c96e82..9561d6b 100644
--- a/src/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/java/org/apache/commons/collections/PredicateUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/PriorityQueue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/PriorityQueue.java b/src/java/org/apache/commons/collections/PriorityQueue.java
index f4b44b7..0c5b381 100644
--- a/src/java/org/apache/commons/collections/PriorityQueue.java
+++ b/src/java/org/apache/commons/collections/PriorityQueue.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ProxyMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ProxyMap.java b/src/java/org/apache/commons/collections/ProxyMap.java
index 621b915..f089c9d 100644
--- a/src/java/org/apache/commons/collections/ProxyMap.java
+++ b/src/java/org/apache/commons/collections/ProxyMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ReferenceMap.java b/src/java/org/apache/commons/collections/ReferenceMap.java
index 2383022..45e4409 100644
--- a/src/java/org/apache/commons/collections/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/ReferenceMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ResettableIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ResettableIterator.java b/src/java/org/apache/commons/collections/ResettableIterator.java
index 77585ae..04f4923 100644
--- a/src/java/org/apache/commons/collections/ResettableIterator.java
+++ b/src/java/org/apache/commons/collections/ResettableIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/ResettableListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/ResettableListIterator.java b/src/java/org/apache/commons/collections/ResettableListIterator.java
index 7076924..a6b8be7 100644
--- a/src/java/org/apache/commons/collections/ResettableListIterator.java
+++ b/src/java/org/apache/commons/collections/ResettableListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/SequencedHashMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/SequencedHashMap.java b/src/java/org/apache/commons/collections/SequencedHashMap.java
index ea939e1..c6f9c87 100644
--- a/src/java/org/apache/commons/collections/SequencedHashMap.java
+++ b/src/java/org/apache/commons/collections/SequencedHashMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/SetUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/SetUtils.java b/src/java/org/apache/commons/collections/SetUtils.java
index cda15e0..93a3e5b 100644
--- a/src/java/org/apache/commons/collections/SetUtils.java
+++ b/src/java/org/apache/commons/collections/SetUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/SortedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/SortedBag.java b/src/java/org/apache/commons/collections/SortedBag.java
index d1b167c..663e3dc 100644
--- a/src/java/org/apache/commons/collections/SortedBag.java
+++ b/src/java/org/apache/commons/collections/SortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/SortedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/SortedBidiMap.java b/src/java/org/apache/commons/collections/SortedBidiMap.java
index 1de59aa..dda5035 100644
--- a/src/java/org/apache/commons/collections/SortedBidiMap.java
+++ b/src/java/org/apache/commons/collections/SortedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[19/34] commons-collections git commit: copy in checkstyle
Posted by ch...@apache.org.
copy in checkstyle
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@647155 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/23b4e594
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/23b4e594
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/23b4e594
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: 23b4e59454fbedd08a8537c3a9080ec857c39d10
Parents: cba26a1
Author: Niall Kegan Pemberton <ni...@apache.org>
Authored: Fri Apr 11 13:13:23 2008 +0000
Committer: Niall Kegan Pemberton <ni...@apache.org>
Committed: Fri Apr 11 13:13:23 2008 +0000
----------------------------------------------------------------------
checkstyle.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/23b4e594/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 0000000..b790ec3
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+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.
+-->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!-- commons lang customization of default Checkstyle behavior -->
+<module name="Checker">
+ <property name="localeLanguage" value="en"/>
+ <module name="PackageHtml"/>
+ <module name="TreeWalker">
+ <module name="TabCharacter"/>
+ <module name="AvoidStarImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="NeedBraces"/>
+ <module name="RedundantThrows">
+ <property name="allowUnchecked" value="true"/>
+ </module>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <module name="JavadocMethod">
+ <property name="allowUndeclaredRTE" value="true"/>
+ </module>
+ </module>
+</module>
+
+
[08/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ChainedClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
index 7fee89a..adb7a3d 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
index 3fc48a9..6229a19 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/CloneTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
index 2e482bc..6334911 100644
--- a/src/java/org/apache/commons/collections/functors/CloneTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
index 322512e..c6e86f5 100644
--- a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ConstantFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
index 617b6d5..933feaa 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
index 681dd6f..ad02f92 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/EqualPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
index 0f1069e..d23157e 100644
--- a/src/java/org/apache/commons/collections/functors/EqualPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
index bd73cf1..21498fb 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
index c8f9e49..bbbd5b4 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
index 3e6f736..b894a8e 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
index 1cf137a..3eac3cc 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
index 5245c79..7e4327b 100644
--- a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/FalsePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
index d492bd7..0b880ed 100644
--- a/src/java/org/apache/commons/collections/functors/FalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/ForClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/ForClosure.java b/src/java/org/apache/commons/collections/functors/ForClosure.java
index c1be839..8e6ec14 100644
--- a/src/java/org/apache/commons/collections/functors/ForClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ForClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/FunctorUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/FunctorUtils.java b/src/java/org/apache/commons/collections/functors/FunctorUtils.java
index d78f200..78f357e 100644
--- a/src/java/org/apache/commons/collections/functors/FunctorUtils.java
+++ b/src/java/org/apache/commons/collections/functors/FunctorUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
index b9a4a48..49cfda9 100644
--- a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/IfClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/IfClosure.java b/src/java/org/apache/commons/collections/functors/IfClosure.java
index 7325049..7fd0afb 100644
--- a/src/java/org/apache/commons/collections/functors/IfClosure.java
+++ b/src/java/org/apache/commons/collections/functors/IfClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
index eabc8f4..46b6b07 100644
--- a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
index 9a14c4a..5031044 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
index db43673..e5abc21 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
index 6526ead..f64cb63 100644
--- a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/MapTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/MapTransformer.java b/src/java/org/apache/commons/collections/functors/MapTransformer.java
index 2db5a4c..404c323 100644
--- a/src/java/org/apache/commons/collections/functors/MapTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/MapTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NOPClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NOPClosure.java b/src/java/org/apache/commons/collections/functors/NOPClosure.java
index 35ecb33..abb09a1 100644
--- a/src/java/org/apache/commons/collections/functors/NOPClosure.java
+++ b/src/java/org/apache/commons/collections/functors/NOPClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NOPTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
index 986c659..d7959e5 100644
--- a/src/java/org/apache/commons/collections/functors/NOPTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NonePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NonePredicate.java b/src/java/org/apache/commons/collections/functors/NonePredicate.java
index 686f78d..5c0ef2d 100644
--- a/src/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NonePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
index 8b88261..de30666 100644
--- a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NotPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NotPredicate.java b/src/java/org/apache/commons/collections/functors/NotPredicate.java
index 4325a5e..4fe1bc9 100644
--- a/src/java/org/apache/commons/collections/functors/NotPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
index b078d15..bd36628 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
index 2587397..b4baeae 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
index 3c47ca2..f3d93d3 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/NullPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/NullPredicate.java b/src/java/org/apache/commons/collections/functors/NullPredicate.java
index f68c258..91e267c 100644
--- a/src/java/org/apache/commons/collections/functors/NullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/OnePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/OnePredicate.java b/src/java/org/apache/commons/collections/functors/OnePredicate.java
index 864cc62..21a0b28 100644
--- a/src/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OnePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/OrPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/OrPredicate.java b/src/java/org/apache/commons/collections/functors/OrPredicate.java
index 5aa68ad..e29810c 100644
--- a/src/java/org/apache/commons/collections/functors/OrPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OrPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/PredicateDecorator.java b/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
index edd2bb2..72c967f 100644
--- a/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
+++ b/src/java/org/apache/commons/collections/functors/PredicateDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
index 53c34d3..50170a8 100644
--- a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
index 08df99a..5ba69eb 100644
--- a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
index 08e1ef6..6cf01d5 100644
--- a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/SwitchClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
index be4d4e5..d5238ed 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
index d7af1c1..425c09b 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
index bf7c36b..82cc15a 100644
--- a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/TransformerClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
index b841899..98fb4a1 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerClosure.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
index 499eab1..74107fb 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/TruePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/TruePredicate.java b/src/java/org/apache/commons/collections/functors/TruePredicate.java
index 09bf42a..e6c2025 100644
--- a/src/java/org/apache/commons/collections/functors/TruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TruePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/UniquePredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
index 18ca3b9..c57518c 100644
--- a/src/java/org/apache/commons/collections/functors/UniquePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/WhileClosure.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/WhileClosure.java b/src/java/org/apache/commons/collections/functors/WhileClosure.java
index 8093322..0d897dd 100644
--- a/src/java/org/apache/commons/collections/functors/WhileClosure.java
+++ b/src/java/org/apache/commons/collections/functors/WhileClosure.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/package.html b/src/java/org/apache/commons/collections/functors/package.html
index ad9584a..7139fee 100644
--- a/src/java/org/apache/commons/collections/functors/package.html
+++ b/src/java/org/apache/commons/collections/functors/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
index d551c93..ded97d1 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
index 342e4fd..3a35b55 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
index 37cf0b9..3050ba8 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
index c8c41f4..6ad9beb 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java b/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
index 9013d7f..b441793 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
index 3b6adde..c81abd5 100644
--- a/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
index f937a1d..1567ee4 100644
--- a/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
index be8f2d5..4451319 100644
--- a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
index 43009cc..c7516da 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
index 1001aa2..c39c149 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
index c421428..3f1b5ac 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
index 2b41893..4e594e0 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
index f994642..c124acc 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
index 7eedca3..4d02570 100644
--- a/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java b/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
index 096539b..f18f978 100644
--- a/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/FilterIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/FilterIterator.java b/src/java/org/apache/commons/collections/iterators/FilterIterator.java
index 92f16d1..ef77e21 100644
--- a/src/java/org/apache/commons/collections/iterators/FilterIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/FilterIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
index 8ad4156..26b29e1 100644
--- a/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/IteratorChain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
index df649b0..890634d 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
index 9336ec2..f40edb7 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java b/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
index 813b7ea..fc51f47 100644
--- a/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
+++ b/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/LoopingIterator.java b/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
index 277172b..6eef634 100644
--- a/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java b/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
index ab1e6fe..3a9755c 100644
--- a/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/LoopingListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[26/34] commons-collections git commit: PR: COLLECTIONS-360 Prevent
an NPE in FilterListIterator.next() and FilterListIterator.previous()
Posted by ch...@apache.org.
PR: COLLECTIONS-360
Prevent an NPE in FilterListIterator.next() and FilterListIterator.previous()
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1076034 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/f4a6f213
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/f4a6f213
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/f4a6f213
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: f4a6f21360811bde57d9abfdae928f522b803897
Parents: dabecd2
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 1 22:10:10 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 1 22:10:10 2011 +0000
----------------------------------------------------------------------
pom.xml | 3 +++
.../collections/iterators/FilterListIterator.java | 7 +++++++
.../iterators/TestFilterListIterator.java | 15 +++++++++++++++
3 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/f4a6f213/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a71e6a..5c4a6d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -364,6 +364,9 @@
<name>Serhiy Yevtushenko</name>
</contributor>
<contributor>
+ <name>Sai Zhang</name>
+ </contributor>
+ <contributor>
<name>Jason van Zyl</name>
</contributor>
</contributors>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/f4a6f213/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
index 26b29e1..5e36118 100644
--- a/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/FilterListIterator.java
@@ -236,6 +236,10 @@ public class FilterListIterator implements ListIterator {
}
}
+ if (iterator == null) {
+ return false;
+ }
+
while(iterator.hasNext()) {
Object object = iterator.next();
if(predicate.evaluate(object)) {
@@ -266,6 +270,9 @@ public class FilterListIterator implements ListIterator {
}
}
+ if (iterator == null) {
+ return false;
+ }
while(iterator.hasPrevious()) {
Object object = iterator.previous();
if(predicate.evaluate(object)) {
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/f4a6f213/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
index fcf45f8..ab9dffe 100644
--- a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
@@ -21,11 +21,14 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Random;
+import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.list.GrowthList;
/**
* Tests the FilterListIterator class.
@@ -289,6 +292,18 @@ public class TestFilterListIterator extends TestCase {
assertEquals(expected.previous(),filtered.previous());
}
+ /**
+ * Test for {@link https://issues.apache.org/jira/browse/COLLECTIONS-360 COLLECTIONS-360}.
+ */
+ public void testCollections360() throws Throwable {
+ GrowthList var7 = new GrowthList();
+ Predicate var9 = PredicateUtils.anyPredicate((java.util.Collection)var7);
+ FilterListIterator var13 = new FilterListIterator(var9);
+ Assert.assertFalse(var13.hasNext());
+ org.apache.commons.collections.iterators.FilterListIterator var14 = new org.apache.commons.collections.iterators.FilterListIterator(var9);
+ Assert.assertFalse(var14.hasPrevious());
+ }
+
// Utilities
private void walkForward(ListIterator expected, ListIterator testing) {
[07/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
index 5471870..4b7b431 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
index a0ec89c..c148100 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
index 6060b73..3c60393 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
index fa15921..d2401d9 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java b/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
index 7146489..7d6f135 100644
--- a/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ProxyListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/ReverseListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/ReverseListIterator.java b/src/java/org/apache/commons/collections/iterators/ReverseListIterator.java
index 0c3604b..12a46b0 100644
--- a/src/java/org/apache/commons/collections/iterators/ReverseListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ReverseListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
index 00e9fa3..bd594c2 100644
--- a/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java b/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
index 22dab42..a8224c5 100644
--- a/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/TransformIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/java/org/apache/commons/collections/iterators/TransformIterator.java
index 86509ea..6e0583f 100644
--- a/src/java/org/apache/commons/collections/iterators/TransformIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/TransformIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
index ff7817a..e391cdb 100644
--- a/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
index 11fc802..f2d3770 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
index d5a3357..8cd34f8 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
index 752d213..a063804 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
index b072de6..e0a515c 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/iterators/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/package.html b/src/java/org/apache/commons/collections/iterators/package.html
index 7bd2db3..1e8e7db 100644
--- a/src/java/org/apache/commons/collections/iterators/package.html
+++ b/src/java/org/apache/commons/collections/iterators/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
index 20b81ca..87612fc 100644
--- a/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
+++ b/src/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
index f359676..d1f743e 100644
--- a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
index 76bae1f..bb37ec7 100644
--- a/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
+++ b/src/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java b/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
index 0ac72a3..1762ce1 100644
--- a/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
+++ b/src/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
index 377dd4d..da5ca36 100644
--- a/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/MultiKey.java b/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
index dc4c795..7368443 100644
--- a/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
+++ b/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
index 882f7fe..8c72258 100644
--- a/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java b/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
index 3aaf00a..2028bf1 100644
--- a/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
+++ b/src/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/keyvalue/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/keyvalue/package.html b/src/java/org/apache/commons/collections/keyvalue/package.html
index fd79e55..9ebde44 100644
--- a/src/java/org/apache/commons/collections/keyvalue/package.html
+++ b/src/java/org/apache/commons/collections/keyvalue/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/AbstractLinkedList.java b/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
index 2ad895a..3ac8417 100644
--- a/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
+++ b/src/java/org/apache/commons/collections/list/AbstractLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/AbstractListDecorator.java b/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
index 012a10f..5e79671 100644
--- a/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
+++ b/src/java/org/apache/commons/collections/list/AbstractListDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java b/src/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
index fbccf54..808b62e 100644
--- a/src/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
+++ b/src/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/CursorableLinkedList.java b/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
index c063aa3..0ebff7e 100644
--- a/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
+++ b/src/java/org/apache/commons/collections/list/CursorableLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/FixedSizeList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/FixedSizeList.java b/src/java/org/apache/commons/collections/list/FixedSizeList.java
index 8a2850d..9b81c09 100644
--- a/src/java/org/apache/commons/collections/list/FixedSizeList.java
+++ b/src/java/org/apache/commons/collections/list/FixedSizeList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/GrowthList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/GrowthList.java b/src/java/org/apache/commons/collections/list/GrowthList.java
index 1e17530..35078dd 100644
--- a/src/java/org/apache/commons/collections/list/GrowthList.java
+++ b/src/java/org/apache/commons/collections/list/GrowthList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/LazyList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/LazyList.java b/src/java/org/apache/commons/collections/list/LazyList.java
index ab50b21..7605129 100644
--- a/src/java/org/apache/commons/collections/list/LazyList.java
+++ b/src/java/org/apache/commons/collections/list/LazyList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
index 77b596a..adf83de 100644
--- a/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
+++ b/src/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/PredicatedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/PredicatedList.java b/src/java/org/apache/commons/collections/list/PredicatedList.java
index 21e22ed..ad5cbaa 100644
--- a/src/java/org/apache/commons/collections/list/PredicatedList.java
+++ b/src/java/org/apache/commons/collections/list/PredicatedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/SetUniqueList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/SetUniqueList.java b/src/java/org/apache/commons/collections/list/SetUniqueList.java
index 29406d8..b075608 100644
--- a/src/java/org/apache/commons/collections/list/SetUniqueList.java
+++ b/src/java/org/apache/commons/collections/list/SetUniqueList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/SynchronizedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/SynchronizedList.java b/src/java/org/apache/commons/collections/list/SynchronizedList.java
index 77b00cd..062884e 100644
--- a/src/java/org/apache/commons/collections/list/SynchronizedList.java
+++ b/src/java/org/apache/commons/collections/list/SynchronizedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/TransformedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/TransformedList.java b/src/java/org/apache/commons/collections/list/TransformedList.java
index 4e73e29..d107655 100644
--- a/src/java/org/apache/commons/collections/list/TransformedList.java
+++ b/src/java/org/apache/commons/collections/list/TransformedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/TreeList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/TreeList.java b/src/java/org/apache/commons/collections/list/TreeList.java
index 4fcd65a..54816ac 100644
--- a/src/java/org/apache/commons/collections/list/TreeList.java
+++ b/src/java/org/apache/commons/collections/list/TreeList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/TypedList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/TypedList.java b/src/java/org/apache/commons/collections/list/TypedList.java
index 37defe0..fa8baee 100644
--- a/src/java/org/apache/commons/collections/list/TypedList.java
+++ b/src/java/org/apache/commons/collections/list/TypedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/UnmodifiableList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/java/org/apache/commons/collections/list/UnmodifiableList.java
index db5f2c7..2be31f0 100644
--- a/src/java/org/apache/commons/collections/list/UnmodifiableList.java
+++ b/src/java/org/apache/commons/collections/list/UnmodifiableList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/list/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/package.html b/src/java/org/apache/commons/collections/list/package.html
index 14aa369..0e6c020 100644
--- a/src/java/org/apache/commons/collections/list/package.html
+++ b/src/java/org/apache/commons/collections/list/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
index b015e75..d1e1a61 100644
--- a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
index f89117d..16989ac 100644
--- a/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
index e39f1fd..a5cfbe7 100644
--- a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
index 836c7f8..806b3b0 100644
--- a/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
index d4b958e..a67ccc1 100644
--- a/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
index 587cba9..cea3074 100644
--- a/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractReferenceMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java b/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
index bf8c0c1..fe0b26c 100644
--- a/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
+++ b/src/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
index a933a48..ba9650d 100644
--- a/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
+++ b/src/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/CompositeMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/CompositeMap.java b/src/java/org/apache/commons/collections/map/CompositeMap.java
index 99cae3f..c1a2f17 100644
--- a/src/java/org/apache/commons/collections/map/CompositeMap.java
+++ b/src/java/org/apache/commons/collections/map/CompositeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/DefaultedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/DefaultedMap.java b/src/java/org/apache/commons/collections/map/DefaultedMap.java
index f9f2016..a454a24 100644
--- a/src/java/org/apache/commons/collections/map/DefaultedMap.java
+++ b/src/java/org/apache/commons/collections/map/DefaultedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/FixedSizeMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/java/org/apache/commons/collections/map/FixedSizeMap.java
index d04d189..a1bcc27 100644
--- a/src/java/org/apache/commons/collections/map/FixedSizeMap.java
+++ b/src/java/org/apache/commons/collections/map/FixedSizeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
index 87c200a..d32d93d 100644
--- a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/Flat3Map.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/Flat3Map.java b/src/java/org/apache/commons/collections/map/Flat3Map.java
index 8acc002..518842b 100644
--- a/src/java/org/apache/commons/collections/map/Flat3Map.java
+++ b/src/java/org/apache/commons/collections/map/Flat3Map.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/HashedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/HashedMap.java b/src/java/org/apache/commons/collections/map/HashedMap.java
index 4f9cafc..f208b40 100644
--- a/src/java/org/apache/commons/collections/map/HashedMap.java
+++ b/src/java/org/apache/commons/collections/map/HashedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/IdentityMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/IdentityMap.java b/src/java/org/apache/commons/collections/map/IdentityMap.java
index 28bab75..16edd8b 100644
--- a/src/java/org/apache/commons/collections/map/IdentityMap.java
+++ b/src/java/org/apache/commons/collections/map/IdentityMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/LRUMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/LRUMap.java b/src/java/org/apache/commons/collections/map/LRUMap.java
index 13b0472..8391e5b 100644
--- a/src/java/org/apache/commons/collections/map/LRUMap.java
+++ b/src/java/org/apache/commons/collections/map/LRUMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/LazyMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/LazyMap.java b/src/java/org/apache/commons/collections/map/LazyMap.java
index da10310..58ae3de 100644
--- a/src/java/org/apache/commons/collections/map/LazyMap.java
+++ b/src/java/org/apache/commons/collections/map/LazyMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/LazySortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/LazySortedMap.java b/src/java/org/apache/commons/collections/map/LazySortedMap.java
index 52dc9cb..01c73bb 100644
--- a/src/java/org/apache/commons/collections/map/LazySortedMap.java
+++ b/src/java/org/apache/commons/collections/map/LazySortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/LinkedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/LinkedMap.java b/src/java/org/apache/commons/collections/map/LinkedMap.java
index e3ce3c1..682f3dc 100644
--- a/src/java/org/apache/commons/collections/map/LinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/LinkedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/ListOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
index 48f6493..710c6bb 100644
--- a/src/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/MultiKeyMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
index 8df5efb..1ba1cea 100644
--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/MultiValueMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
index 81e86be..cc74fd7 100644
--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
+++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/PredicatedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/PredicatedMap.java b/src/java/org/apache/commons/collections/map/PredicatedMap.java
index ef06566..436fcb8 100644
--- a/src/java/org/apache/commons/collections/map/PredicatedMap.java
+++ b/src/java/org/apache/commons/collections/map/PredicatedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java b/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
index e4c7e75..f7a950f 100644
--- a/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java b/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
index b36b5b3..dc2fdff 100644
--- a/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
+++ b/src/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/ReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/ReferenceMap.java b/src/java/org/apache/commons/collections/map/ReferenceMap.java
index 3f6a1eb..a1a3d3c 100644
--- a/src/java/org/apache/commons/collections/map/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/map/ReferenceMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/SingletonMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/SingletonMap.java b/src/java/org/apache/commons/collections/map/SingletonMap.java
index 51b1e1e..7b88a25 100644
--- a/src/java/org/apache/commons/collections/map/SingletonMap.java
+++ b/src/java/org/apache/commons/collections/map/SingletonMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/StaticBucketMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/StaticBucketMap.java b/src/java/org/apache/commons/collections/map/StaticBucketMap.java
index 02b103d..4a130c3 100644
--- a/src/java/org/apache/commons/collections/map/StaticBucketMap.java
+++ b/src/java/org/apache/commons/collections/map/StaticBucketMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/map/TransformedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/TransformedMap.java b/src/java/org/apache/commons/collections/map/TransformedMap.java
index f1856bb..6d3152e 100644
--- a/src/java/org/apache/commons/collections/map/TransformedMap.java
+++ b/src/java/org/apache/commons/collections/map/TransformedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[31/34] commons-collections git commit: PR: COLLECTIONS-331
Documented the requirement to use a comparator.
Posted by ch...@apache.org.
PR: COLLECTIONS-331
Documented the requirement to use a comparator.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH@1079587 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/ef4dd46d
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/ef4dd46d
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/ef4dd46d
Branch: refs/heads/COLLECTIONS_3_2_BRANCH
Commit: ef4dd46dbd48992830a94fcfc0a6d15f85bb1beb
Parents: 1c23c02
Author: Jochen Wiedmann <jo...@apache.org>
Authored: Tue Mar 8 22:31:49 2011 +0000
Committer: Jochen Wiedmann <jo...@apache.org>
Committed: Tue Mar 8 22:31:49 2011 +0000
----------------------------------------------------------------------
.../iterators/CollatingIterator.java | 35 +++++++++++++++-----
.../iterators/TestCollatingIterator.java | 22 ++++++++++++
2 files changed, 49 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/ef4dd46d/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
index 4451319..94c80da 100644
--- a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
@@ -60,8 +60,10 @@ public class CollatingIterator implements Iterator {
// Constructors
// ----------------------------------------------------------------------
/**
- * Constructs a new <code>CollatingIterator</code>. Natural sort order
- * will be used, and child iterators will have to be manually added
+ * Constructs a new <code>CollatingIterator</code>. A comparator must be
+ * set by calling {@link #setComparator(Comparator)} before invoking
+ * {@link #hasNext()}, or {@link #next()} for the first time. Child
+ * iterators will have to be manually added using the
* using the {@link #addIterator(Iterator)} method.
*/
public CollatingIterator() {
@@ -73,7 +75,9 @@ public class CollatingIterator implements Iterator {
* specified comparator for ordering. Child iterators will have to be
* manually added using the {@link #addIterator(Iterator)} method.
*
- * @param comp the comparator to use to sort, or null to use natural sort order
+ * @param comp the comparator to use to sort; must not be null,
+ * unless you'll be invoking {@link #setComparator(Comparator)}
+ * later on.
*/
public CollatingIterator(final Comparator comp) {
this(comp,2);
@@ -85,7 +89,9 @@ public class CollatingIterator implements Iterator {
* capacity. Child iterators will have to be
* manually added using the {@link #addIterator(Iterator)} method.
*
- * @param comp the comparator to use to sort, or null to use natural sort order
+ * @param comp the comparator to use to sort; must not be null,
+ * unless you'll be invoking {@link #setComparator(Comparator)}
+ * later on.
* @param initIterCapacity the initial capacity for the internal list
* of child iterators
*/
@@ -99,7 +105,9 @@ public class CollatingIterator implements Iterator {
* specified comparator to provide ordered iteration over the two
* given iterators.
*
- * @param comp the comparator to use to sort, or null to use natural sort order
+ * @param comp the comparator to use to sort; must not be null,
+ * unless you'll be invoking {@link #setComparator(Comparator)}
+ * later on.
* @param a the first child ordered iterator
* @param b the second child ordered iterator
* @throws NullPointerException if either iterator is null
@@ -115,7 +123,9 @@ public class CollatingIterator implements Iterator {
* specified comparator to provide ordered iteration over the array
* of iterators.
*
- * @param comp the comparator to use to sort, or null to use natural sort order
+ * @param comp the comparator to use to sort; must not be null,
+ * unless you'll be invoking {@link #setComparator(Comparator)}
+ * later on.
* @param iterators the array of iterators
* @throws NullPointerException if iterators array is or contains null
*/
@@ -131,7 +141,9 @@ public class CollatingIterator implements Iterator {
* specified comparator to provide ordered iteration over the collection
* of iterators.
*
- * @param comp the comparator to use to sort, or null to use natural sort order
+ * @param comp the comparator to use to sort; must not be null,
+ * unless you'll be invoking {@link #setComparator(Comparator)}
+ * later on.
* @param iterators the collection of iterators
* @throws NullPointerException if the iterators collection is or contains null
* @throws ClassCastException if the iterators collection contains an
@@ -196,7 +208,11 @@ public class CollatingIterator implements Iterator {
}
/**
- * Sets the {@link Comparator} by which collation occurs.
+ * Sets the {@link Comparator} by which collation occurs. If you
+ * would like to use the natural sort order (or, in other words,
+ * if the elements in the iterators are implementing the
+ * {@link java.lang.Comparable} interface), then use the
+ * {@link org.apache.commons.collections.comparators.ComparableComparator}.
*
* @throws IllegalStateException if iteration has started
*/
@@ -331,6 +347,9 @@ public class CollatingIterator implements Iterator {
leastObject = values.get(i);
} else {
Object curObject = values.get(i);
+ if (comparator == null) {
+ throw new NullPointerException("You must invoke setComparator() to set a compator first.");
+ }
if (comparator.compare(curObject,leastObject) < 0) {
leastObject = curObject;
leastIndex = i;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/ef4dd46d/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
index b844a7d..a108644 100644
--- a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
@@ -17,8 +17,10 @@
package org.apache.commons.collections.iterators;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
+import java.util.List;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -207,5 +209,25 @@ public class TestCollatingIterator extends AbstractTestIterator {
assertEquals(expectedSize,(evens.size() + odds.size()));
}
+ public void testNullComparator() {
+ List l1 = Arrays.asList(new Integer[]{new Integer(1), new Integer(3), new Integer(5)});
+ List l2 = Arrays.asList(new Integer[]{new Integer(2), new Integer(4), new Integer(6)});
+
+ CollatingIterator collatingIterator1 = new CollatingIterator(null, l1.iterator(), l2.iterator());
+ try {
+ collatingIterator1.next();
+ } catch (NullPointerException e) {
+ assertTrue(e.getMessage().startsWith("You must invoke setComparator"));
+ }
+
+ int i = 0;
+ CollatingIterator collatingIterator2 = new CollatingIterator(null, l1.iterator(), l2.iterator());
+ collatingIterator2.setComparator(new ComparableComparator());
+ for ( ; collatingIterator2.hasNext(); i++ ) {
+ Integer n = (Integer)collatingIterator2.next();
+ assertEquals("wrong order", n.intValue(), i + 1);
+ }
+ assertEquals("wrong size", i, l1.size() + l2.size());
+ }
}
[11/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
index f55e0e7..9397efb 100644
--- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[12/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
index ae68cb3..b91a22f 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
index 213af12..316a784 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
index 91b6fcf..7b278ee 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
index 0e51f66..6edd269 100644
--- a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
+++ b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/AbstractTestList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/AbstractTestList.java b/src/test/org/apache/commons/collections/list/AbstractTestList.java
index 7b76dd1..414af65 100644
--- a/src/test/org/apache/commons/collections/list/AbstractTestList.java
+++ b/src/test/org/apache/commons/collections/list/AbstractTestList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java b/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
index aca8627..e3ff196 100644
--- a/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestAbstractLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestAll.java b/src/test/org/apache/commons/collections/list/TestAll.java
index 36bad4a..9da9d07 100644
--- a/src/test/org/apache/commons/collections/list/TestAll.java
+++ b/src/test/org/apache/commons/collections/list/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
index 843d78e..4d06402 100644
--- a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
index 67137a2..92c2287 100644
--- a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
+++ b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestGrowthList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestGrowthList.java b/src/test/org/apache/commons/collections/list/TestGrowthList.java
index 68578b5..dd22928 100644
--- a/src/test/org/apache/commons/collections/list/TestGrowthList.java
+++ b/src/test/org/apache/commons/collections/list/TestGrowthList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
index c345a50..ac92508 100644
--- a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
+++ b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestPredicatedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestPredicatedList.java b/src/test/org/apache/commons/collections/list/TestPredicatedList.java
index f5f49f0..fd80cf7 100644
--- a/src/test/org/apache/commons/collections/list/TestPredicatedList.java
+++ b/src/test/org/apache/commons/collections/list/TestPredicatedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
index 5d49beb..560a88b 100644
--- a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
+++ b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
index 6719913..74b0dbe 100644
--- a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
+++ b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestTransformedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestTransformedList.java b/src/test/org/apache/commons/collections/list/TestTransformedList.java
index 51b01cc..237a9ba 100644
--- a/src/test/org/apache/commons/collections/list/TestTransformedList.java
+++ b/src/test/org/apache/commons/collections/list/TestTransformedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestTreeList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestTreeList.java b/src/test/org/apache/commons/collections/list/TestTreeList.java
index 3914898..d3ae8b9 100644
--- a/src/test/org/apache/commons/collections/list/TestTreeList.java
+++ b/src/test/org/apache/commons/collections/list/TestTreeList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestTypedList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestTypedList.java b/src/test/org/apache/commons/collections/list/TestTypedList.java
index 09739b0..d3c411e 100644
--- a/src/test/org/apache/commons/collections/list/TestTypedList.java
+++ b/src/test/org/apache/commons/collections/list/TestTypedList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
index 1c152ef..81cba8e 100644
--- a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
+++ b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java b/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
index 439759d..4ae4740 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/AbstractTestMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestMap.java b/src/test/org/apache/commons/collections/map/AbstractTestMap.java
index 4bf996c..e31028c 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
index d927f13..a24c903 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
index ef5e95d..e10428b 100644
--- a/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestAll.java b/src/test/org/apache/commons/collections/map/TestAll.java
index 70b7cd9..e6f45bb 100644
--- a/src/test/org/apache/commons/collections/map/TestAll.java
+++ b/src/test/org/apache/commons/collections/map/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
index 4993067..b3f27a5 100644
--- a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
+++ b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestCompositeMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestCompositeMap.java b/src/test/org/apache/commons/collections/map/TestCompositeMap.java
index e8f7b7d..dfff654 100644
--- a/src/test/org/apache/commons/collections/map/TestCompositeMap.java
+++ b/src/test/org/apache/commons/collections/map/TestCompositeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestDefaultedMap.java b/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
index 40e885f..96d322b 100644
--- a/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
index cfc3ca6..8897f89 100644
--- a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
+++ b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
index d9f307f..5e0bd19 100644
--- a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestFlat3Map.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestFlat3Map.java b/src/test/org/apache/commons/collections/map/TestFlat3Map.java
index 4378030..9359602 100644
--- a/src/test/org/apache/commons/collections/map/TestFlat3Map.java
+++ b/src/test/org/apache/commons/collections/map/TestFlat3Map.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestHashedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestHashedMap.java b/src/test/org/apache/commons/collections/map/TestHashedMap.java
index 2ba3917..49d2678 100644
--- a/src/test/org/apache/commons/collections/map/TestHashedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestHashedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestIdentityMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
index 103c519..b1e6c4e 100644
--- a/src/test/org/apache/commons/collections/map/TestIdentityMap.java
+++ b/src/test/org/apache/commons/collections/map/TestIdentityMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestLRUMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestLRUMap.java b/src/test/org/apache/commons/collections/map/TestLRUMap.java
index fd4effe..ef5edc6 100644
--- a/src/test/org/apache/commons/collections/map/TestLRUMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLRUMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestLazyMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestLazyMap.java b/src/test/org/apache/commons/collections/map/TestLazyMap.java
index dcb08f8..1396c3e 100644
--- a/src/test/org/apache/commons/collections/map/TestLazyMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLazyMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
index 25bfcc3..7cfe226 100644
--- a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
@@ -149,4 +150,4 @@ public class TestLazySortedMap extends AbstractTestSortedMap {
// (java.io.Serializable) map,
// "D:/dev/collections/data/test/LazySortedMap.fullCollection.version3.1.obj");
// }
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestLinkedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestLinkedMap.java b/src/test/org/apache/commons/collections/map/TestLinkedMap.java
index 4faa47a..a1d1c16 100644
--- a/src/test/org/apache/commons/collections/map/TestLinkedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLinkedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
index 938f5cb..db46844 100644
--- a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
index d2a8ead..1dec774 100644
--- a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
+++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
index 7cd7e78..6e528fb 100644
--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
index d4abcf9..7b322dc 100644
--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
@@ -1,17 +1,18 @@
/*
- * Copyright 2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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.
+ * 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.collections.map;
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
index 62b9ab8..5231a0d 100644
--- a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
index fbf4d0b..a59a6d5 100644
--- a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
@@ -194,4 +195,4 @@ public class TestPredicatedSortedMap extends AbstractTestSortedMap{
// (java.io.Serializable) map,
// "D:/dev/collections/data/test/PredicatedSortedMap.fullCollection.version3.1.obj");
// }
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
index 9661670..1fdac18 100644
--- a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
+++ b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestReferenceMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestReferenceMap.java b/src/test/org/apache/commons/collections/map/TestReferenceMap.java
index e5d2bf3..fe21312 100644
--- a/src/test/org/apache/commons/collections/map/TestReferenceMap.java
+++ b/src/test/org/apache/commons/collections/map/TestReferenceMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestSingletonMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestSingletonMap.java b/src/test/org/apache/commons/collections/map/TestSingletonMap.java
index 30ee8c3..23b5915 100644
--- a/src/test/org/apache/commons/collections/map/TestSingletonMap.java
+++ b/src/test/org/apache/commons/collections/map/TestSingletonMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
index 4fc316e..244bac1 100644
--- a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
+++ b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestTransformedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
index 6661349..9e533be 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
index 1fc3fd7..dd353ba 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
index c41a7ea..a8c9bc1 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
index 8a662f7..c4bcf78 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
index 5a4b3e4..91423b8 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/overview.html
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/overview.html b/src/test/org/apache/commons/collections/overview.html
index 52e787b..12262fc 100644
--- a/src/test/org/apache/commons/collections/overview.html
+++ b/src/test/org/apache/commons/collections/overview.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
@@ -18,7 +19,7 @@
<p>The Collections Test Framework is an extension to JUnit to enable quick and easy testing
of collections.</p>
-<h3>Apache Jakarta Commons Collections Test Framework</h3>
+<h3>Apache Commons Collections Test Framework</h3>
<p>
The Collections Test Framework is an extension to JUnit to enable quick and easy testing
@@ -37,4 +38,4 @@ NOTE: The test framework is released to aid developers.
We will try to make changes backwards compatible.
However, if necessary changes will be made to the test framework to improve the tests.
-</body>
\ No newline at end of file
+</body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/AbstractTestSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/AbstractTestSet.java b/src/test/org/apache/commons/collections/set/AbstractTestSet.java
index 7b879f8..3fe9a17 100644
--- a/src/test/org/apache/commons/collections/set/AbstractTestSet.java
+++ b/src/test/org/apache/commons/collections/set/AbstractTestSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java b/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
index 21f38ce..5787d18 100644
--- a/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestAll.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestAll.java b/src/test/org/apache/commons/collections/set/TestAll.java
index 677d775..a801cd5 100644
--- a/src/test/org/apache/commons/collections/set/TestAll.java
+++ b/src/test/org/apache/commons/collections/set/TestAll.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestCompositeSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestCompositeSet.java b/src/test/org/apache/commons/collections/set/TestCompositeSet.java
index 9e4c693..155cb09 100644
--- a/src/test/org/apache/commons/collections/set/TestCompositeSet.java
+++ b/src/test/org/apache/commons/collections/set/TestCompositeSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
index d597825..2d776b4 100644
--- a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
index f2ae46c..5ea75fb 100644
--- a/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
+++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
index a11c1d7..474b449 100644
--- a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
index 584b5e6..9f56b0c 100644
--- a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
+++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
index 3ca6b86..eddb644 100644
--- a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
index d8b254b..261eadf 100644
--- a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
index f3e2460..445fada 100644
--- a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
index 9f62388..a558324 100644
--- a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestTransformedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSet.java
index fb11d6f..0ca17a6 100644
--- a/src/test/org/apache/commons/collections/set/TestTransformedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTransformedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
index 20b5d99..71805e9 100644
--- a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestTypedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestTypedSet.java b/src/test/org/apache/commons/collections/set/TestTypedSet.java
index da9ed4f..dd6bb2f 100644
--- a/src/test/org/apache/commons/collections/set/TestTypedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTypedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
index e6fd619..1393f37 100644
--- a/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/91e368d0/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
index 243a0ed..0bddcee 100644
--- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
+++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
[09/34] commons-collections git commit: Fix license headers to
conform to current policy
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/StaticBucketMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/StaticBucketMap.java b/src/java/org/apache/commons/collections/StaticBucketMap.java
index 7295642..da37565 100644
--- a/src/java/org/apache/commons/collections/StaticBucketMap.java
+++ b/src/java/org/apache/commons/collections/StaticBucketMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java b/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
index e461767..b647b24 100644
--- a/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
+++ b/src/java/org/apache/commons/collections/SynchronizedPriorityQueue.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Transformer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Transformer.java b/src/java/org/apache/commons/collections/Transformer.java
index 844fa15..c1c4252 100644
--- a/src/java/org/apache/commons/collections/Transformer.java
+++ b/src/java/org/apache/commons/collections/Transformer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/TransformerUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/TransformerUtils.java b/src/java/org/apache/commons/collections/TransformerUtils.java
index 1c131bd..b58f388 100644
--- a/src/java/org/apache/commons/collections/TransformerUtils.java
+++ b/src/java/org/apache/commons/collections/TransformerUtils.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/TreeBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/TreeBag.java b/src/java/org/apache/commons/collections/TreeBag.java
index e91d84e..098d51b 100644
--- a/src/java/org/apache/commons/collections/TreeBag.java
+++ b/src/java/org/apache/commons/collections/TreeBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java b/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
index 8ffab4d..112e0b5 100644
--- a/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/UnboundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/Unmodifiable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/Unmodifiable.java b/src/java/org/apache/commons/collections/Unmodifiable.java
index 2ba78b6..49da252 100644
--- a/src/java/org/apache/commons/collections/Unmodifiable.java
+++ b/src/java/org/apache/commons/collections/Unmodifiable.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
index 5c2bb67..8cd39d9 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
index 38be77f..b5bc32a 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
index e8fe9c1..1587f2a 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/HashBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/HashBag.java b/src/java/org/apache/commons/collections/bag/HashBag.java
index a4ec944..e13c0f0 100644
--- a/src/java/org/apache/commons/collections/bag/HashBag.java
+++ b/src/java/org/apache/commons/collections/bag/HashBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/PredicatedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedBag.java
index aa572ff..9f5966a 100644
--- a/src/java/org/apache/commons/collections/bag/PredicatedBag.java
+++ b/src/java/org/apache/commons/collections/bag/PredicatedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
index 4454af0..ddda12f 100644
--- a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/SynchronizedBag.java b/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
index 07470c5..6a1bd0f 100644
--- a/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
+++ b/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java b/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
index d70cd17..88cdda8 100644
--- a/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/TransformedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/TransformedBag.java b/src/java/org/apache/commons/collections/bag/TransformedBag.java
index 7ca6286..b5600d8 100644
--- a/src/java/org/apache/commons/collections/bag/TransformedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TransformedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java b/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
index 02a6995..efe3908 100644
--- a/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/TreeBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/TreeBag.java b/src/java/org/apache/commons/collections/bag/TreeBag.java
index 7dc94cc..6c4ca96 100644
--- a/src/java/org/apache/commons/collections/bag/TreeBag.java
+++ b/src/java/org/apache/commons/collections/bag/TreeBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/TypedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/TypedBag.java b/src/java/org/apache/commons/collections/bag/TypedBag.java
index f270d65..9e5584e 100644
--- a/src/java/org/apache/commons/collections/bag/TypedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TypedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/TypedSortedBag.java b/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
index d4c8c60..c1cb8b9 100644
--- a/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
index 94520d8..13c83fd 100644
--- a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
+++ b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
index ac5bde0..de885f6 100644
--- a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bag/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bag/package.html b/src/java/org/apache/commons/collections/bag/package.html
index f5a84b4..3a7e262 100644
--- a/src/java/org/apache/commons/collections/bag/package.html
+++ b/src/java/org/apache/commons/collections/bag/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
index 1e95eb3..fcd18da 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java b/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
index cc08b68..87c5077 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
index 154b3bd..9b2117c 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
index afeecb5..17bb9ef 100644
--- a/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
+++ b/src/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
index 1f214f7..e808eea 100644
--- a/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
index 2b65747..98972d0 100644
--- a/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index 778ebb5..0a630af 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
index b8b6681..42020c9 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
index 785f0f6..60c1725 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
index c359d9f..38d7388 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/bidimap/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/bidimap/package.html b/src/java/org/apache/commons/collections/bidimap/package.html
index 0892dc8..9d2e870 100644
--- a/src/java/org/apache/commons/collections/bidimap/package.html
+++ b/src/java/org/apache/commons/collections/bidimap/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java b/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
index e88e80f..004b3a9 100644
--- a/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
+++ b/src/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
index 6a3cf61..653b5bd 100644
--- a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java b/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
index 301725d..c9c2420 100644
--- a/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
index 91e7f0b..0dee458 100644
--- a/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
index 3619475..8df4643 100644
--- a/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
index 0a16c17..c0955e5 100644
--- a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
index db30dd3..e5dcaf4 100644
--- a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java b/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
index d255cc3..0548560 100644
--- a/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java b/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
index 0937123..c7942f4 100644
--- a/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/TypedBuffer.java b/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
index 3aed311..44b687a 100644
--- a/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java b/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
index 2cc07bb..6efc142 100644
--- a/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2002-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
index 576e4d3..3cb4a9a 100644
--- a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/buffer/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/buffer/package.html b/src/java/org/apache/commons/collections/buffer/package.html
index fb96927..e2752e1 100644
--- a/src/java/org/apache/commons/collections/buffer/package.html
+++ b/src/java/org/apache/commons/collections/buffer/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java b/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
index 191dea9..fd64b32 100644
--- a/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
+++ b/src/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/AbstractSerializableCollectionDecorator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/AbstractSerializableCollectionDecorator.java b/src/java/org/apache/commons/collections/collection/AbstractSerializableCollectionDecorator.java
index 136b04c..ab1571d 100644
--- a/src/java/org/apache/commons/collections/collection/AbstractSerializableCollectionDecorator.java
+++ b/src/java/org/apache/commons/collections/collection/AbstractSerializableCollectionDecorator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/CompositeCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/CompositeCollection.java b/src/java/org/apache/commons/collections/collection/CompositeCollection.java
index cf55b72..3ba350c 100644
--- a/src/java/org/apache/commons/collections/collection/CompositeCollection.java
+++ b/src/java/org/apache/commons/collections/collection/CompositeCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
index cfd2773..78a37c7 100644
--- a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
index c910728..e3fc1e4 100644
--- a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/TransformedCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
index 642dc20..4a85e4a 100644
--- a/src/java/org/apache/commons/collections/collection/TransformedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/TypedCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/TypedCollection.java b/src/java/org/apache/commons/collections/collection/TypedCollection.java
index 6783c0f..e150593 100644
--- a/src/java/org/apache/commons/collections/collection/TypedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TypedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
index 081c111..7001ecf 100644
--- a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
index a347390..df2bba8 100644
--- a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
+++ b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/collection/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/collection/package.html b/src/java/org/apache/commons/collections/collection/package.html
index 8057b14..30fac57 100644
--- a/src/java/org/apache/commons/collections/collection/package.html
+++ b/src/java/org/apache/commons/collections/collection/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
index 52660f4..f9fd444 100644
--- a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
index c435dba..b9efee9 100644
--- a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/ComparatorChain.java b/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
index 6d0d776..93fbf2f 100644
--- a/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
+++ b/src/java/org/apache/commons/collections/comparators/ComparatorChain.java
@@ -1,9 +1,10 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java b/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
index e339809..a891486 100644
--- a/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/NullComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/NullComparator.java b/src/java/org/apache/commons/collections/comparators/NullComparator.java
index adf2256..b6cd8ed 100644
--- a/src/java/org/apache/commons/collections/comparators/NullComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/NullComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/ReverseComparator.java b/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
index ca47fbf..c75b14a 100644
--- a/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/ReverseComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/TransformingComparator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/TransformingComparator.java b/src/java/org/apache/commons/collections/comparators/TransformingComparator.java
index b3b831e..3bdbe89 100644
--- a/src/java/org/apache/commons/collections/comparators/TransformingComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/TransformingComparator.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/comparators/package.html
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/comparators/package.html b/src/java/org/apache/commons/collections/comparators/package.html
index 99e8c96..9342f28 100644
--- a/src/java/org/apache/commons/collections/comparators/package.html
+++ b/src/java/org/apache/commons/collections/comparators/package.html
@@ -1,10 +1,11 @@
<!-- $Id$ -->
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ 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
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/AllPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/AllPredicate.java b/src/java/org/apache/commons/collections/functors/AllPredicate.java
index 9ee51f9..5434966 100644
--- a/src/java/org/apache/commons/collections/functors/AllPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AllPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/AndPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/AndPredicate.java b/src/java/org/apache/commons/collections/functors/AndPredicate.java
index 489444f..cdd99d3 100644
--- a/src/java/org/apache/commons/collections/functors/AndPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AndPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/392d63a6/src/java/org/apache/commons/collections/functors/AnyPredicate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
index 5920daa..9477904 100644
--- a/src/java/org/apache/commons/collections/functors/AnyPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
@@ -1,9 +1,10 @@
/*
- * Copyright 2001-2004,2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
*