You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/03/28 07:20:18 UTC
svn commit: r928343 - in
/tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime:
META-INF/MANIFEST.MF pom.xml
src/test/java/helloworld/jaxrs/HelloWorldApp.java
src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
Author: rfeng
Date: Sun Mar 28 05:20:17 2010
New Revision: 928343
URL: http://svn.apache.org/viewvc?rev=928343&view=rev
Log:
update jax-rs dependencies
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF?rev=928343&r1=928342&r2=928343&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF Sun Mar 28 05:20:17 2010
@@ -9,8 +9,9 @@ Bundle-Description: Apache Tuscany SCA I
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",
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml?rev=928343&r1=928342&r2=928343&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml Sun Mar 28 05:20:17 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java?rev=928343&r1=928342&r2=928343&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java Sun Mar 28 05:20:17 2010
@@ -50,7 +50,7 @@ public class HelloWorldApp extends Appli
*/
public HelloWorldApp() {
instances.add(new HelloWorld());
- classes.add(HelloWorld.class);
+ // classes.add(HelloWorld.class);
}
/**
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java?rev=928343&r1=928342&r2=928343&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java Sun Mar 28 05:20:17 2010
@@ -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());
}
/**