cvs commit: jakarta-commons/collections build.xml
scolebourne2004/05/22 15:58:22
Modified:collections Tag: COLLECTIONS_2_1_BRANCH build.xml
Log:
Fix details of script to work in 2004 environment
Revision ChangesPath
No revision
No revision
1.33.2.2 +36 -14jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -r1.33.2.1 -r1.33.2.2
--- build.xml 22 May 2004 11:18:45 - 1.33.2.1
+++ build.xml 22 May 2004 22:58:22 - 1.33.2.2
@@ -68,7 +68,8 @@
property name=dest.doc value=${dest}/docs/
property name=dest.doc.api value=${dest.doc}/api/
property name=dest.jardir value=${dest}/
- property name=dest.jardir.jar value=${dest.jardir}/${name}.jar/
+ property name=jar.name value=${name}-${component.version}.jar/
+ property name=dest.jardir.jar value=${dest.jardir}/${jar.name}/
property name=bin.name value=${name}-${component.version}/
property name=dest.bin.tar value=${dest}/${bin.name}.tar/
@@ -81,10 +82,10 @@
property name=dest.src.zip value=${dest}/${src.name}.zip/
patternset id=patternset-exclude-distros
-exclude name=**/${bin.name}.tar.gz/
-exclude name=**/${bin.name}.zip/
-exclude name=**/${src.name}.tar.gz/
-exclude name=**/${src.name}.zip/
+exclude name=**/${bin.name}.tar.gz*/
+exclude name=**/${bin.name}.zip*/
+exclude name=**/${src.name}.tar.gz*/
+exclude name=**/${src.name}.zip*/
/patternset
!-- set the cvs.root property in the build.properties file --
@@ -175,7 +176,7 @@
destdir=${dest.doc.api}
windowtitle=${Name-Long}
doctitle=${Name-Long}
- bottom=lt;smallgt;Copyright amp;copy; 2001-2002 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
+ bottom=lt;smallgt;Copyright amp;copy; 2001-2004 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
protected=true
version=true
author=true
@@ -189,7 +190,7 @@
nonavbar=false
serialwarn=false
group title=Jakarta-commons Collections
packages=org.apache.commons.collections/
- link href=http://java.sun.com/products/jdk/1.3/docs/api/
+ link href=http://java.sun.com/products/j2se/1.4/docs/api/
/javadoc
delete dir=${workdir}/
/target
@@ -245,7 +246,7 @@
!-- # --
- target name=dist depends=dist-jar,doc,dist-tar,dist-zip description=builds
binary distribution/
+ target name=dist depends=dist-jar,doc,dist-tar,dist-zip,dist-src
description=builds binary distribution/
target name=dist-jar depends=build
mkdir dir=${dest.jardir}/
@@ -258,6 +259,7 @@
mkdir dir=${workdir}/META-INF/
copy todir=${workdir}/META-INF file=./LICENSE.txt/
+ copy todir=${workdir}/META-INF file=./NOTICE.txt/
jar jarfile=${dest.jardir.jar} manifest=${source.src}/conf/MANIFEST.MF
fileset dir=${workdir}/
@@ -313,19 +315,39 @@
target name=dist-src depends=init
- !-- not executed in default dist, because it is configuration-rich
-and requires an active network connection --
-
mkdir dir=${workdir}/
mkdir dir=${dest.jardir}/
-
- cvs dest=${workdir} cvsRoot=${cvs.root}
+
+ copy toDir=${workdir}/${src.name}
+ fileset dir=.
+include name=src/** /
+include name=data/** /
+include name=xdocs/** /
+include name=LICENSE.txt /
+include name=NOTICE.txt /
+include name=README.txt /
+include name=RELEASE-NOTES* /
+include name=DEVELOPERS-GUIDE* /
+include name=PROPOSAL* /
+include name=STATUS* /
+include name=build.xml /
+include name=build.properties.sample /
+ /fileset
+ /copy
+ copy toDir=${workdir}/${src.name}
+ fileset dir=${dest.jardir}
+include name=${jar.name} /
+ /fileset
+ /copy
+
+ !--cvs dest=${workdir} cvsRoot=${cvs.root}
package=jakarta-commons tag=${cvs.tag}/
move toDir=${workdir}/${src.name}
fileset dir=${workdir}/jakarta-commons/collections/
/move
delete dir=${workdir}/jakarta-commons/
copy file=./LICENSE.txt toDir=${workdir}/${src.name}/
+ copy file=./NOTICE.txt
cvs commit: jakarta-commons/collections build.xml
scolebourne2004/05/03 14:04:46
Modified:collections build.xml
Log:
Add targets that could be used to build smaller jars
Revision ChangesPath
1.64 +131 -0jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- build.xml 1 May 2004 14:00:41 - 1.63
+++ build.xml 3 May 2004 21:04:46 - 1.64
@@ -151,6 +151,137 @@
/target
!-- == --
+ !-- Targets you might use to get smaller jar files - not recommended --
+
+ target name=splitjar depends=jar
+ description=Create split jar
+jarjarfile=${build.home}/${component.name}-bag-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/BagUtils*.class/
+ include name=**/bag/*.class/
+/jar
+jar
jarfile=${build.home}/${component.name}-bidimap-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/bidimap/*.class/
+/jar
+jar
jarfile=${build.home}/${component.name}-buffer-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/BufferUtils*.class/
+ include name=**/buffer/*.class/
+/jar
+jar
jarfile=${build.home}/${component.name}-comparators-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/ComparatorUtils*.class/
+ include name=**/comparators/*.class/
+/jar
+jar
jarfile=${build.home}/${component.name}-functors-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/ClosureUtils*.class/
+ include name=**/FactoryUtils*.class/
+ include name=**/PredicateUtils*.class/
+ include name=**/TransformerUtils*.class/
+ include name=**/functors/*.class/
+/jar
+jarjarfile=${build.home}/${component.name}-main-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/*/
+ exclude name=**/BagUtils*.class/
+ exclude name=**/BufferUtils*.class/
+ exclude name=**/ComparatorUtils*.class/
+ exclude name=**/ClosureUtils*.class/
+ exclude name=**/FactoryUtils*.class/
+ exclude name=**/PredicateUtils*.class/
+ exclude name=**/TransformerUtils*.class/
+ exclude name=**/bag/*.class/
+ exclude name=**/bidimap/*.class/
+ exclude name=**/buffer/*.class/
+ exclude name=**/comparators/*.class/
+ exclude name=**/functors/*.class/
+ exclude name=**/iterators/ProxyIterator*.class/
+ exclude name=**/iterators/ProxyListIterator*.class/
+ exclude name=org/apache/commons/collections/BinaryHeap*.class/
+ exclude name=org/apache/commons/collections/BoundedFifoBuffer*.class/
+ exclude name=org/apache/commons/collections/CursorableLinkedList*.class/
+ exclude name=org/apache/commons/collections/CursorableSubList*.class/
+ exclude name=org/apache/commons/collections/DefaultMapBag*.class/
+ exclude name=org/apache/commons/collections/DefaultMapEntry*.class/
+ exclude name=org/apache/commons/collections/DoubleOrderedMap*.class/
+ exclude name=org/apache/commons/collections/HashBag*.class/
+ exclude name=org/apache/commons/collections/LRUMap*.class/
+ exclude name=org/apache/commons/collections/PriorityQueue*.class/
+ exclude name=org/apache/commons/collections/ProxyMap*.class/
+ exclude name=org/apache/commons/collections/ReferenceMap*.class/
+ exclude name=org/apache/commons/collections/SequencedHashMap*.class/
+ exclude name=org/apache/commons/collections/StaticBucketMap*.class/
+ exclude
name=org/apache/commons/collections/SynchronizedPriorityQueue*.class/
+ exclude name=org/apache/commons/collections/TreeBag*.class/
+ exclude name=org/apache/commons/collections/UnboundedFifoBuffer*.class/
+/jar
+jar
jarfile=${build.home}/${component.name}-deprecated-${component.version}.jar
+basedir=${build.classes}
+ manifest=${build.conf}/MANIFEST.MF
+ include name=**/META-INF/*/
+ include name=**/iterators/ProxyIterator*.class/
+ include
cvs commit: jakarta-commons/collections build.xml
scolebourne2004/05/01 07:00:41
Modified:collections build.xml
Log:
Get extra log information back when test fails
Revision ChangesPath
1.63 +4 -1 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 10 Apr 2004 22:20:06 - 1.62
+++ build.xml 1 May 2004 14:00:41 - 1.63
@@ -182,14 +182,16 @@
batchtest fork=yes
fileset dir=${source.test}
- include name=**/map/TestT*.java/
+ include name=**/Test*.java/
exclude name=**/TestAll*.java/
+ exclude name=**/TestAbstract*/
exclude name=**/TestArrayList.java/
exclude name=**/TestLinkedList.java/
exclude name=**/TestHashMap.java/
exclude name=**/TestTreeMap.java/
exclude name=**/TestTypedCollection.java/
/fileset
+formatter type=brief usefile=false /
/batchtest
/junit
/target
@@ -210,6 +212,7 @@
fileset dir=${source.test}
include name=**/TestAllPackages.java/
/fileset
+formatter type=brief usefile=false /
/batchtest
/junit
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/12/28 10:00:23 Modified:collections/src/java/org/apache/commons/collections package.html collections build.xml Added: collections/src/java/org/apache/commons/collections overview.html Log: Add overview for version 3.0 Revision ChangesPath 1.11 +14 -142 jakarta-commons/collections/src/java/org/apache/commons/collections/package.html Index: package.html === RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/package.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- package.html 13 Dec 2003 23:51:28 - 1.10 +++ package.html 28 Dec 2003 18:00:23 - 1.11 @@ -1,144 +1,16 @@ !-- $Id$ -- body - p - This package contains new interfaces to complement the Java Collections Framework, - and various utility classes. - p - The Apache Jakarta Commons Collections Framework extensions are implemented in - a number of packages. - ul - liThe main package, described below, contains new collections - interfaces/implementations and new implementations of the standard interfaces. - liThe codecomparators/code subpackage contains codeComparator/code implementations. - liThe codeiterators/code subpackage contains codeIterator/code implementations. - liThe codedecorators/code subpackage contains decorators that wrap other - implementations to add functionality such as validation or unmodifiability. - liThe codeprimitives/code subpackages contain implementations of collections - based around primitive types. - /ul - /p - p - See also the ttjava.util/tt package for the standard java collections. - /p - table border=1 cellspacing=0 cellpadding=3 - tr bgcolor=#FF class=TableHeadingColor -thCategory/ththClasses/ththComments/th - /tr - tr -td valign=topList Implementations/td -td - [EMAIL PROTECTED] org.apache.commons.collections.CursorableLinkedList}br - [EMAIL PROTECTED] org.apache.commons.collections.FastArrayList}br - [EMAIL PROTECTED] org.apache.commons.collections.NodeCachingLinkedList}br -/td -td valign=top - Special-purpose implementations of the [EMAIL PROTECTED] - java.util.List} interface. -/td - /tr - tr -td valign=topMap Implementations/td -td - [EMAIL PROTECTED] org.apache.commons.collections.BeanMap}br - [EMAIL PROTECTED] org.apache.commons.collections.DoubleOrderedMap}br - [EMAIL PROTECTED] org.apache.commons.collections.ExtendedProperties}br - [EMAIL PROTECTED] org.apache.commons.collections.FastHashMap}br - [EMAIL PROTECTED] org.apache.commons.collections.FastTreeMap}br - [EMAIL PROTECTED] org.apache.commons.collections.LRUMap}br - [EMAIL PROTECTED] org.apache.commons.collections.MultiHashMap}br - [EMAIL PROTECTED] org.apache.commons.collections.ReferenceMap}br - [EMAIL PROTECTED] org.apache.commons.collections.SequencedHashMap}br - [EMAIL PROTECTED] org.apache.commons.collections.StaticBucketMap}br -/td -td valign=top - Special-purpose implementations of the [EMAIL PROTECTED] - java.util.Map} interface and associated classes. -/td - /tr - tr -td valign=topBag Interface and Implementations/td -td - [EMAIL PROTECTED] org.apache.commons.collections.Bag}br - [EMAIL PROTECTED] org.apache.commons.collections.DefaultMapBag}br - [EMAIL PROTECTED] org.apache.commons.collections.HashBag}br - [EMAIL PROTECTED] org.apache.commons.collections.SortedBag}br - [EMAIL PROTECTED] org.apache.commons.collections.TreeBag}br -/td -td valign=top - New collections interface that keeps a count of its members. -/td - /tr - tr -td valign=topBuffer Interface and Implementations/td -td - [EMAIL PROTECTED] org.apache.commons.collections.Buffer}br - [EMAIL PROTECTED] org.apache.commons.collections.ArrayStack}br - [EMAIL PROTECTED] org.apache.commons.collections.BinaryHeap}br - [EMAIL PROTECTED] org.apache.commons.collections.BoundedFifoBuffer}br - [EMAIL PROTECTED] org.apache.commons.collections.CircularFifoBuffer}br - [EMAIL PROTECTED] org.apache.commons.collections.UnboundedFifoBuffer}br -/td -td valign=top - New collections interface that specifies a removal order for - the collection, used to implement queues and queue-like things. -/td - /tr - tr -td valign=topPriorityQueue Interface and Implementations/td -td - [EMAIL PROTECTED] org.apache.commons.collections.PriorityQueue}br - [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/11/25 18:26:42
Modified:collections build.xml
Log:
Fix to testframework javadoc build for gump
Revision ChangesPath
1.53 +4 -8 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.xml 22 Nov 2003 12:06:34 - 1.52
+++ build.xml 26 Nov 2003 02:26:42 - 1.53
@@ -35,8 +35,8 @@
!-- patternset describing test framework classes --
patternset id=patternset-testframework-source
- include name=**/AbstractTest*.class/
- include name=**/BulkTest*.class/
+ include name=**/AbstractTest*.java/
+ include name=**/BulkTest*.java/
/patternset
!-- patternset describing test framework source not dependent on collections
jar --
@@ -244,14 +244,10 @@
!-- copy all the relevant sources out to the work directory and javadoc that
--
mkdir dir=${workdir}/
copy todir=${workdir}
-fileset dir=${source.src}
+fileset dir=${source.src}/test
patternset refid=patternset-testframework-source/
/fileset
/copy
- copy todir=${workdir}fileset dir=${workdir}/java //copy
- copy todir=${workdir}fileset dir=${workdir}/test //copy
- delete dir=${workdir}/java/
- delete dir=${workdir}/test/
mkdir dir=${dest.doc.testframework}/
javadoc packagenames=org.*
sourcepath=${workdir}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/11/22 04:06:34
Modified:collections build.xml
Log:
Fix ant build to validate only part of testframework
Revision ChangesPath
1.52 +21 -14jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- build.xml 16 Nov 2003 21:39:42 - 1.51
+++ build.xml 22 Nov 2003 12:06:34 - 1.52
@@ -33,19 +33,26 @@
include name=**/BulkTest*.class/
/patternset
- !-- patternset describing test framework source --
+ !-- patternset describing test framework classes --
patternset id=patternset-testframework-source
- include name=**/Bag.java/
- include name=**/BidiMap.java/
- include name=**/MapIterator.java/
- include name=**/OrderedBidiMap.java/
- include name=**/OrderedIterator.java/
- include name=**/map/OrderedMap.java/
- include name=**/OrderedMapIterator.java/
- include name=**/SortedBag.java/
- include name=**/SortedBidiMap.java/
- include name=**/AbstractTest*.java/
- include name=**/BulkTest*.java/
+ include name=**/AbstractTest*.class/
+ include name=**/BulkTest*.class/
+ /patternset
+
+ !-- patternset describing test framework source not dependent on collections
jar --
+ patternset id=patternset-testframework-validate
+ include name=**/AbstractTestObject.java/
+ include name=**/AbstractTestCollection.java/
+ include name=**/AbstractTestSet.java/
+ include name=**/AbstractTestSortedSet.java/
+ include name=**/AbstractTestList.java/
+ include name=**/AbstractTestMap.java/
+ include name=**/AbstractTestSortedMap.java/
+ include name=**/AbstractTestComparator.java/
+ include name=**/AbstractTestIterator.java/
+ include name=**/AbstractTestListIterator.java/
+ include name=**/AbstractTestMapEntry.java/
+ include name=**/BulkTest.java/
/patternset
patternset id=patternset-exclude-distros
@@ -298,7 +305,7 @@
mkdir dir=${dest.classes.testframework}/
copy todir=${dest.classes.testframework}
fileset dir=${source.src}
-patternset refid=patternset-testframework-source/
+patternset refid=patternset-testframework-validate/
/fileset
/copy
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/11/16 13:39:42
Modified:collections/src/test/org/apache/commons/collections/bidimap
AbstractTestSortedBidiMap.java
collections/src/test/org/apache/commons/collections
AbstractTestMap.java AbstractTestCollection.java
collections build.xml
Log:
Rework build script for new test classes
Revision ChangesPath
1.2 +9 -10
jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java
Index: AbstractTestSortedBidiMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTestSortedBidiMap.java16 Nov 2003 20:35:46 - 1.1
+++ AbstractTestSortedBidiMap.java16 Nov 2003 21:39:42 - 1.2
@@ -71,10 +71,9 @@
import org.apache.commons.collections.AbstractTestSortedMap;
import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.pairs.DefaultMapEntry;
/**
- * Abstract test class for [EMAIL PROTECTED] BidiMap} methods and contracts.
+ * Abstract test class for [EMAIL PROTECTED] SortedBidiMap} methods and contracts.
*
* @version $Revision$ $Date$
*
@@ -253,8 +252,8 @@
assertEquals(2, set.size());
Iterator it2 = set.iterator();
-Map.Entry firstEntry = new DefaultMapEntry((Map.Entry) it2.next());
-Map.Entry secondEntry = new DefaultMapEntry((Map.Entry) it2.next());
+Map.Entry firstEntry = cloneMapEntry((Map.Entry) it2.next());
+Map.Entry secondEntry = cloneMapEntry((Map.Entry) it2.next());
assertEquals(true, sm.containsKey(first));
assertEquals(true, sub.containsKey(first));
assertEquals(true, set.contains(firstEntry));
@@ -418,8 +417,8 @@
Set set = sub.entrySet();
Iterator it2 = set.iterator();
Object fromEntry = it2.next();
-Map.Entry firstEntry = new DefaultMapEntry((Map.Entry) it2.next());
-Map.Entry secondEntry = new DefaultMapEntry((Map.Entry) it2.next());
+Map.Entry firstEntry = cloneMapEntry((Map.Entry) it2.next());
+Map.Entry secondEntry = cloneMapEntry((Map.Entry) it2.next());
assertEquals(true, sm.containsKey(first));
assertEquals(true, sub.containsKey(first));
assertEquals(true, set.contains(firstEntry));
@@ -601,8 +600,8 @@
assertEquals(3, set.size());
Iterator it2 = set.iterator();
Object fromEntry = it2.next();
-Map.Entry firstEntry = new DefaultMapEntry((Map.Entry) it2.next());
-Map.Entry secondEntry = new DefaultMapEntry((Map.Entry) it2.next());
+Map.Entry firstEntry = cloneMapEntry((Map.Entry) it2.next());
+Map.Entry secondEntry = cloneMapEntry((Map.Entry) it2.next());
assertEquals(true, sm.containsKey(first));
assertEquals(true, sub.containsKey(first));
assertEquals(true, set.contains(firstEntry));
1.13 +11 -2
jakarta-commons/collections/src/test/org/apache/commons/collections/AbstractTestMap.java
Index: AbstractTestMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/AbstractTestMap.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractTestMap.java 4 Nov 2003 23:35:35 - 1.12
+++ AbstractTestMap.java 16 Nov 2003 21:39:42 - 1.13
@@ -435,6 +435,15 @@
return new HashMap();
}
+/**
+ * Creates a new Map Entry that is independent of the first and the map.
+ */
+protected Map.Entry cloneMapEntry(Map.Entry entry) {
+HashMap map = new HashMap();
+map.put(entry.getKey(), entry.getValue());
+return (Map.Entry) map.entrySet().iterator().next();
+}
+
//---
/**
* Test to ensure the test setup is working properly. This method checks
1.9 +13 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/AbstractTestCollection.java
Index: AbstractTestCollection.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/AbstractTestCollection.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTestCollection.java 4 Nov 2003 23:34:46 - 1.8
+++ AbstractTestCollection.java 16 Nov 2003 21:39:42 - 1.9
@@
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/10/28 16:06:25
Modified:collections/src/java/org/apache/commons/collections
AbstractDualBidiMap.java BidiMap.java
collections/src/test/org/apache/commons/collections
AbstractTestBidiMap.java
collections build.xml
Added: collections/src/java/org/apache/commons/collections
MapIterator.java
Log:
Add MapIterator to BidiMap
Revision ChangesPath
1.4 +66 -2
jakarta-commons/collections/src/java/org/apache/commons/collections/AbstractDualBidiMap.java
Index: AbstractDualBidiMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/AbstractDualBidiMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractDualBidiMap.java 10 Oct 2003 21:09:49 - 1.3
+++ AbstractDualBidiMap.java 29 Oct 2003 00:06:25 - 1.4
@@ -214,6 +214,10 @@
// BidiMap
//---
+public MapIterator mapIterator() {
+return new BidiMapIterator(this);
+}
+
public Object getKey(Object value) {
return maps[1].get(value);
}
@@ -435,6 +439,66 @@
public Object setValue(Object value) {
final Object oldValue = super.setValue(value);
+
+// Gets old key and pairs with new value
+final Object inverseKey = map.maps[1].remove(oldValue);
+map.maps[1].put(value, inverseKey);
+
+return oldValue;
+}
+}
+
+/**
+ * Inner class MapIterator.
+ */
+protected static class BidiMapIterator extends AbstractIteratorDecorator
implements MapIterator {
+
+protected final AbstractDualBidiMap map;
+private Map.Entry last = null;
+private boolean canRemove = false;
+
+protected BidiMapIterator(AbstractDualBidiMap map) {
+super(map.maps[0].entrySet().iterator());
+this.map = map;
+}
+
+public Object next() {
+last = new MapEntry((Map.Entry) super.next(), map);
+canRemove = true;
+return last.getKey();
+}
+
+public void remove() {
+if (canRemove == false) {
+throw new IllegalStateException(Iterator remove() can only be
called once after next());
+}
+// store value as remove may change the entry in the decorator
(eg.TreeMap)
+Object value = last.getValue();
+super.remove();
+map.maps[1].remove(value);
+last = null;
+canRemove = false;
+}
+
+public Object getKey() {
+if (last == null) {
+throw new IllegalStateException(Iterator getKey() can only be
called after next() and before remove());
+}
+return last.getKey();
+}
+
+public Object getValue() {
+if (last == null) {
+throw new IllegalStateException(Iterator getValue() can only be
called after next() and before remove());
+}
+return last.getValue();
+}
+
+public Object setValue(Object value) {
+if (last == null) {
+throw new IllegalStateException(Iterator setValue() can only be
called after next() and before remove());
+}
+Object oldValue = last.setValue(value);
// Gets old key and pairs with new value
final Object inverseKey = map.maps[1].remove(oldValue);
1.4 +20 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/BidiMap.java
Index: BidiMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/BidiMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BidiMap.java 6 Oct 2003 23:47:17 - 1.3
+++ BidiMap.java 29 Oct 2003 00:06:25 - 1.4
@@ -70,8 +70,6 @@
* p
* Implementations should allow a value to be looked up from a key and
* a key to be looked up from a value with equal performance.
- * It should be noted that the quickest way to implement the codevalues/code
- * method is usually to return codeinverseBidiMap().keySet()/code.
*
* @see org.apache.commons.collections.DualHashBidiMap
* @since Commons Collections 3.0
@@ -80,6 +78,24 @@
* @author Stephen Colebourne
*/
public interface BidiMap extends Map {
+
+/**
+ * Obtains a
cvs commit: jakarta-commons/collections build.xml
rwaldhoff2003/10/27 15:08:21
Modified:collections build.xml
Log:
fix and re-enable build-validate-testframework
Revision ChangesPath
1.49 +2 -6 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 27 Oct 2003 16:17:26 - 1.48
+++ build.xml 27 Oct 2003 23:08:21 - 1.49
@@ -36,6 +36,7 @@
!-- patternset describing test framework source --
patternset id=patternset-testframework-source
include name=**/Bag.java/
+ include name=**/BidiMap.java/
include name=**/SortedBag.java/
include name=**/AbstractTest*.java/
include name=**/BulkTest*.java/
@@ -287,10 +288,6 @@
!-- validation build to ensure that testframework is independent --
target name=validate-build-testframework depends=init
if=available-src-test
- echo message= *** WARNING ***/
- echo message=This target temporarily disabled./
- echo message= *** WARNING ***/
- !--
delete dir=${dest.classes.testframework}/
mkdir dir=${dest.classes.testframework}/
copy todir=${dest.classes.testframework}
@@ -305,7 +302,6 @@
debug=${javac.debug}
deprecation=${javac.deprecation}
optimize=${javac.optimize}/
- --
/target
!-- # --
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/10/10 14:13:36
Modified:collections build.xml
Log:
Change ant to not report deprecated methods in test classes
Revision ChangesPath
1.47 +2 -2 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.xml 9 Oct 2003 21:00:05 - 1.46
+++ build.xml 10 Oct 2003 21:13:36 - 1.47
@@ -281,7 +281,7 @@
srcdir=${source.src.test}
classpath=${classpath}
debug=${javac.debug}
- deprecation=${javac.deprecation}
+ deprecation=false
optimize=${javac.optimize}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/10/09 14:00:05
Modified:collections build.xml
Log:
Change javadoc produced from public only to protected as well
Revision ChangesPath
1.46 +2 -2 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- build.xml 5 Oct 2003 23:12:15 - 1.45
+++ build.xml 9 Oct 2003 21:00:05 - 1.46
@@ -209,7 +209,7 @@
windowtitle=${Name-Long}
doctitle=${Name-Long}
bottom=lt;smallgt;Copyright amp;copy; 2001-${year} Apache
Software Foundation. Documenation generated ${TODAY}lt;/smallgt;.
- public=true
+ protected=true
version=true
author=true
overview=${source.src.java}/org/apache/commons/collections/package.html
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/10/02 16:46:54
Modified:collections build.xml
Log:
Add ability to create testframework jar
Revision ChangesPath
1.44 +40 -5 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 2 Oct 2003 20:36:11 - 1.43
+++ build.xml 2 Oct 2003 23:46:54 - 1.44
@@ -6,21 +6,33 @@
!-- patternset describing test classes --
patternset id=patternset-test-classes
+ include name=**/AbstractTest*.class/
+ include name=**/BulkTest*.class/
include name=**/Test*.class/
/patternset
!-- patternset describing non test classes --
patternset id=patternset-non-test-classes
include name=**/*.class/
+ exclude name=**/AbstractTest*.class/
+ exclude name=**/BulkTest*.class/
exclude name=**/Test*.class/
/patternset
!-- patternset describing non test source files (*.java, *html, etc.) --
patternset id=patternset-javadocable-sources
include name=**/*/
+ exclude name=**/AbstractTest*.java/
+ exclude name=**/BulkTest*.java/
exclude name=**/Test*.java/
/patternset
+ !-- patternset describing test framework classes --
+ patternset id=patternset-testframework-classes
+ include name=**/AbstractTest*.class/
+ include name=**/BulkTest*.class/
+ /patternset
+
!-- # --
target name=init
@@ -71,6 +83,7 @@
property name=dest.doc.api value=${dest.doc}/api/
property name=dest.jardir value=${dest}/
property name=dest.jardir.jar value=${dest.jardir}/${name}.jar/
+ property name=dest.jardir.testframework.jar
value=${dest.jardir}/${name}-testframework.jar/
property name=dest.jardir.object-jar
value=${dest.jardir}/${name}-object.jar/
property name=dest.jardir.primitive-jar
value=${dest.jardir}/${name}-primitive.jar/
@@ -253,15 +266,18 @@
target name=dist depends=test,dist-jar,doc,dist-tar,dist-zip
description=builds binary distribution/
- target name=dist-jar depends=build
+ target name=dist-jar depends=dist-jar-main/
+ !-- Add testframework to above if it is to be released --
+
+ target name=dist-jar-main depends=build
mkdir dir=${dest.jardir}/
+
mkdir dir=${workdir}/
copy todir=${workdir}
fileset dir=${dest.classes}
patternset refid=patternset-non-test-classes/
/fileset
/copy
-
mkdir dir=${workdir}/META-INF/
copy todir=${workdir}/META-INF file=./LICENSE.txt/
@@ -281,14 +297,32 @@
include name=org/apache/commons/collections/primitives/**/
/fileset
/jar
-
+
delete dir=${workdir}/
- delete dir=${dest.classes}/
+ /target
+
+ target name=dist-jar-testframework depends=build-test
+ mkdir dir=${dest.jardir}/
+
+ mkdir dir=${workdir}/
+ copy todir=${workdir}
+ fileset dir=${dest.classes}
+patternset refid=patternset-testframework-classes/
+ /fileset
+ /copy
+ mkdir dir=${workdir}/META-INF/
+ copy todir=${workdir}/META-INF file=./LICENSE.txt/
+ jar jarfile=${dest.jardir.testframework.jar}
manifest=${source.src}/conf/MANIFEST.MF
+ fileset dir=${workdir}/
+ /jar
+
+ delete dir=${workdir}/
/target
target name=dist-tar depends=dist-jar,doc
+ delete dir=${dest.classes}/
mkdir dir=${workdir}/${bin.name}/
copy todir=${workdir}/${bin.name}
fileset dir=${dest}
@@ -312,6 +346,7 @@
target name=dist-zip depends=dist-jar,doc
+ delete dir=${dest.classes}/
mkdir dir=${workdir}/${bin.name}/
copy todir=${workdir}/${bin.name}
fileset dir=${dest}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
scolebourne2003/10/01 13:03:35
Modified:collections build.xml
Log:
Puts back the jar files to where they were to get builds going again
Revision ChangesPath
1.42 +2 -2 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.xml 29 Sep 2003 22:46:15 - 1.41
+++ build.xml 1 Oct 2003 20:03:35 - 1.42
@@ -71,7 +71,7 @@
property name=dest.doc.api value=${dest.doc}/api/
property name=dest.jardir value=${dest}/
property name=dest.jardir.jar value=${dest.jardir}/${name}.jar/
- property name=dest.jardir.object-jar value=${dest.jardir}/${name}.jar/
+ property name=dest.jardir.object-jar
value=${dest.jardir}/${name}-object.jar/
property name=dest.jardir.primitive-jar
value=${dest.jardir}/${name}-primitive.jar/
property name=bin.name value=${name}-${component.version}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml maven.xml
rwaldhoff2003/09/15 22:32:54
Modified:collections build.xml maven.xml
Log:
generate object and primitive jars in both maven and ant
Revision ChangesPath
1.39 +17 -1 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 13 Jan 2003 23:54:38 - 1.38
+++ build.xml 16 Sep 2003 05:32:54 - 1.39
@@ -71,6 +71,8 @@
property name=dest.doc.api value=${dest.doc}/api/
property name=dest.jardir value=${dest}/
property name=dest.jardir.jar value=${dest.jardir}/${name}.jar/
+ property name=dest.jardir.object-jar
value=${dest.jardir}/${name}-object.jar/
+ property name=dest.jardir.primitive-jar
value=${dest.jardir}/${name}-primitive.jar/
property name=bin.name value=${name}-${component.version}/
property name=dest.bin.tar value=${dest}/${bin.name}.tar/
@@ -266,6 +268,20 @@
jar jarfile=${dest.jardir.jar} manifest=${source.src}/conf/MANIFEST.MF
fileset dir=${workdir}/
/jar
+
+ jar jarfile=${dest.jardir.object-jar}
manifest=${source.src}/conf/MANIFEST.MF
+ fileset dir=${workdir}
+exclude name=org/apache/commons/collections/primitives/**/
+ /fileset
+ /jar
+
+ jar jarfile=${dest.jardir.primitive-jar}
manifest=${source.src}/conf/MANIFEST.MF
+ fileset dir=${workdir}
+include name=META-INF/**/
+include name=org/apache/commons/collections/primitives/**/
+ /fileset
+ /jar
+
delete dir=${workdir}/
delete dir=${dest.classes}/
1.3 +25 -1 jakarta-commons/collections/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 26 Feb 2003 01:33:22 - 1.2
+++ maven.xml 16 Sep 2003 05:32:54 - 1.3
@@ -1,6 +1,30 @@
-project default=java:jar xmlns:j=jelly:core
+project default=java:jar xmlns:j=jelly:core xmlns:ant=jelly:ant
postGoal name=clover:on
j:set var=maven.junit.sysproperties value=${maven.junit.sysproperties}
org.apache.commons.collections:with-clover/
j:set var=org.apache.commons.collections:with-clover value=true/
/postGoal
+
+ postGoal name=jar:jar
+ ant:tstamp/
+ ant:property name=workdir
value=${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}/
+ ant:unjar dest=${workdir}
src=${maven.build.dir}/${maven.final.name}.jar/
+
+ ant:jar
jarfile=${maven.build.dir}/${pom.artifactId}-object-${pom.currentVersion}.jar
manifest=${workdir}/META-INF/MANIFEST.MF
+ ant:fileset dir=${workdir}
+ant:exclude name=org/apache/commons/collections/primitives/**/
+ant:exclude name=META-INF/INDEX.LIST/
+ /ant:fileset
+ /ant:jar
+
+ ant:jar
jarfile=${maven.build.dir}/${pom.artifactId}-primitive-${pom.currentVersion}.jar
manifest=${workdir}/META-INF/MANIFEST.MF
+ ant:fileset dir=${workdir}
+ant:include name=META-INF/**/
+ant:exclude name=META-INF/INDEX.LIST/
+ant:include name=org/apache/commons/collections/primitives/**/
+ /ant:fileset
+ /ant:jar
+
+ delete dir=${workdir}/
+ /postGoal
+
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
rwaldhoff2003/01/06 04:54:58
Modified:collections build.xml
Log:
cosmetic changes only
Revision ChangesPath
1.35 +4 -5 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 6 Jan 2003 12:54:05 - 1.34
+++ build.xml 6 Jan 2003 12:54:57 - 1.35
@@ -49,7 +49,7 @@
property name=Name-Long value=Jakarta Commons Collections Package/
!-- The current version number of this component --
- property name=component.version value=2.1/
+ property name=component.version value=2.1/
property name=doc.release.notes
value=RELEASE-NOTES-${component.version}.html/
property name=doc.status value=STATUS.html/
@@ -76,10 +76,9 @@
property name=dest.bin.zip value=${dest}/${bin.name}.zip/
property name=src.name value=${bin.name}-src/
- property name=dest.src.tarvalue=${dest}/${src.name}.tar/
- property name=dest.src.tar.gzvalue=${dest}/${src.name}.tar.gz/
- property name=dest.src.zip value=${dest}/${src.name}.zip/
-
+ property name=dest.src.tar value=${dest}/${src.name}.tar/
+ property name=dest.src.tar.gz value=${dest}/${src.name}.tar.gz/
+ property name=dest.src.zip value=${dest}/${src.name}.zip/
property name=javac.debug value=true/
property name=javac.deprecation value=true/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
rwaldhoff2003/01/06 05:00:54
Modified:collections build.xml
Log:
* run test as part of dist -- good for gump, good for releases
* update copy; to include 2003
Revision ChangesPath
1.36 +3 -3 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 6 Jan 2003 12:54:57 - 1.35
+++ build.xml 6 Jan 2003 13:00:54 - 1.36
@@ -177,7 +177,7 @@
destdir=${dest.doc.api}
windowtitle=${Name-Long}
doctitle=${Name-Long}
- bottom=lt;smallgt;Copyright amp;copy; 2001-2002 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
+ bottom=lt;smallgt;Copyright amp;copy; 2001-2003 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
protected=true
version=true
author=true
@@ -247,7 +247,7 @@
!-- # --
- target name=dist depends=dist-jar,doc,dist-tar,dist-zip description=builds
binary distribution/
+ target name=dist depends=test,dist-jar,doc,dist-tar,dist-zip
description=builds binary distribution/
target name=dist-jar depends=build
mkdir dir=${dest.jardir}/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-commons/collections build.xml
On 6 Jan 2003, [EMAIL PROTECTED] wrote:
* update copy; to include 2003
You could use
tstamp
format property=year pattern=/
/tstamp
and
Copyright amp;copy; 2001-${year}
instead. One place less that gets forgotten to update next year.
Stefan
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-commons/collections build.xml
[EMAIL PROTECTED] wrote: rwaldhoff2003/01/06 05:00:54 Modified:collections build.xml Log: * run test as part of dist -- good for gump, good for releases +1 Two files seem to be missing, though, see: http://nagoya.apache.org/~rubys/gump/commons-collections.html This causes a lot of yellow on the gump page: http://nagoya.apache.org/~rubys/gump/ - Sam Ruby -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-commons/collections build.xml
I get the same problems and have been working to address it. See the recent [collections] thread. (This way maybe someone else will get to it first :) On Mon, 6 Jan 2003, Sam Ruby wrote: [EMAIL PROTECTED] wrote: rwaldhoff2003/01/06 05:00:54 Modified:collections build.xml Log: * run test as part of dist -- good for gump, good for releases +1 Two files seem to be missing, though, see: http://nagoya.apache.org/~rubys/gump/commons-collections.html This causes a lot of yellow on the gump page: http://nagoya.apache.org/~rubys/gump/ - Sam Ruby -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
rwaldhoff2003/01/06 16:08:38
Modified:collections build.xml
Log:
follow Stefan's advice and use ${year} instead of 2003
Revision ChangesPath
1.37 +5 -3 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.xml 6 Jan 2003 13:00:54 - 1.36
+++ build.xml 7 Jan 2003 00:08:38 - 1.37
@@ -24,7 +24,9 @@
!-- # --
target name=init
- tstamp/
+ tstamp
+format property=year pattern=/
+ /tstamp
!-- read properties from the build.properties, if any --
property name=component-propfile value=${basedir}/build.properties/
@@ -177,7 +179,7 @@
destdir=${dest.doc.api}
windowtitle=${Name-Long}
doctitle=${Name-Long}
- bottom=lt;smallgt;Copyright amp;copy; 2001-2003 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
+ bottom=lt;smallgt;Copyright amp;copy; 2001-${year} Apache
Software Foundation. Documenation generated ${TODAY}lt;/smallgt;.
protected=true
version=true
author=true
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
rwaldhoff02/05/04 05:33:01
Modified:collections build.xml
Log:
(c) 2001 - 2002
Revision ChangesPath
1.28 +2 -2 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 2 Apr 2002 16:29:20 - 1.27
+++ build.xml 4 May 2002 12:33:01 - 1.28
@@ -1,4 +1,4 @@
-!-- $Id: build.xml,v 1.27 2002/04/02 16:29:20 morgand Exp $ --
+!-- $Id: build.xml,v 1.28 2002/05/04 12:33:01 rwaldhoff Exp $ --
project name=commons-collections default=test basedir=.
!-- patternset describing files to be copied from the doc directory --
@@ -173,7 +173,7 @@
destdir=${dest.doc.api}
windowtitle=${Name-Long}
doctitle=${Name-Long}
- bottom=lt;smallgt;Copyright amp;copy; 2001 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
+ bottom=lt;smallgt;Copyright amp;copy; 2001-2002 Apache Software
Foundation. Documenation generated ${TODAY}lt;/smallgt;.
protected=true
version=true
author=true
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
morgand 02/04/02 08:29:20
Modified:collections build.xml
Log:
changed build script to use local copy of LICENSE file
Revision ChangesPath
1.27 +4 -4 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 28 Mar 2002 15:45:03 - 1.26
+++ build.xml 2 Apr 2002 16:29:20 - 1.27
@@ -1,4 +1,4 @@
-!-- $Id: build.xml,v 1.26 2002/03/28 15:45:03 morgand Exp $ --
+!-- $Id: build.xml,v 1.27 2002/04/02 16:29:20 morgand Exp $ --
project name=commons-collections default=test basedir=.
!-- patternset describing files to be copied from the doc directory --
@@ -145,7 +145,7 @@
target name=doc-top depends=init
mkdir dir=${dest}/
- copy todir=${dest} file=../LICENSE/
+ copy todir=${dest} file=./LICENSE/
copy todir=${dest} file=${doc.status}/
copy todir=${dest} file=${doc.release.notes}/
/target
@@ -255,7 +255,7 @@
/copy
mkdir dir=${workdir}/META-INF/
- copy todir=${workdir}/META-INF file=../LICENSE/
+ copy todir=${workdir}/META-INF file=./LICENSE/
jar jarfile=${dest.jardir.jar} manifest=${source.src}/conf/MANIFEST.MF
fileset dir=${workdir}/
@@ -322,7 +322,7 @@
fileset dir=${workdir}/jakarta-commons/collections/
/move
delete dir=${workdir}/jakarta-commons/
- copy file=../LICENSE toDir=${workdir}/${src.name}/
+ copy file=./LICENSE toDir=${workdir}/${src.name}/
!-- create tar.gz --
tar longfile=gnu tarfile=${dest.src.tar}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
morgand 02/03/28 07:45:03
Modified:collections build.xml
Log:
updated source distro task to work more like previous versions
Revision ChangesPath
1.26 +6 -2 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 28 Mar 2002 06:50:15 - 1.25
+++ build.xml 28 Mar 2002 15:45:03 - 1.26
@@ -1,4 +1,4 @@
-!-- $Id: build.xml,v 1.25 2002/03/28 06:50:15 morgand Exp $ --
+!-- $Id: build.xml,v 1.26 2002/03/28 15:45:03 morgand Exp $ --
project name=commons-collections default=test basedir=.
!-- patternset describing files to be copied from the doc directory --
@@ -318,7 +318,11 @@
cvs dest=${workdir} cvsRoot=${cvs.root}
package=jakarta-commons tag=${cvs.tag}/
- copy file=../LICENSE toDir=${workdir}/jakarta-commons/
+ move toDir=${workdir}/${src.name}
+fileset dir=${workdir}/jakarta-commons/collections/
+ /move
+ delete dir=${workdir}/jakarta-commons/
+ copy file=../LICENSE toDir=${workdir}/${src.name}/
!-- create tar.gz --
tar longfile=gnu tarfile=${dest.src.tar}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
morgand 02/03/27 21:13:54
Modified:collections build.xml
Log:
added targets to build binary distributions
Revision ChangesPath
1.23 +53 -3 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 19 Mar 2002 01:21:53 - 1.22
+++ build.xml 28 Mar 2002 05:13:54 - 1.23
@@ -1,4 +1,4 @@
-!-- $Id: build.xml,v 1.22 2002/03/19 01:21:53 jefft Exp $ --
+!-- $Id: build.xml,v 1.23 2002/03/28 05:13:54 morgand Exp $ --
project name=commons-collections default=test basedir=.
!-- patternset describing files to be copied from the doc directory --
@@ -69,7 +69,13 @@
property name=dest.doc.api value=${dest.doc}/api/
property name=dest.jardir value=${dest}/
property name=dest.jardir.jar value=${dest.jardir}/${name}.jar/
-
+
+ property name=bin.name value=${name}-${component.version}/
+ property name=dest.bin.tar value=${dest}/${bin.name}.tar/
+ property name=dest.bin.tar.gz value=${dest}/${bin.name}.tar.gz/
+ property name=dest.bin.zip value=${dest}/${bin.name}.zip/
+
+
available property=available-doc file=${source.doc}/ !-- does this
module have docs? --
available property=available-src-java file=${source.src.java}/ !--
does this module have java src? --
available property=available-src-test file=${source.src.test}/ !--
does this module have test src? --
@@ -223,7 +229,7 @@
!-- # --
- target name=dist depends=dist-jar,doc description=builds binary
distribution/
+ target name=dist depends=dist-jar,doc,dist-tar,dist-zip description=builds
binary distribution/
target name=dist-jar depends=build
mkdir dir=${dest.jardir}/
@@ -238,7 +244,51 @@
/jar
delete dir=${workdir}/
delete dir=${dest.classes}/
+
/target
+
+ target name=dist-tar depends=dist-jar,doc
+
+ mkdir dir=${workdir}/${bin.name}/
+ copy todir=${workdir}/${bin.name}
+ fileset dir=${dest}
+ exclude name=${bin.name}.zip/
+ exclude name=${bin.name}.tar.gz/
+ /fileset
+ /copy
+
+ !-- create tar.gz --
+ tar longfile=gnu tarfile=${dest.bin.tar}
+tarfileset dir=${workdir}/
+ /tar
+
+ gzip zipfile=${dest.bin.tar.gz}
+ src=${dest.bin.tar}
+ /gzip
+ delete file=${dest.bin.tar} /
+
+ delete dir=${workdir}/
+
+ /target
+
+ target name=dist-zip depends=dist-jar,doc
+
+ mkdir dir=${workdir}/${bin.name}/
+ copy todir=${workdir}/${bin.name}
+ fileset dir=${dest}
+ exclude name=${bin.name}.zip/
+ exclude name=${bin.name}.tar.gz/
+ /fileset
+ /copy
+
+ !-- create a zip file --
+ zip zipfile=${dest.bin.zip}
+zipfileset dir=${workdir} /
+ /zip
+
+ delete dir=${workdir}/
+
+ /target
!-- # --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections build.xml
morgand 02/03/27 21:23:37
Modified:collections build.xml
Log:
added LICENSE to binary distribution jar
Revision ChangesPath
1.24 +5 -1 jakarta-commons/collections/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 28 Mar 2002 05:13:54 - 1.23
+++ build.xml 28 Mar 2002 05:23:37 - 1.24
@@ -1,4 +1,4 @@
-!-- $Id: build.xml,v 1.23 2002/03/28 05:13:54 morgand Exp $ --
+!-- $Id: build.xml,v 1.24 2002/03/28 05:23:37 morgand Exp $ --
project name=commons-collections default=test basedir=.
!-- patternset describing files to be copied from the doc directory --
@@ -239,6 +239,10 @@
patternset refid=patternset-non-test-classes/
/fileset
/copy
+
+ mkdir dir=${workdir}/META-INF/
+ copy todir=${workdir}/META-INF file=../LICENSE/
+
jar jarfile=${dest.jardir.jar} manifest=${source.src}/conf/MANIFEST.MF
fileset dir=${workdir}/
/jar
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
