Update Google Collections RC1 to Guava 15

.classpath

@@ -27,7 +27,7 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/gdata-contacts-meta-3.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/gdata-core-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/google-collect-1.0-rc1.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/guava-15.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/httpclient-osgi-4.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/httpcore-osgi-4.2.3.jar"/>

build.xml

@@ -1086,8 +1086,9 @@
         bundle-globalshortcut,bundle-plugin-msofficecomm,bundle-libjitsi,
         bundle-customcontactactions, bundle-phonenumbercontactsource,
         bundle-demuxcontactsource, bundle-muc,
-    	bundle-desktoputil,bundle-globaldisplaydetails,
+        bundle-desktoputil,bundle-globaldisplaydetails,
-        bundle-plugin-propertieseditor,bundle-plugin-accountinfo"/>
+        bundle-plugin-propertieseditor,bundle-plugin-accountinfo,
+        bundle-guava"/>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -1364,7 +1365,6 @@
                 prefix="net/java/sip/communicator/service/googlecontacts"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/googlecontacts"
                 prefix="net/java/sip/communicator/impl/googlecontacts" />
-            <zipfileset src="${lib.noinst}/google-collect-1.0-rc1.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/gdata-core-1.0.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/gdata-contacts-3.0.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/gdata-contacts-meta-3.0.jar" prefix=""/>
@@ -1372,6 +1372,7 @@
             <zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/>
         </jar>
     </target>
+
     <!--BUNDLE-GOOGLECONTACTS-SERVICE-->
     <target name="bundle-googlecontacts-service">
         <jar compress="false" destfile="${bundles.dest}/googlecontacts-service.jar"
@@ -1381,6 +1382,10 @@
         </jar>
     </target>
 
+    <target name="bundle-guava">
+        <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
+    </target>
+
     <!--BUNDLE-SERVICEBINDER -->
     <target name="bundle-servicebinder">
         <jar compress="true" destfile="lib/bundle/servicebinder.jar"

lib/felix.client.run.properties

@@ -33,7 +33,8 @@ felix.auto.start.10= \
  reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
  reference:file:sc-bundles/bouncycastle.jar \
  reference:file:sc-bundles/bccontrib.jar \
- reference:file:sc-bundles/commons-lang.jar
+ reference:file:sc-bundles/commons-lang.jar \
+ reference:file:sc-bundles/guava.jar
  
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/servicebinder.jar \

lib/felix.unit.test.properties

@@ -49,7 +49,8 @@ felix.auto.start.10= \
  reference:file:lib/installer-exclude/objenesis-1.2.jar \
  reference:file:lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar \
  reference:file:sc-bundles/bouncycastle.jar \
- reference:file:sc-bundles/bccontrib.jar
+ reference:file:sc-bundles/bccontrib.jar \
+ reference:file:sc-bundles/guava.jar
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/bundlerepository.jar \
 # file:lib/bundle/servicebinder.jar \