Revert "fixes bug in cors service (DELETE was not supported)" This reverts commit 0ac19180dfaae087cd1496dd1ef918e7014c0c4c.
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a173309e Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a173309e Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a173309e Branch: refs/heads/master Commit: a173309eeacd8607ed5f193041b80d8bdcca84a9 Parents: 0ac1918 Author: tkurz <[email protected]> Authored: Fri Apr 12 00:03:22 2013 +0200 Committer: tkurz <[email protected]> Committed: Fri Apr 12 00:03:22 2013 +0200 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/web.xml | 11 ----- .../src/main/webapp/WEB-INF/web.xml | 33 ++++----------- 2 files changed, 9 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a173309e/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 9a01350..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 @@ -67,17 +67,6 @@ <filter> <filter-name>CORS</filter-name> <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> - - <init-param> - <param-name>cors.supportedMethods</param-name> - <param-value>GET, HEAD, POST, PUT, DELETE, OPTIONS</param-value> - </init-param> - - <init-param> - <param-name>cors.supportedHeaders</param-name> - <param-value>Origin, Accept</param-value> - </init-param> - </filter> <filter-mapping> <filter-name>CORS</filter-name> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a173309e/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 7c9c5f4..465a199 100644 --- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml +++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml @@ -49,39 +49,24 @@ <param-value>/tmp/marmotta</param-value> </context-param> - <!-- 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 --> - + <!-- this filter performs startup configurations for first installation --> <filter> - <!-- The CORS filter with parameters --> - <filter-name>CORS</filter-name> - <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> - - <init-param> - <param-name>cors.supportedMethods</param-name> - <param-value>GET, HEAD, POST, PUT, DELETE, OPTIONS</param-value> - </init-param> - - <init-param> - <param-name>cors.supportedHeaders</param-name> - <param-value>Origin, Accept</param-value> - </init-param> - + <filter-name>MarmottaPreStartupFilter</filter-name> + <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupFilter</filter-class> </filter> - <filter-mapping> - <!-- CORS Filter mapping --> - <filter-name>CORS</filter-name> + <filter-name>MarmottaPreStartupFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <!-- this filter performs startup configurations for first installation --> + <!-- 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>MarmottaPreStartupFilter</filter-name> - <filter-class>org.apache.marmotta.platform.core.servlet.MarmottaPreStartupFilter</filter-class> + <filter-name>CORS</filter-name> + <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> </filter> <filter-mapping> - <filter-name>MarmottaPreStartupFilter</filter-name> + <filter-name>CORS</filter-name> <url-pattern>/*</url-pattern> </filter-mapping>
