You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/09/02 19:09:00 UTC

[6/7] git commit: BROOKLYN-32: change geo lookup to utrace

BROOKLYN-32: change geo lookup to utrace

MaxMind GeoIP package license is LGPL2.1, which is incompatible with the
Apache license, therefore we need to remove it.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/19aad5dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/19aad5dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/19aad5dd

Branch: refs/heads/master
Commit: 19aad5dd45f3797b36cf7ffbea2b08291f0a16dd
Parents: b4e649d
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 2 17:16:23 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 2 17:56:08 2014 +0100

----------------------------------------------------------------------
 core/src/main/java/brooklyn/location/geo/HostGeoInfo.java        | 3 +--
 .../entity/dns/geoscaling/GeoscalingIntegrationTest.java         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/19aad5dd/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
index 6f26aca..c1ff026 100644
--- a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
+++ b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
@@ -129,8 +129,7 @@ public class HostGeoInfo implements Serializable {
     private static HostGeoLookup findHostGeoLookupImpl() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
         String type = BrooklynSystemProperties.HOST_GEO_LOOKUP_IMPL.getValue();
         //like utrace because it seems more accurate than geobytes and gives a report of how many tokens are left
-        //but maxmind free is even better
-        if (type==null) return new MaxMindHostGeoLookup();
+        if (type==null) return new UtraceHostGeoLookup();
         if (type.isEmpty()) return null;
         return (HostGeoLookup) Class.forName(type).newInstance();
     }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/19aad5dd/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
index 97ea9a7..8af53fb 100644
--- a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
@@ -37,7 +37,7 @@ import brooklyn.entity.proxying.EntitySpec;
 import brooklyn.location.basic.SshMachineLocation;
 import brooklyn.location.geo.HostGeoInfo;
 import brooklyn.location.geo.HostGeoLookup;
-import brooklyn.location.geo.MaxMindHostGeoLookup;
+import brooklyn.location.geo.UtraceHostGeoLookup;
 import brooklyn.test.Asserts;
 import brooklyn.test.entity.TestApplication;
 import brooklyn.test.entity.TestEntity;
@@ -167,7 +167,7 @@ public class GeoscalingIntegrationTest {
         
         public StubHostGeoLookup(String delegateImpl) throws Exception {
             if (delegateImpl == null) {
-                delegate = new MaxMindHostGeoLookup();
+                delegate = new UtraceHostGeoLookup();
             } else {
                 delegate = (HostGeoLookup) Class.forName(delegateImpl).newInstance();
             }