From 8e58425858c5a10494d308f4b9d617e98d7ab072 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Sat, 28 Jul 2012 21:05:45 +0200
Subject: [PATCH] Changes related to arsnova-legacy-js

Include arsnova-legacy-js as overlay into resulting WAR archive.
---
 pom.xml                                     | 6 ++++++
 src/main/webapp/WEB-INF/arsnova-servlet.xml | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8dcfa9efc..f204d9b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,12 @@
   		<artifactId>cglib</artifactId>
   		<version>2.2.2</version>
   	</dependency>
+  	<dependency>
+  		<groupId>de.thm.arsnova</groupId>
+  		<artifactId>arsnova-legacy-js</artifactId>
+  		<version>1.0.0-SNAPSHOT</version>
+  		<type>war</type>
+  	</dependency>
   </dependencies>
   <build>
   	<plugins>
diff --git a/src/main/webapp/WEB-INF/arsnova-servlet.xml b/src/main/webapp/WEB-INF/arsnova-servlet.xml
index 68be4c3fa..be3eb5853 100644
--- a/src/main/webapp/WEB-INF/arsnova-servlet.xml
+++ b/src/main/webapp/WEB-INF/arsnova-servlet.xml
@@ -13,12 +13,17 @@
 
 	<mvc:resources mapping="/**.html" location="/" />
 	<mvc:resources mapping="/**.png" location="/"/>
+	<mvc:resources mapping="/**.manifest" location="/"/>
 	<mvc:resources mapping="/config.json" location="/"/>
+	<mvc:resources mapping="/config.xml" location="/"/>
 	<mvc:resources mapping="/dojo/**" location="/dojo/"/>
 	<mvc:resources mapping="/dijit/**" location="/dijit/"/>
 	<mvc:resources mapping="/dojox/**" location="/dojox/"/>
 	<mvc:resources mapping="/app/**" location="/app/"/>
 	<mvc:resources mapping="/views/**" location="/views/"/>
+	<mvc:resources mapping="/lib/**" location="/lib/"/>
+	<mvc:resources mapping="/resources/**" location="/resources/"/>
+	<mvc:resources mapping="/screenshots/**" location="/screenshots/"/>
 	
 	<mvc:annotation-driven />
 
-- 
GitLab