From 103bc777650cd8bba59f3fa30dd5d4ac0bb741b5 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 14 Jul 2014 16:15:10 -0600
Subject: [PATCH] moved hystrix dashboard to io.spring.platform.netflix

---
 pom.xml                                              | 12 ++++++++++++
 .../platform/netflix}/hystrix/Application.java       |  6 +++---
 .../netflix}/hystrix/stream/MockStreamServlet.java   |  2 +-
 .../netflix}/hystrix/stream/ProxyStreamServlet.java  |  2 +-
 .../platform/netflix}/hystrix/stream/hystrix.stream  |  0
 5 files changed, 17 insertions(+), 5 deletions(-)
 rename spring-platform-netflix-hystrix/src/main/java/{ => io/spring/platform/netflix}/hystrix/Application.java (87%)
 rename spring-platform-netflix-hystrix/src/main/java/{ => io/spring/platform/netflix}/hystrix/stream/MockStreamServlet.java (98%)
 rename spring-platform-netflix-hystrix/src/main/java/{ => io/spring/platform/netflix}/hystrix/stream/ProxyStreamServlet.java (99%)
 rename spring-platform-netflix-hystrix/src/main/resources/{ => io/spring/platform/netflix}/hystrix/stream/hystrix.stream (100%)

diff --git a/pom.xml b/pom.xml
index f202c1572..a609a162e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.netflix.turbine</groupId>
+                <artifactId>turbine-core</artifactId>
+                <version>${turbine.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>log4j</artifactId>
+                        <groupId>log4j</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>com.netflix.zuul</groupId>
                 <artifactId>zuul-core</artifactId>
@@ -134,6 +145,7 @@
         <feign.version>6.1.2</feign.version>
         <hystrix.version>1.4.0-RC4</hystrix.version>
         <ribbon.version>0.3.12</ribbon.version>
+        <turbine.version>0.4</turbine.version>
         <zuul.version>1.0.24</zuul.version>
     </properties>
 
diff --git a/spring-platform-netflix-hystrix/src/main/java/hystrix/Application.java b/spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/Application.java
similarity index 87%
rename from spring-platform-netflix-hystrix/src/main/java/hystrix/Application.java
rename to spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/Application.java
index ec819a0fb..d835318f1 100644
--- a/spring-platform-netflix-hystrix/src/main/java/hystrix/Application.java
+++ b/spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/Application.java
@@ -1,7 +1,7 @@
-package hystrix;
+package io.spring.platform.netflix.hystrix;
 
-import hystrix.stream.MockStreamServlet;
-import hystrix.stream.ProxyStreamServlet;
+import io.spring.platform.netflix.hystrix.stream.MockStreamServlet;
+import io.spring.platform.netflix.hystrix.stream.ProxyStreamServlet;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
diff --git a/spring-platform-netflix-hystrix/src/main/java/hystrix/stream/MockStreamServlet.java b/spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/MockStreamServlet.java
similarity index 98%
rename from spring-platform-netflix-hystrix/src/main/java/hystrix/stream/MockStreamServlet.java
rename to spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/MockStreamServlet.java
index 83014361d..57b9e0758 100644
--- a/spring-platform-netflix-hystrix/src/main/java/hystrix/stream/MockStreamServlet.java
+++ b/spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/MockStreamServlet.java
@@ -1,4 +1,4 @@
-package hystrix.stream;
+package io.spring.platform.netflix.hystrix.stream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/spring-platform-netflix-hystrix/src/main/java/hystrix/stream/ProxyStreamServlet.java b/spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/ProxyStreamServlet.java
similarity index 99%
rename from spring-platform-netflix-hystrix/src/main/java/hystrix/stream/ProxyStreamServlet.java
rename to spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/ProxyStreamServlet.java
index bd7e36e42..ceea41efb 100644
--- a/spring-platform-netflix-hystrix/src/main/java/hystrix/stream/ProxyStreamServlet.java
+++ b/spring-platform-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/ProxyStreamServlet.java
@@ -1,4 +1,4 @@
-package hystrix.stream;
+package io.spring.platform.netflix.hystrix.stream;
 
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
diff --git a/spring-platform-netflix-hystrix/src/main/resources/hystrix/stream/hystrix.stream b/spring-platform-netflix-hystrix/src/main/resources/io/spring/platform/netflix/hystrix/stream/hystrix.stream
similarity index 100%
rename from spring-platform-netflix-hystrix/src/main/resources/hystrix/stream/hystrix.stream
rename to spring-platform-netflix-hystrix/src/main/resources/io/spring/platform/netflix/hystrix/stream/hystrix.stream