changeset 1447:4043aa19dd30 new_scaling

add servlet filter to provide CORS headers.
author robcast
date Wed, 11 Nov 2015 11:42:29 +0100
parents 25d5ab192395
children a2da0b5caedd
files webapp/pom.xml webapp/src/main/webapp/WEB-INF/web-3.0.xml webapp/src/main/webapp/WEB-INF/web-additional.xml
diffstat 3 files changed, 43 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/pom.xml	Tue Nov 10 19:02:58 2015 +0100
+++ b/webapp/pom.xml	Wed Nov 11 11:42:29 2015 +0100
@@ -159,5 +159,21 @@
 				</dependency>
 			</dependencies>
 		</profile>
+        <profile>
+            <id>cors-filter</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <!--  external servlet filter to add CORS headers -->
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlets</artifactId>
+                    <version>9.3.5.v20151012</version>
+                </dependency>
+            </dependencies>
+        </profile>
 	</profiles>
+	<dependencies>
+	</dependencies>
 </project>
--- a/webapp/src/main/webapp/WEB-INF/web-3.0.xml	Tue Nov 10 19:02:58 2015 +0100
+++ b/webapp/src/main/webapp/WEB-INF/web-3.0.xml	Wed Nov 11 11:42:29 2015 +0100
@@ -50,4 +50,18 @@
             /Scaler/*
         </url-pattern>
   </servlet-mapping>
+
+	<!-- add CORS headers -->
+	<filter>
+		<filter-name>CORS</filter-name>
+		<!-- use either Tomcat's or Jetty's filter class -->
+		<!-- <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> -->
+		<filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
+		<async-supported>true</async-supported>
+	</filter>
+	<filter-mapping>
+		<filter-name>CORS</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
 </web-app>
--- a/webapp/src/main/webapp/WEB-INF/web-additional.xml	Tue Nov 10 19:02:58 2015 +0100
+++ b/webapp/src/main/webapp/WEB-INF/web-additional.xml	Wed Nov 11 11:42:29 2015 +0100
@@ -75,4 +75,17 @@
         </form-login-config>
     </login-config>
 
+    <!-- add CORS headers -->
+    <filter>
+        <filter-name>CORS</filter-name>
+        <!-- use either Tomcat's or Jetty's filter class -->
+        <!-- <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> -->
+        <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
+        <async-supported>true</async-supported>
+    </filter>
+    <filter-mapping>
+        <filter-name>CORS</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
 </web-app>