From acfcf7f70129daf4f191d8cb6e4b4d6b5d4ec570 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Tue, 17 Jun 2014 12:49:24 +0100
Subject: [PATCH] Refactor command line args into server.yml

---
 .../test/java/sample/ApplicationTests.java    | 22 +++++++++----------
 .../src/test/resources/server.yml             |  6 +++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/spring-platform-config-sample/src/test/java/sample/ApplicationTests.java b/spring-platform-config-sample/src/test/java/sample/ApplicationTests.java
index 06db287e..0616e3e8 100644
--- a/spring-platform-config-sample/src/test/java/sample/ApplicationTests.java
+++ b/spring-platform-config-sample/src/test/java/sample/ApplicationTests.java
@@ -1,3 +1,4 @@
+
 package sample;
 
 import static org.junit.Assert.assertEquals;
@@ -20,34 +21,31 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @IntegrationTest("server.port:0")
 @WebAppConfiguration
 public class ApplicationTests {
-	
+
 	private static int configPort = 0;
 
 	@Value("${local.server.port}")
 	private int port;
-	
+
 	@BeforeClass
 	public static void startConfigServer() {
-		ConfigurableApplicationContext context = SpringApplication.run(org.springframework.platform.config.server.Application.class, "--server.port=" + configPort, "--spring.config.name=server");
-		configPort = ((EmbeddedWebApplicationContext)context).getEmbeddedServletContainer().getPort();
+		ConfigurableApplicationContext context = SpringApplication.run(
+				org.springframework.platform.config.server.Application.class,
+				"--server.port=" + configPort, "--spring.config.name=server");
+		configPort = ((EmbeddedWebApplicationContext) context).getEmbeddedServletContainer().getPort();
 		System.setProperty("config.port", "" + configPort);
 	}
 
 	@Test
 	public void contextLoads() {
-		String foo = new TestRestTemplate().getForObject("http://localhost:" + port + "/env/foo", String.class);
+		String foo = new TestRestTemplate().getForObject("http://localhost:" + port
+				+ "/env/foo", String.class);
 		assertEquals("bar", foo);
 	}
-	
+
 	public static void main(String[] args) {
-		System.setProperty("spring.jmx.default_domain", "platform.config.server");
-		System.setProperty("endpoints.jmx.domain", "platform.config.server");
-		System.setProperty("spring.platform.config.server.basedir", "target/config");
 		configPort = 8888;
 		startConfigServer();
-		System.clearProperty("spring.jmx.default_domain");
-		System.clearProperty("endpoints.jmx.domain");
-		System.clearProperty("spring.platform.config.server.basedir");
 		SpringApplication.run(Application.class, args);
 	}
 
diff --git a/spring-platform-config-sample/src/test/resources/server.yml b/spring-platform-config-sample/src/test/resources/server.yml
index 028b47e4..e9d8d0f0 100644
--- a/spring-platform-config-sample/src/test/resources/server.yml
+++ b/spring-platform-config-sample/src/test/resources/server.yml
@@ -1,8 +1,14 @@
 info:
   component: Config Server
 spring:
+  platform:
+    config:
+      server:
+        basedir: target/config
   application:
     name: configserver
+  jmx:
+    default_domain: platform.config.server
 server:
   port: 8888
 management: