From 7eb5855815cb9b745deb6d67bb4f3b9ebf0d6081 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 4 Nov 2015 16:39:04 -0700
Subject: [PATCH] fix resource filtering so it works with boot 1.3.x

get's eureka branding back.

fixes gh-627
---
 spring-cloud-netflix-eureka-server/pom.xml    |  2 +-
 .../src/main/wro/wro.xml                      |  4 ++--
 .../eureka/server/ApplicationTests.java       | 20 +++++++++++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index eabe846a..5fefe1a7 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -14,7 +14,7 @@
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 		<spring-cloud.version>1.1.0.BUILD-SNAPSHOT</spring-cloud.version>
-		<wro4j.version>1.7.6</wro4j.version>
+		<wro4j.version>1.7.9</wro4j.version>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml b/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml
index d460a699..47f1a5f3 100644
--- a/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml
+++ b/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml
@@ -1,7 +1,7 @@
 <groups xmlns="http://www.isdc.ro/wro">
   <group name="wro">
-	<css>webjar:bootstrap/3.2.0/less/bootstrap.less</css>   
-    <css>file:${project.basedir}/src/main/wro/main.less</css>
+    <css>webjar:bootstrap/3.2.0/less/bootstrap.less</css>
+    <css>file:@.project.basedir.@/src/main/wro/main.less</css>
     <js>webjar:jquery/2.1.1/jquery.min.js</js>
     <js>webjar:bootstrap/3.2.0/js/bootstrap.min.js</js>
   </group>
diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
index 229efad1..d613913b 100644
--- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
+++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
@@ -16,10 +16,6 @@
 
 package org.springframework.cloud.netflix.eureka.server;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.Collections;
 import java.util.Map;
 
@@ -42,6 +38,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = Application.class)
 @WebAppConfiguration
@@ -91,4 +92,15 @@ public class ApplicationTests {
 		assertNotNull(body);
 		assertFalse("basePath contains double slashes", body.contains(basePath + "/"));
 	}
+
+	@Test
+	public void cssParsedByLess() {
+		String basePath = "http://localhost:" + this.port + "/eureka/css/wro.css";
+		ResponseEntity<String> entity = new TestRestTemplate().getForEntity(basePath,
+				String.class);
+		assertEquals(HttpStatus.OK, entity.getStatusCode());
+		String body = entity.getBody();
+		assertNotNull(body);
+		assertTrue("css wasn't preprocessed", body.contains("spring-logo"));
+	}
 }