Merge branch 'Voltasalt-master'

2016-04-03 21:33:15 -07:00 · 2016-04-03 21:33:15 -07:00 · fad2225db7
parent 3ba14f079c 00ee426d07
commit fad2225db7
1 changed files with 8 additions and 0 deletions
--- a/src/main/resources/WEB-INF/web.xml
+++ b/src/main/resources/WEB-INF/web.xml
@ -17,4 +17,12 @@
    <filter-name>SetCacheControl</filter-name>
    <url-pattern>/*</url-pattern>
  </filter-mapping>
+  <filter>
+    <filter-name>CorsFilter</filter-name>
+    <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>CorsFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 </web-app>