From 897d2e187b4fe00ac1119208a3e7d8b815229de4 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 27 Feb 2012 19:08:38 +0000 Subject: Adding more generic support for CORS into the runtime of REST binding git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1294280 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sca-java-2.x/trunk/modules/binding-rest-runtime/src/main') diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java index d9083e9f8b..762e4378e0 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java @@ -45,6 +45,7 @@ import org.apache.tuscany.sca.common.http.HTTPCacheContext; import org.apache.tuscany.sca.common.http.HTTPContext; import org.apache.tuscany.sca.common.http.HTTPHeader; import org.apache.tuscany.sca.common.http.ThreadHTTPContext; +import org.apache.tuscany.sca.common.http.cors.CORSHeaderProcessor; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.extensibility.ClassLoaderContext; import org.apache.wink.common.internal.registry.ProvidersRegistry; @@ -81,6 +82,7 @@ public class TuscanyRESTServlet extends RestServlet { protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (binding.isCORS()) { + /* response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Headers", "X-Requested-With"); if (request.getMethod().equals("OPTIONS")) { @@ -88,6 +90,9 @@ public class TuscanyRESTServlet extends RestServlet { response.setHeader("Access-Control-Max-Age", "1728000"); return; } + */ + + CORSHeaderProcessor.processCORS(binding.getCORSConfiguration(), request, response); } //create context -- cgit v1.2.3