Author: henning
Date: Mon Sep 26 10:56:01 2005
New Revision: 291695
URL: http://svn.apache.org/viewcvs?rev=291695&view=rev
Log:
- LRUMap moved into map subpackage by collections 3.0
- Actually think long and hard what classes from the collections jar
are needed. Just include these. Before we fetched everything from the
sub packages (but it seems that the parent class of LRUMap,
SequencedHashMap was missing, so this probably never worked before.
This patch shrinks velocity-dep by ~ 300k.
Modified:
jakarta/velocity/core/trunk/build/build.xml
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
Modified: jakarta/velocity/core/trunk/build/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/build/build.xml?rev=291695&r1=291694&r2=291695&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/build/build.xml (original)
+++ jakarta/velocity/core/trunk/build/build.xml Mon Sep 26 10:56:01 2005
@@ -327,13 +327,16 @@
<unzip src="${collections.jar}" dest="${build.dest}" />
- <!-- we only want one file right now, the ExtendedProperties -->
- <!-- keep jars svelte... -->
-
+ <!-- we only want a few files -->
<delete>
<fileset dir="${build.dest}">
- <include name="org/apache/commons/collections/*.class" />
- <exclude name="org/apache/commons/collections/LRUMap.class" />
+ <include name="org/apache/commons/collections/**/*.class" />
+ <exclude name="org/apache/commons/collections/map/LRUMap.class" />
+ <exclude
name="org/apache/commons/collections/map/AbstractHashedMap.class" />
+ <exclude
name="org/apache/commons/collections/map/AbstractLinkedMap.class" />
+ <exclude name="org/apache/commons/collections/IterableMap.class" />
+ <exclude name="org/apache/commons/collections/BoundedMap.class" />
+ <exclude name="org/apache/commons/collections/OrderedMap.class" />
<exclude
name="org/apache/commons/collections/ExtendedProperties*.class" />
</fileset>
</delete>
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java?rev=291695&r1=291694&r2=291695&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
Mon Sep 26 10:56:01 2005
@@ -21,7 +21,7 @@
import java.util.Map;
import java.util.Iterator;
-import org.apache.commons.collections.LRUMap;
+import org.apache.commons.collections.map.LRUMap;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
