From 73585773a33388d16c107f363964d37d78d1a028 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 17 Nov 2010 07:00:34 +0000
Subject: Add the discovery for javax.ws.rs.ext.RuntimeDelegate and update the
 slf4j version to fix the osgi rest sample

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035932 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java   | 3 ++-
 .../running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 d862d386a5..061d615d3e 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
@@ -69,7 +69,8 @@ public class TuscanyRESTServlet extends RestServlet {
         ClassLoader cl =
             ClassLoaderContext.setContextClassLoader(Thread.currentThread().getContextClassLoader(),
                                                      registry.getServiceDiscovery(),
-                                                     "/META-INF/server/wink-providers");
+                                                     "/META-INF/server/wink-providers",
+                                                     "javax.ws.rs.ext.RuntimeDelegate");
         try {
             super.init();
         } finally {
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
index fe65a86bdd..b13e4fc678 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
@@ -68,7 +68,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.5.11</version>
+			<version>1.6.1</version>
 			<scope>test</scope>
 		</dependency>
 
-- 
cgit v1.2.3