diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules')
2 files changed, 6 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF index 21a2d621bf..eb4ea5fb41 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF @@ -22,6 +22,7 @@ Import-Package: javax.jws, org.apache.tuscany.sca.binding.rest.wireformat.json;version="2.0.0", org.apache.tuscany.sca.binding.rest.wireformat.xml;version="2.0.0", org.apache.tuscany.sca.common.http;version="2.0.0", + org.apache.tuscany.sca.common.http.cors;version="2.0.0", org.apache.tuscany.sca.core;version="2.0.0", org.apache.tuscany.sca.core.invocation;version="2.0.0", org.apache.tuscany.sca.databinding;version="2.0.0", 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 |