Repository: marmotta Updated Branches: refs/heads/develop c271df95f -> 348e60bdb
MARMOTTA-609: better patch, although it should be solved in a better way as MARMOTTA-610 Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/348e60bd Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/348e60bd Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/348e60bd Branch: refs/heads/develop Commit: 348e60bdb808834edd303a78cf1eb906e19515c4 Parents: c271df9 Author: Sergio Fernández <[email protected]> Authored: Mon May 11 08:15:17 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon May 11 08:15:44 2015 +0200 ---------------------------------------------------------------------- launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml | 4 ++++ .../apache/marmotta/platform/ldp/webservices/LdpWebService.java | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/348e60bd/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 7f23110..8ecacbb 100644 --- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml +++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml @@ -67,6 +67,10 @@ <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class> <init-param> + <param-name>cors.allowOrigin</param-name> + <param-value>*</param-value> + </init-param> + <init-param> <param-name>cors.supportedMethods</param-name> <param-value>GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS</param-value> </init-param> http://git-wip-us.apache.org/repos/asf/marmotta/blob/348e60bd/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java index 31ee20d..45c8d5d 100644 --- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java +++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/webservices/LdpWebService.java @@ -706,9 +706,6 @@ public class LdpWebService { builder.header(HTTP_HEADER_ACCEPT_PATCH, RdfPatchParser.MIME_TYPE); } - //TODO: do it via the cors filter (MARMOTTA-610) - builder.header(HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, configurationService.getStringConfiguration("ldp.allow_origin", "*")); - return builder; }
