← Back to branch summary

~ubuntu-branches/ubuntu/vivid/eucalyptus/vivid

« back to all changes in this revision

Viewing changes to clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java

  • Committer: Bazaar Package Importer
  • Author(s): James Page
  • Date: 2011-05-18 10:46:58 UTC
  • Revision ID: james.westby@ubuntu.com-20110518104658-umi4lvp0yqtu8cl9
Tags: 2.0.1+bzr1256-0ubuntu5
https://launchpad.net/bugs/784491
* Fix FTBFS against libgoogle-collections-java 1.0 (LP: #784491). 
  - debian/patches/26-google-collections-1.0-ftbfs.patch: refactoring
    to use 1.0 API.
* Fix libjibx-java to version 1.1 to allow entry of libjibx1.2-java 
  into universe without breaking eucalyptus:
  - debian/eucalyptus-java-common.links: use jibx-*-1.1.jar.
  - debian/build-jars: use jibx-*-1.1.jar.
  - debian/control: use libjibx1.1-java instead of libjibx-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/ServiceJarDiscovery.java
22
22
import com.eucalyptus.system.Ats;
23
23
import com.eucalyptus.system.BaseDirectory;
24
24
import com.google.common.base.Function;
 
25
import com.google.common.collect.ArrayListMultimap;
25
26
import com.google.common.collect.Lists;
26
27
import com.google.common.collect.Multimap;
27
28
import com.google.common.collect.Multimaps;
30
31
public abstract class ServiceJarDiscovery implements Comparable<ServiceJarDiscovery> {
31
32
  private static Logger                         LOG       = Logger.getLogger( ServiceJarDiscovery.class );
32
33
  private static SortedSet<ServiceJarDiscovery> discovery = Sets.newTreeSet( );
33
 
  private static Multimap<Class, String>        classList = Multimaps.newArrayListMultimap( );
 
34
  private static Multimap<Class, String>        classList = ArrayListMultimap.create( );
34
35
  
35
36
  @SuppressWarnings( { "deprecation", "unchecked" } )
36
37
  public static void processFile( File f ) throws IOException {