浙江临床医学 ２ １ ０ １年 １ １月第 １ ３卷第 １ １期
ｌ２ ? ２７
慢性心力衰竭患者 Ｃ Ｔ治疗前后 Ｒ 心功能及超敏 Ｃ反应蛋 白变化 夏林 虎 惠 杰
【 摘要】 目 观察慢性心力衰竭（ 的 简称心衰） 者行心脏再同 患 步化治疗前后心功能及超敏Ｃ 反应蛋白 变化。方法 对 本院１ ８例符合 Ｃ Ｔ植入指征的慢性 心力衰竭患者行心脏再 同步化治疗 ， Ｒ １例永久性房颤患者同时行房室结消融术 ， 于术 并 后 ２ｈ３ 月 、 ４ 、个 ６个月行 Ａ Ｖ Ｖ、 Ｖ优化 ， 观察术前 、 术后 ３个月 、 ６个月 Ｎ Ｈ Ｙ Ａ心功能分级 、 左室射血分数（ Ｖ Ｆ 、 Ｌ Ｅ ） 左室舒张末 内径 （ Ｖ Ｄ 、 Ｌ Ｅ Ｄ） 二尖瓣 反流量（ Ａ） 心脏 同步化指标 一主肺动脉射血期前 时间差 （Ｖ ＭＲ 、 ＩＭＤ） 室间隔及左室后壁收缩达峰时 、 间延迟 （ Ｐ Ｓ ＷＭＤ） Ｈｓ Ｃ Ｐ变化。结果 及 ―Ｒ Ｈ ―Ｃ Ｐ水平较术前下降。 ｓ Ｒ １ ８例患者植入 后心衰症状明显改善 ，Ｖ Ｆ、Ｖ Ｄ ＭＲ Ｌ Ｅ Ｌ Ｅ Ｄ、 Ａ等心功能指标 明显改
善， ｓ Ｃ Ｐ较术前明显下降。结论 慢性心衰患者行再同步化治疗后， Ｈ―Ｒ 通过心超优化 Ａ 、 Ｖ间期后 ， ＶＶ 心功能明显改善、
【 关键词】 心 脏再同 步化治疗 优化 超敏ｃ 反应蛋白 心功能 慢性心力衰竭 【 ｂｔ ｃ】 Ｏ ｊ ｔｅ ｏｎ ｓ ａ ｒｔｎ ｏｈ ｒｕｃｏ ａ ｅｅ ｌｏｈ ｅｅ ｉ ｅ ａ ｉ ｏｉｂ ｏ ｄ Ａ ｓ ａｔ ｒ ｂ ｃｖ ｅ ｉ Ｔ ｖ ｔ ｔｖ ｉｉｓｆｅ ｔ ｎ ｉ ｄｈ ｌ ｅ ｐｒｎｔ ｒ ｃｖｐ ｔｎ ｅｒａ ｉ ｅｉ ｅ ａａｏ ａ ｔｎ ｎ ｔ ｖｓｆｙ ｓ ｓ ｖＣ ｅ ｔｅ ｒｅ ｆｅｎ ｇ ｆ ｉ ａ ｅ Ｔ ｔｅ ｔ ｎ ｎｐ ｔ ｎｓｗｉ ｈｏ ｉ ｅ ｒ ｆｉ ｒ．Ｍ ｅｈ ｄ １ ｅ ｒ ｆｉ ｒ ａｉｎｓｗｈ ｅ ｅ ｅ ＲＴ， ＶＪｗ ｒ ｂａｅ ｔ ｆ ｒＣＲ ｒａｍｅ ｔｉ ａｉ ｔ ｔ ｃ ｒｎｃｈ ａｔ ａｌ ｅ ｅ ｈ ｕ ｔ ｏ ｓ ｈ ａ ａｌ ｅｐ ｔ ｔ ｏｒｃ ｖｄ Ｃ ８ ｔ ｕ ｅ Ａ ｅｅａ ｌｔｄ ｂ ａ ｉ ｆ ｑ ｅ ｃ ｎ ｏ ｅｐ ｔ ｎ ｉ ｅ ｍａ ｅ ｔ ｔ ａ ｆ ｒ ｌ ｔ ｎ Ｔ ｅＡＶ、 ｅ ａ ｅ ｅ ｏ ｔ ｚ ｄ ｂ ｃ ｏ ａ ｄｏ ｒ ｐ ｙａ ４ ｈ ｕ ， ｙ ｒ ｄ ｏｒ ｕ ｎ ｙ ｉ ｎ ａｉ ｔ ｔ ｐ ｒ ｎ ｎ ｒ ｌ ｂ ｉ ａｉ ． ｈ ｅ ｅ ｗ ｈ ａ ｉ ｉ ｌ ｏ ＶＶ ｄ ｌｙ ｗ ｒ ｐ ｉ ｅ ｙｅ ｈ ｃ ｒ ｉｇ ａ ｈ ｔ ｏ ｒ ｍｉ ２
３ｍ ｎｈ ， ｏｔｓａｅ ｐ ｒ ｉ ． ｈ Ｙ Ａ ｆｎ ｔｎｌｃａｓ ｌ ｅｔｃｌ ｊｃ ｏ ａｔ ｎ Ｌｆ ｖｎｒ ｕａ ｎ ｏｔｓ６ ｍ ｎｈ ｆ ｒｏｅａｏ Ｔ ｅＮ Ｈ ｕ ｃｏ ａ ｌｓ， ｆ ｖｎｒ ｕａ ｅ ｔｎ ｆ ｃｉ ， ｅ ｅｔｃ ｌ ｅｄ―ｄａｔ ｉ ｔ ｔｎ ｉ ｅ ｔ ｉ ｒ ｅｉ ｒ ｏ ｔ ｉ ｒ ｉｓ ｌ ｏｃ ｄ ｍｅ ｓｏ Ｍｉ ａ ｅ ｕ ｇｔ ｎ ａ ｅ ， ｈ ｙ ｃ ｒ ｎ ｎ ｅ火星包 up~ - 歌单 - 网易云音乐
火星包 up~
播放：11838次
喜欢这个歌单的人
网易云音乐多端下载
同步歌单，随时畅听320k好音乐
网易公司版权所有(C)杭州乐读科技有限公司运营：
违法和不良信息举报电话：6
举报邮箱：ERIC - Perspectives. Fall 2009, PEPNet, 2009
Collection
Peer reviewed only
Full text available on ERIC
ERIC Number: ED509302Record Type: Non-JournalPublication Date: 2009Pages: 12Abstractor: ERICReference Count: 0ISBN: N/AISSN: N/APerspectives. Fall 2009PEPNetPEPNet's "Perspectives" is the collaborative newsletter of the four PEPNet regional centers. This newsletter combines each centers individual strengths into a single resource that can be used on a national level. The issue focuses on the following topics: (1) Web Tool Locates Needed R (2) Family Center on Technology and Disability (Ana Maria Gutierrez); (3) Resources for Educators: PEPNet Launches New Web-based RK (4) Transition Summit Highlights Partnerships (Greta Palmberg); (5) Persons Considered Low Functioning Deaf (Anne Levy); (6) New FAQs from PEPNet's W (7) PEPNet Offers DVD on ADA in ASL with V (8) Pilot Program Enhances Notetaking Accommodations (Tia Ivanko and Maria Bohn); and (9) How Do We Improve Test Equity? PEPNet Has Some of the Answers.Descriptors: , , , , , , , , , , , , , PEPNet. Available from: PEPNet-South, Center on Deafness, University of Tennessee, Bailey Education Complex A239, 1122 Volunteer Boulevard, Knoxville, TN 37996. Tel: 865-974-0607; Fax: 865-974-3522; e-mail: pepnetsouth@pepnet. Web site: http://www.pepnet.orgEducation Level: N/AAudience: N/ALanguage: EnglishSponsor: Office of Special Education Programs (ED/OSERS)Authoring Institution: PEPNet[04/11] git commit: add maxmind v2 (now ASL licensed) in preference to Utrace, but with fallback to Utrace if maxmind not installed
brooklyn-commits mailing list archives
Message view
henev...@apache.org
[04/11] git commit: add maxmind v2 (now ASL licensed) in preference to Utrace, but with fallback to Utrace if maxmind not installed
add maxmind v2 (now ASL licensed) in preference to Utrace, but with fallback to Utrace if maxmind
not installed
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a64e2835
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a64e2835
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a64e2835
Branch: refs/heads/master
Commit: a64ecb71e3e66fe385a4
Parents: c1ab0be
Author: Alex Heneveld &alex.&
Authored: Tue Sep 2 21:03:27
Committer: Alex Heneveld &alex.&
Committed: Wed Sep 3 13:24:58
----------------------------------------------------------------------
core/pom.xml
.../java/brooklyn/location/geo/HostGeoInfo.java |
.../location/geo/MaxMind2HostGeoLookup.java
| 115 +++++++++++++++++++
.../location/geo/HostGeoInfoTest.groovy
69 -----------
.../brooklyn/location/geo/HostGeoInfoTest.java
52 +++++++++
.../geo/HostGeoLookupIntegrationTest.java
docs/use/examples/global-web-fabric/index.md
.../geoscaling/GeoscalingIntegrationTest.java
9 files changed, 223 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 51a05d9..4d33e60 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,6 +164,10 @@
&groupId&com.google.code.findbugs&/groupId&
&artifactId&jsr305&/artifactId&
&/dependency&
&dependency&
&groupId&com.maxmind.geoip2&/groupId&
&artifactId&geoip2&/artifactId&
&/dependency&
&dependency&
&groupId&org.testng&/groupId&
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/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 c1ff026..2dfa5d8 100644
--- a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
+++ b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
@@ -21,6 +21,8 @@ package brooklyn.location.
import java.io.S
import java.net.InetA
+import javax.annotation.N
import org.slf4j.L
import org.slf4j.LoggerF
@@ -31,6 +33,7 @@ import brooklyn.location.basic.AbstractL
import brooklyn.location.basic.LocationConfigK
import brooklyn.util.exceptions.E
import brooklyn.util.flags.TypeC
+import brooklyn.util.guava.M
import brooklyn.util.internal.BrooklynSystemP
import com.google.common.base.O
@@ -51,6 +54,8 @@ public class HostGeoInfo implements Serializable {
private static Maybe&HostGeoLookup& cachedLookup =
public static HostGeoInfo create(String address, String displayName, double latitude,
double longitude) {
return new HostGeoInfo(address, displayName, latitude, longitude);
@@ -58,16 +63,23 @@ public class HostGeoInfo implements Serializable {
public static HostGeoInfo fromIpAddress(InetAddress address) {
HostGeoLookup lookup = findHostGeoLookupImpl();
if (lookup!=null) {
HostGeoLookup lookup = getDefaultLookup();
if (lookup!=null)
return lookup.getHostGeoInfo(address);
} catch (Exception e) {
if (log.isDebugEnabled())
log.debug("unable to look up geo DNS info for "+address, e);
public static HostGeoLookup getDefaultLookup() throws InstantiationException, IllegalAccessException,
ClassNotFoundException {
if (cachedLookup==null) {
cachedLookup = Maybe.of(findHostGeoLookupImpl());
return cachedLookup.get();
/** returns null if cannot be set */
public static HostGeoInfo fromLocation(Location l) {
@@ -129,7 +141,13 @@ 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
if (type==null) return new UtraceHostGeoLookup();
//but maxmind free is even better
if (type==null) {
if (MaxMind2HostGeoLookup.getDatabaseReader()!=null)
return new MaxMind2HostGeoLookup();
log.debug("Using Utrace remote for geo lookup because MaxMind2 is not available");
return new UtraceHostGeoLookup();
if (type.isEmpty())
return (HostGeoLookup) Class.forName(type).newInstance();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/core/src/main/java/brooklyn/location/geo/MaxMind2HostGeoLookup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/geo/MaxMind2HostGeoLookup.java b/core/src/main/java/brooklyn/location/geo/MaxMind2HostGeoLookup.java
new file mode 100644
index 0000000..da79c29
--- /dev/null
+++ b/core/src/main/java/brooklyn/location/geo/MaxMind2HostGeoLookup.java
@@ -0,0 +1,115 @@
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.
See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.
The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.
See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+package brooklyn.location.
+import java.io.F
+import java.io.IOE
+import java.net.InetA
+import java.net.MalformedURLE
+import org.slf4j.L
+import org.slf4j.LoggerF
+import brooklyn.util.internal.BrooklynSystemP
+import brooklyn.util.net.N
+import brooklyn.util.text.S
+import com.google.common.base.T
+import com.google.common.collect.L
+import com.maxmind.geoip2.DatabaseR
+import com.maxmind.geoip2.model.CityR
+import com.maxmind.geoip2.record.S
+public class MaxMind2HostGeoLookup implements HostGeoLookup {
public static final Logger log = LoggerFactory.getLogger(MaxMind2HostGeoLookup.class);
static final String MAXMIND_DB_URL = "http://dev.maxmind.com/geoip/geoip2/geolite2/#Downloads";
// TODO this should be configurable from system property or brooklyn.properties
// TODO and should use properties BrooklynServerConfig.MGMT_BASE_DIR (but hard to get
mgmt properties here!)
static final String MAXMIND_DB_PATH = System.getProperty("user.home")+"/"+".brooklyn/"+"GeoLite2-City.mmdb";
static boolean lookupFailed =
static DatabaseReader databaseReader =
public static synchronized DatabaseReader getDatabaseReader() {
if (databaseReader!=null) return databaseR
File f = new File(MAXMIND_DB_PATH);
databaseReader = new DatabaseReader.Builder(f).build();
} catch (IOException e) {
lookupFailed =
log.debug("MaxMind ge either download and unpack the latest
"binary from "+MAXMIND_DB_URL+" into "+MAXMIND_DB_PATH+", "+
"or specify a different HostGeoLookup implementation with the key "+
BrooklynSystemProperties.HOST_GEO_LOOKUP_IMPL.getPropertyName()+" (error
trying to read: "+e+")");
return databaseR
public HostGeoInfo getHostGeoInfo(InetAddress address) throws MalformedURLException,
IOException {
if (lookupFailed)
DatabaseReader ll = getDatabaseReader();
if (ll==null)
InetAddress extAddress =
if (Networking.isPrivateSubnet(extAddress)) extAddress = InetAddress.getByName(LocalhostExternalIpLoader.getLocalhostIpQuicklyOrDefault());
CityResponse l = ll.city(extAddress);
if (l==null) {
if (log.isDebugEnabled()) log.debug("Geo info failed to find location for
address {}, using {}", extAddress, ll);
StringBuilder name = new StringBuilder();
if (l.getCity()!=null && l.getCity().getName()!=null) name.append(l.getCity().getName());
if (l.getSubdivisions()!=null) {
for (Subdivision subd: Lists.reverse(l.getSubdivisions())) {
if (name.length()&0) name.append(", ");
// prefer e.g. USA state codes over state names
if (!Strings.isBlank(subd.getIsoCode()))
name.append(subd.getIsoCode());
name.append(subd.getName());
if (l.getCountry()!=null) {
if (name.length()==0) {
name.append(l.getCountry().getName());
name.append(" ("); name.append(l.getCountry().getIsoCode()); name.append(")");
HostGeoInfo geo = new HostGeoInfo(address.getHostName(), name.toString(), l.getLocation().getLatitude(),
l.getLocation().getLongitude());
log.debug("Geo info lookup (MaxMind DB) for "+address+" returned: "+geo);
} catch (Exception e) {
if (log.isDebugEnabled())
log.debug("Geo info lookup failed: "+e);
throw Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.groovy b/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.groovy
deleted file mode 100644
index 9945e7d..0000000
--- a/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.groovy
+++ /dev/null
@@ -1,69 +0,0 @@
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.
See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.
The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.
See the License for the
- * specific language governing permissions and limitations
- * under the License.
-package brooklyn.location.
-import static org.testng.AssertJUnit.*
-import org.testng.annotations.Test
-import brooklyn.location.Location
-import brooklyn.location.basic.SimulatedLocation
-import brooklyn.location.basic.SshMachineLocation
-public class HostGeoInfoTest {
private static final String IP = "192.168.0.1";
private static final Location DOUBLE_LOCATION = new SimulatedLocation(name: "doubles",
latitude: 50.0d, longitude: 0.0d);
private static final Location BIGDECIMAL_LOCATION = new SimulatedLocation( name: "bigdecimals",
latitude: 50.0, longitude: 0.0);
private static final Location MIXED_LOCATION = new SimulatedLocation(name: "mixed", latitude:
50.0d, longitude: 0.0);
private static final Location DOUBLE_CHILD = new SshMachineLocation(name: "double-child",
address: IP, parentLocation: DOUBLE_LOCATION);
private static final Location BIGDECIMAL_CHILD = new SshMachineLocation(name: "bigdecimal-child",
address: IP, parentLocation: BIGDECIMAL_LOCATION);
private static final Location MIXED_CHILD = new SshMachineLocation(name: "mixed-child",
address: IP, parentLocation: MIXED_LOCATION);
public void testDoubleCoordinates() {
HostGeoInfo hgi = HostGeoInfo.fromLocation(DOUBLE_CHILD);
assertNotNull(hgi);
assertEquals(50.0d, hgi.latitude);
assertEquals(0.0d, hgi.longitude);
public void testBigdecimalCoordinates() {
HostGeoInfo hgi = HostGeoInfo.fromLocation(BIGDECIMAL_CHILD);
assertNotNull(hgi);
assertEquals(50.0d, hgi.latitude);
assertEquals(0.0d, hgi.longitude);
public void testMixedCoordinates() {
HostGeoInfo hgi = HostGeoInfo.fromLocation(MIXED_CHILD);
assertNotNull(hgi);
assertEquals(50.0d, hgi.latitude);
assertEquals(0.0d, hgi.longitude);
public void testMissingCoordinates() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.java b/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.java
new file mode 100644
index f82275
--- /dev/null
+++ b/core/src/test/java/brooklyn/location/geo/HostGeoInfoTest.java
@@ -0,0 +1,52 @@
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.
See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.
The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.
See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+package brooklyn.location.
+import static org.testng.AssertJUnit.assertE
+import static org.testng.AssertJUnit.assertNotN
+import org.testng.annotations.T
+import brooklyn.location.L
+import brooklyn.location.basic.SimulatedL
+import brooklyn.util.collections.MutableM
+public class HostGeoInfoTest {
private static final String IP = "192.168.0.1";
private static final Location CUSTOM_LOCATION = new SimulatedLocation(MutableMap.of("name",
"custom", "latitude", 50d, "longitude", 0d));
private static final Location CUSTOM_LOCATION_CHILD = new SimulatedLocation(MutableMap.of("name",
"custom-child", "address", IP, "parentLocation", CUSTOM_LOCATION));
public void testCustomLocationCoordinates() {
HostGeoInfo hgi = HostGeoInfo.fromLocation(CUSTOM_LOCATION);
assertNotNull(hgi);
assertEquals(50.0d, hgi.latitude);
assertEquals(0.0d, hgi.longitude);
public void testCustomLocationChildCoordinates() {
HostGeoInfo hgi = HostGeoInfo.fromLocation(CUSTOM_LOCATION_CHILD);
assertNotNull(hgi);
assertEquals(50.0d, hgi.latitude);
assertEquals(0.0d, hgi.longitude);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/core/src/test/java/brooklyn/location/geo/HostGeoLookupIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/geo/HostGeoLookupIntegrationTest.java b/core/src/test/java/brooklyn/location/geo/HostGeoLookupIntegrationTest.java
index ced1cc8..aeaf960 100644
--- a/core/src/test/java/brooklyn/location/geo/HostGeoLookupIntegrationTest.java
+++ b/core/src/test/java/brooklyn/location/geo/HostGeoLookupIntegrationTest.java
@@ -28,6 +28,8 @@ import org.testng.annotations.T
import brooklyn.location.basic.LocalhostMachineProvisioningL
import brooklyn.location.basic.SshMachineL
+import com.google.common.base.O
public class HostGeoLookupIntegrationTest {
public static final Logger log = LoggerFactory.getLogger(HostGeoLookupIntegrationTest.class);
@@ -37,7 +39,7 @@ public class HostGeoLookupIntegrationTest {
SshMachineLocation l = new LocalhostMachineProvisioningLocation().obtain();
HostGeoInfo geo = HostGeoInfo.fromLocation(l);
log.info("localhost is in "+geo);
Assert.assertNotNull(geo, "couldn' must be online and with credit with
the HostGeoLookup impl (e.g. GeoBytes)");
Assert.assertNotNull(geo, "couldn' must have a valid HostGeoLookup impl
(e.g. MaxMind installed, or online and with Utrace credit)");
Assert.assertTrue(-90 &= geo.latitude && geo.latitude &= 90);
@@ -56,4 +58,20 @@ public class HostGeoLookupIntegrationTest {
Assert.assertEquals(geo.latitude, 51, 2);
Assert.assertEquals(geo.longitude, 9, 5);
@Test(groups = "Integration")
public void testMaxmindLookup() throws Exception {
HostGeoInfo geo = new MaxMind2HostGeoLookup().getHostGeoInfo(InetAddress.getByName("maxmind.com"));
log.info("maxmind.com at "+geo);
// used to be W now lDalas - in case this is temporary failover will accept
// Also saw variation in lat/lon reported, so happy to within one degree now.
Assert.assertEquals(geo.displayName, "Washington, DC (US)");
Assert.assertEquals(geo.latitude, 38.90, 0.1);
Assert.assertEquals(geo.longitude, -77.02, 0.1);
Assert.assertTrue(Objects.equal(geo.displayName, "Washington, DC (US)") || Objects.equal(geo.displayName,
"Dallas, TX (US)"), "name="+geo.displayName);
Assert.assertTrue(Math.abs(geo.latitude - 38.90) &= 1 || Math.abs(geo.latitude
- 32.78) &= 1, "lat="+geo.latitude);
Assert.assertTrue(Math.abs(geo.longitude - -77.02) &= 1 || Math.abs(geo.longitude
- -96.82) &= 1, "lon="+geo.longitude);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/docs/use/examples/global-web-fabric/index.md
----------------------------------------------------------------------
diff --git a/docs/use/examples/global-web-fabric/index.md b/docs/use/examples/global-web-fabric/index.md
index 64f84 100644
--- a/docs/use/examples/global-web-fabric/index.md
+++ b/docs/use/examples/global-web-fabric/index.md
@@ -67,8 +67,8 @@ In order to generate the "closest-IP" script,
Brooklyn needs a way to find out the latitude and longitude of the
servers you are using.
The simplest way to do this is do download the free GeoCityLite binary flatfile
-from [MaxMind](http://www.maxmind.com/app/geolitecity),
-unpack it, and copy it to `~/.brooklyn/MaxMind-GeoLiteCity.dat`.
+from [MaxMind](http://dev.maxmind.com/geoip/geoip2/geolite2/#Downloads),
+unpack it, and copy it to `~/.brooklyn/GeoLite2-City.mmdb`.
This will be picked up automatically if it is installed.
You can instead specify to use an online lookup service, such as
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51eb785..db4af47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
&slf4j.version&1.6.6&/slf4j.version&
&!-- used for java.util.logging
jul-to-slf4j interception --&
&xstream.version&1.4.7&/xstream.version&
&jackson.version&1.9.13&/jackson.version&
&!-- codehaus jackson,
used by brooklyn rest server --&
&fasterxml.jackson.version&2.2.0&/fasterxml.jackson.version&
fasterxml (newer) jackson, used by camp --&
&fasterxml.jackson.version&2.4.2&/fasterxml.jackson.version&
&jersey.version&1.12&/jersey.version& &!-- NB: 1.17 requires changes
to how we hanlde multipart in CatalogApi --&
&swagger.version&1.0.1&/swagger.version&
&dropwizard.version&0.4.4&/dropwizard.version&
@@ -186,6 +186,7 @@
&commons-lang.version&2.4&/commons-lang.version&
&hamcrest.version&1.1&/hamcrest.version&
&jsr311-api.version&1.1.1&/jsr311-api.version&
&maxmind.version&0.8.1&/maxmind.version&
&includedTestGroups /&
&excludedTestGroups&Integration,Acceptance,Live,WIP&/excludedTestGroups&
@@ -600,6 +601,11 @@
&artifactId&json-path&/artifactId&
&version&${jsonPath.version}&/version&
&/dependency&
&dependency&
&groupId&com.maxmind.geoip2&/groupId&
&artifactId&geoip2&/artifactId&
&version&${maxmind.version}&/version&
&/dependency&
&/dependencies&
&/dependencyManagement&
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a64e2835/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 8af53fb..644
--- a/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java
@@ -28,7 +28,6 @@ import org.testng.annotations.AfterM
import org.testng.annotations.BeforeM
import org.testng.annotations.T
-import brooklyn.entity.basic.ApplicationB
import brooklyn.entity.basic.A
import brooklyn.entity.basic.DynamicG
import brooklyn.entity.basic.E
@@ -37,7 +36,6 @@ import brooklyn.entity.proxying.EntityS
import brooklyn.location.basic.SshMachineL
import brooklyn.location.geo.HostGeoI
import brooklyn.location.geo.HostGeoL
-import brooklyn.location.geo.UtraceHostGeoL
import brooklyn.test.A
import brooklyn.test.entity.TestA
import brooklyn.test.entity.TestE
@@ -83,7 +81,7 @@ public class GeoscalingIntegrationTest {
public void setUp() throws Exception {
geoLookupImpl = BrooklynSystemProperties.HOST_GEO_LOOKUP_IMPL.getValue();
app = ApplicationBuilder.newManagedApp(TestApplication.class);
app = TestApplication.Factory.newManagedInstanceForTests();
target = app.createAndManageChild(EntitySpec.create(TestEntity.class));
group = app.createAndManageChild(EntitySpec.create(DynamicGroup.class)
@@ -167,7 +165,7 @@ public class GeoscalingIntegrationTest {
public StubHostGeoLookup(String delegateImpl) throws Exception {
if (delegateImpl == null) {
delegate = new UtraceHostGeoLookup();
delegate = HostGeoInfo.getDefaultLookup();
delegate = (HostGeoLookup) Class.forName(delegateImpl).newInstance();
(inline, 7-Bit, 24826 bytes)
