update SPR-12640 repro with webjars resources

bclozel · bclozel · commit 2af6d43fa883 · 2015-02-04T13:54:13.000+01:00
diff --git a/SPR-12640/pom.xml b/SPR-12640/pom.xml
@@ -88,6 +88,12 @@
 			<version>1.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>bootstrap</artifactId>
+			<version>3.3.1</version>
+		</dependency>
+
 		<!-- Apache Tiles
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
@@ -252,7 +258,7 @@
 			<properties>
 				<cargo.container.id>tomcat8x</cargo.container.id>
 				<cargo.container.url>
-					http://www.eu.apache.org/dist/tomcat/tomcat-8/v8.0.15/bin/apache-tomcat-8.0.15.zip
+					http://www.eu.apache.org/dist/tomcat/tomcat-8/v8.0.18/bin/apache-tomcat-8.0.18.zip
 				</cargo.container.url>
 			</properties>
 		</profile>
diff --git a/SPR-12640/src/main/webapp/WEB-INF/spring/servlet-context.xml b/SPR-12640/src/main/webapp/WEB-INF/spring/servlet-context.xml
@@ -21,4 +21,6 @@
 
 	<mvc:resources mapping="/static/**" location="classpath:/static/" cache-period="120"/>
 
+	<mvc:resources mapping="/webjars/**" location="classpath:/META-INF/resources/webjars/"/>
+
 </beans>
diff --git a/SPR-12640/src/main/webapp/WEB-INF/views/home.jsp b/SPR-12640/src/main/webapp/WEB-INF/views/home.jsp
@@ -5,10 +5,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link rel="stylesheet" type="text/css" href="<c:url value="/static/style.css" />">
+    <link rel="stylesheet" type="text/css" href="<c:url value="/static/style.css" />">
+    <link rel="stylesheet" href="<c:url value="/webjars/bootstrap/3.3.1/css/bootstrap.min.css"/>"/>
 <title>Home</title>
 </head>
 <body>
   <h1>Home</h1>
+  <p>CSS Link: <c:url value="/static/style.css" /></p>
+  <p>CSS Link webjar: <c:url value="/webjars/bootstrap/3.3.1/css/bootstrap.min.css"/></p>
 </body>
 </html>
