← Back to branch summary

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

« back to all changes in this revision

Viewing changes to clc/modules/configuration/src/main/java/com/eucalyptus/config/Configuration.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/configuration/src/main/java/com/eucalyptus/config/Configuration.java
76
76
import com.eucalyptus.util.EucalyptusCloudException;
77
77
import com.eucalyptus.util.NetworkUtil;
78
78
import com.google.common.collect.Maps;
 
79
import com.google.common.collect.MapMaker;
79
80
import edu.ucsb.eucalyptus.msgs.ComponentInfoType;
80
81
import edu.ucsb.eucalyptus.msgs.DeregisterComponentResponseType;
81
82
import edu.ucsb.eucalyptus.msgs.DeregisterComponentType;
93
94
  static String         CLUSTER_KEY_FSTRING = "cc-%s";
94
95
  static String         NODE_KEY_FSTRING    = "nc-%s";
95
96
 
96
 
  private static Map<Class,ServiceBuilder<ComponentConfiguration>> builders = Maps.newConcurrentHashMap( );
 
97
  private static Map<Class,ServiceBuilder<ComponentConfiguration>> builders = new MapMaker( ).makeMap();
97
98
  public static void addBuilder( Class c, ServiceBuilder b ) {
98
99
    builders.put( c, b );
99
100
  }