Convert from google-collect-1.0-rc3 to guava-r07

Author: [email protected]

build-src/build.properties

@@ -5,7 +5,7 @@
 servlet-api.jar=../lib/servlet-api-2.4.jar
 
 # You may want to edit the following dependencies if you wish to use your own copy of them.
-google-collect.jar=../lib/google-collect-1.0-rc3.jar
+guava.jar=../lib/guava-r07.jar
 icu4j.jar=../lib/icu4j-4_0_1.jar
 jakarta-commons-lang.jar=../lib/commons-lang-2.4.jar
 opencsv.jar=../lib/opencsv-1.8.jar

build-src/build.xml

@@ -50,7 +50,7 @@
     <javac srcdir="${src.datasource}:${build.genfiles}/${datasource}/query/parser"
            destdir="${build.class.main}">
       <classpath>
-        <pathelement location="${google-collect.jar}"/>
+        <pathelement location="${guava.jar}"/>
         <pathelement location="${icu4j.jar}"/>
         <pathelement location="${jakarta-commons-lang.jar}"/>
         <pathelement location="${jakarta-commons-logging.jar}"/>
@@ -72,7 +72,7 @@
     <javac srcdir="${src.example}" destdir="${build.class.example}">
       <classpath>
         <pathelement location="${build.class.main}"/>
-        <pathelement location="${google-collect.jar}"/>
+        <pathelement location="${guava.jar}"/>
         <pathelement location="${icu4j.jar}"/>
         <pathelement location="${jakarta-commons-lang.jar}"/>
         <pathelement location="${jakarta-commons-logging.jar}"/>
@@ -90,7 +90,7 @@
         <pathelement location="${junit.jar}"/>
         <pathelement location="${easymock.jar}"/>
         <pathelement location="${build.class.main}"/>
-        <pathelement location="${google-collect.jar}"/>
+        <pathelement location="${guava.jar}"/>
         <pathelement location="${icu4j.jar}"/>
         <pathelement location="${jakarta-commons-lang.jar}"/>
         <pathelement location="${servlet-api.jar}"/>
@@ -111,7 +111,7 @@
         <pathelement location="${easymock.jar}"/>
         <pathelement location="${build.class.main}"/>
         <pathelement location="${build.class.test}"/>
-        <pathelement location="${google-collect.jar}"/>
+        <pathelement location="${guava.jar}"/>
         <pathelement location="${icu4j.jar}"/>
         <pathelement location="${jakarta-commons-lang.jar}"/>
         <pathelement location="${jakarta-commons-logging.jar}"/>

lib/google-collect-1.0-rc3.jar

@@ -33,9 +33,9 @@
       <version>1.1.1</version>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
-      <version>1.0-rc3</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r07</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.icu</groupId>