update jax-rs dependencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928343 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 23 insertions, 3 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
index 45fd6394cb..e4eef9021f 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
@@ -9,8 +9,9 @@ Bundle-Description: Apache Tuscany SCA Implementation JAXRS Runtime
 Bundle-SymbolicName: org.apache.tuscany.sca.implementation.jaxrs.provider

 Bundle-DocURL: http://www.apache.org/

 Import-Package: javax.servlet,

- javax.servlet.jsp,

- javax.servlet.jsp.tagext,

+ javax.ws.rs.core,

+ org.apache.wink.server.internal,

+ org.apache.wink.server.utils,

  org.apache.tuscany.sca.assembly;version="2.0.0",

  org.apache.tuscany.sca.core;version="2.0.0",

  org.apache.tuscany.sca.host.http;version="2.0.0",

diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
index b58ba5fb76..3d18f1983b 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
@@ -80,6 +80,18 @@
             <groupId>org.apache.wink</groupId>
             <artifactId>wink-server</artifactId>
             <version>1.0-incubating</version>
+        </dependency>        
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.wink</groupId>
+            <artifactId>wink-client</artifactId>
+            <version>1.0-incubating</version>
+            <scope>test</scope>
         </dependency>
         
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
index ea35c546bc..46e9068ee1 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
@@ -50,7 +50,7 @@ public class HelloWorldApp extends Application {
      */
     public HelloWorldApp() {
         instances.add(new HelloWorld());
-        classes.add(HelloWorld.class);
+        // classes.add(HelloWorld.class);
     }
 
     /**
diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
index 0821850598..20ddf88505 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
@@ -21,9 +21,13 @@ package helloworld.jaxrs.test;
 
 import java.io.File;
 
+import junit.framework.Assert;
+
 import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.wink.client.ClientResponse;
+import org.apache.wink.client.RestClient;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -49,6 +53,9 @@ public class HelloWorldTestCase {
 
     @Test
     public void testDummy() {
+        RestClient client = new RestClient();
+        ClientResponse response = client.resource("http://localhost:8080/world").get();
+        Assert.assertEquals(200, response.getStatusCode());
     }
 
     /**