From 2573a0b1e9dc9b616ab96cca7876caa1d855f3da Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 20 Jan 2015 12:05:08 -0700
Subject: [PATCH] add some simple instructions to run the sample. Move sample
 from src/test to src/main. add spring boot plugin to sample

---
 README.md                                       | 13 +++++++++++++
 spring-cloud-consul-sample/pom.xml              | 17 ++++++++++++-----
 .../cloud/consul/sample/SampleApplication.java  |  0
 .../{test => main}/resources/application.yml    |  0
 .../src/{test => main}/resources/bootstrap.yml  |  0
 5 files changed, 25 insertions(+), 5 deletions(-)
 rename spring-cloud-consul-sample/src/{test => main}/java/org/springframework/cloud/consul/sample/SampleApplication.java (100%)
 rename spring-cloud-consul-sample/src/{test => main}/resources/application.yml (100%)
 rename spring-cloud-consul-sample/src/{test => main}/resources/bootstrap.yml (100%)

diff --git a/README.md b/README.md
index 8aa89ef0..360fd85c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,19 @@
 
 Preview of Spring Cloud Consul implementation
 
+### Running the sample
+
+1. [Install consul](https://consul.io/downloads.html)
+2. Run `./run_consul.sh` found in the root of this project
+3. verify consul is running by visiting [http://localhost:8500](http://localhost:8500)
+4. run `mvn package`
+5. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar`
+6. visit [http://localhost:8080](http://localhost:8080), verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
+5. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081`
+6. visit [http://localhost:8080](http://localhost:8080) again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
+
+### TODO
+
 - [X] consul config
 - [X] consul service discovery
 - [X] consul ribbon load balancer
diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml
index c3d481f0..1d662c23 100644
--- a/spring-cloud-consul-sample/pom.xml
+++ b/spring-cloud-consul-sample/pom.xml
@@ -17,6 +17,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.2.1.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <!--skip deploy -->
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -31,27 +43,22 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-consul-config</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-consul-discovery</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-consul-bus</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/spring-cloud-consul-sample/src/test/java/org/springframework/cloud/consul/sample/SampleApplication.java b/spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleApplication.java
similarity index 100%
rename from spring-cloud-consul-sample/src/test/java/org/springframework/cloud/consul/sample/SampleApplication.java
rename to spring-cloud-consul-sample/src/main/java/org/springframework/cloud/consul/sample/SampleApplication.java
diff --git a/spring-cloud-consul-sample/src/test/resources/application.yml b/spring-cloud-consul-sample/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-consul-sample/src/test/resources/application.yml
rename to spring-cloud-consul-sample/src/main/resources/application.yml
diff --git a/spring-cloud-consul-sample/src/test/resources/bootstrap.yml b/spring-cloud-consul-sample/src/main/resources/bootstrap.yml
similarity index 100%
rename from spring-cloud-consul-sample/src/test/resources/bootstrap.yml
rename to spring-cloud-consul-sample/src/main/resources/bootstrap.yml