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:28 UTC
[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
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>