From e2351e280765ed2b1894f0bf70c1aa3ffeb71c0d Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 17 Nov 2010 05:15:59 +0000 Subject: Update to slf4j 1.6.1 and remove the workaround for wink GET @Consumes check git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035921 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache') 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 14cf2ace7f..d862d386a5 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 @@ -32,8 +32,6 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.binding.rest.RESTBinding; @@ -42,13 +40,10 @@ import org.apache.tuscany.sca.common.http.HTTPHeader; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.extensibility.ClassLoaderContext; import org.apache.wink.common.internal.registry.ProvidersRegistry; -import org.apache.wink.common.internal.registry.metadata.MethodMetadata; import org.apache.wink.server.handlers.HandlersChain; import org.apache.wink.server.handlers.MessageContext; import org.apache.wink.server.handlers.ResponseHandler; import org.apache.wink.server.internal.DeploymentConfiguration; -import org.apache.wink.server.internal.RequestProcessor; -import org.apache.wink.server.internal.registry.ResourceRecord; import org.apache.wink.server.internal.servlet.RestServlet; /** @@ -138,6 +133,7 @@ public class TuscanyRESTServlet extends RestServlet { return config; } + /* private synchronized void fixMediaTypes(DeploymentConfiguration config) { if (fixed) { return; @@ -179,6 +175,7 @@ public class TuscanyRESTServlet extends RestServlet { } return processor; } + */ /** * TuscanyResponseHandler -- cgit v1.2.3