Updated Branches: refs/heads/develop 61f72cb9f -> 849aa0c46
fixed cors setup at the webapp artifact Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/7f6f5b22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/7f6f5b22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/7f6f5b22 Branch: refs/heads/develop Commit: 7f6f5b221a7e16d4a2e339cf5991ff97f4914335 Parents: 24f602a Author: Sergio Fernández <[email protected]> Authored: Wed Apr 10 13:43:22 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Wed Apr 10 13:43:22 2013 +0200 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 9 +++++---- .../src/main/webapp/WEB-INF/web.xml | 12 ------------ 2 files changed, 5 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7f6f5b22/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml index 3496f74..a44d704 100644 --- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml +++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml @@ -62,13 +62,14 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <!-- handle OPTIONS requests --> + <!-- enables a cors filter and maps it to any request --> + <!-- for more fine grained configuration have a look at http://software.dzhuvinov.com/cors-filter-configuration.html --> <filter> - <filter-name>MarmottaOptionsFilter</filter-name> - <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class> + <filter-name>CORS</filter-name> + <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> </filter> <filter-mapping> - <filter-name>MarmottaOptionsFilter</filter-name> + <filter-name>CORS</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7f6f5b22/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml index 7eb98a3..465a199 100644 --- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml +++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml @@ -59,18 +59,6 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <!-- handle OPTIONS requests --> - <!-- - <filter> - <filter-name>MarmottaOptionsFilter</filter-name> - <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaOptionsFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>MarmottaOptionsFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - --> - <!-- enables a cors filter and maps it to any request --> <!-- for more fine grained configuration have a look at http://software.dzhuvinov.com/cors-filter-configuration.html --> <filter>
