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 --- .../trunk/distribution/all/src/main/release/bin/LICENSE | 2 +- .../modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF | 1 + .../trunk/modules/binding-jsonrpc-runtime/pom.xml | 6 ++++-- .../jsonrpc/provider/JSONRPCReferenceBindingProvider.java | 3 +++ sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml | 15 ++++++++++++++- .../sca/binding/rest/provider/TuscanyRESTServlet.java | 7 ++----- .../trunk/modules/implementation-bpel-runtime/pom.xml | 8 +++++--- 7 files changed, 30 insertions(+), 12 deletions(-) diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE index c0cd3dca16..5ad8f510e9 100644 --- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE @@ -1506,7 +1506,7 @@ THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -The slf4j-api-1.5.11.jar and slf4j-jdk14-1.5.11.jar are distributed under the license: +The slf4j-api-1.6.1.jar and slf4j-jdk14-1.6.1.jar are distributed under the license: Copyright (c) 2004-2008 QOS.ch All rights reserved. diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF index bb4df5d439..0a40a2295a 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Bundle-Description: Apache Tuscany SCA JSON-RPC Binding Runtime Import-Package: javax.security.auth.login, javax.servlet, javax.servlet.http, + org.apache.http.conn.ssl, org.apache.http, org.apache.http.client, org.apache.http.client.methods, diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml index 2c7829dda8..ecb0db3320 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/pom.xml @@ -89,12 +89,14 @@ org.slf4j slf4j-api - 1.5.11 + 1.6.1 + runtime org.slf4j slf4j-jdk14 - 1.5.11 + 1.6.1 + runtime diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java index d14d51fd0d..e04065eed2 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java @@ -25,6 +25,7 @@ import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; @@ -81,6 +82,8 @@ public class JSONRPCReferenceBindingProvider implements ReferenceBindingProvider SchemeRegistry supportedSchemes = new SchemeRegistry(); supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME, PlainSocketFactory.getSocketFactory(), 80)); + supportedSchemes + .register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443)); ClientConnectionManager connectionManager = new ThreadSafeClientConnManager(defaultParameters, supportedSchemes); diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml index 2748c71c02..08d38bf4aa 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml @@ -143,7 +143,20 @@ - + + + org.slf4j + slf4j-api + 1.6.1 + runtime + + + org.slf4j + slf4j-jdk14 + 1.6.1 + runtime + + javax.servlet servlet-api 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 diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml index 1cf939de72..a68b866f09 100644 --- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml @@ -420,13 +420,15 @@ org.slf4j slf4j-api - 1.5.11 + 1.6.1 + runtime org.slf4j slf4j-jdk14 - 1.5.11 - + 1.6.1 + runtime + -- cgit v1.2.3