Skip to content

S
spring-cloud-netflix
Commit 9ec59899 by Dave Syer
Options

Make wro4j work in reactor build

parent 0afd5721
Showing with 56 additions and 24 deletions
spring-cloud-netflix-eureka-server/pom.xml
......@@ -17,17 +17,6 @@
<wro4j.version>1.7.6</wro4j.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starters</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -61,7 +50,6 @@
<dependency>
<groupId>com.netflix.eureka</groupId>
<artifactId>eureka-client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
......@@ -96,9 +84,6 @@
<build>
<resources>
<resource>
<directory>target/generated-resources</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>wro/**</exclude>
......@@ -107,12 +92,33 @@
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/wro</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/wro</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
<version>${wro4j.version}</version>
<executions>
<execution>
<phase>generate-resources</phase>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
......@@ -120,10 +126,30 @@
</executions>
<configuration>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
<destinationFolder>${basedir}/target/generated-resources/static/eureka/</destinationFolder>
<wroFile>${basedir}/src/main/resources/wro/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/resources/wro/wro.properties</extraConfigFile>
<destinationFolder>${project.build.directory}/classes/static/eureka/</destinationFolder>
<wroFile>${project.build.directory}/wro/eureka/wro.xml</wroFile>
<extraConfigFile>${basedir}/src/main/resources/wro/eureka/wro.properties</extraConfigFile>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-resource</id>
<phase>process-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
spring-cloud-netflix-eureka-server/src/main/resources/wro/wro.xml → spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/wro.xml
<groups xmlns="http://www.isdc.ro/wro">
<group name="wro">
<css>file:./src/main/resources/wro/main.less</css>
<css>file:${project.basedir}/src/main/resources/wro/eureka/main.less</css>
</group>
</groups>
\ No newline at end of file
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
......@@ -9,6 +9,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate;
......@@ -22,7 +23,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = Application.class)
@WebAppConfiguration
@IntegrationTest({"server.port=0", "spring.application.name=eureka", "management.contextPath=/admin"})
@IntegrationTest({ "server.port=0", "spring.application.name=eureka", "management.contextPath=/admin" })
public class ApplicationTests {
@Value("${local.server.port}")
......@@ -33,21 +34,25 @@ public class ApplicationTests {
@EnableEurekaServer
protected static class Application {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
new SpringApplicationBuilder(Application.class).properties(
"spring.application.name=eureka", "management.contextPath=/admin")
.run(args);
}
}
@Test
public void catalogLoads() {
@SuppressWarnings("rawtypes")
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/v2/apps", Map.class);
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(
"http://localhost:" + port + "/v2/apps", Map.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
}
@Test
public void adminLoads() {
@SuppressWarnings("rawtypes")
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/admin/env", Map.class);
ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(
"http://localhost:" + port + "/admin/env", Map.class);
assertEquals(HttpStatus.OK, entity.getStatusCode());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment