Operation selector implementation that uses JAX-RS annotations to map http requests to properly annotated REST interfaces

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

4 files changed, 7 insertions, 27 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
index 9967fe4d71..27c2ce669d 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 import services.Catalog;
 import services.Item;
 
-@Ignore
 public class CatalogServiceTestCase {
     private static Node node;
     private static Catalog catalogService;
@@ -63,10 +62,10 @@ public class CatalogServiceTestCase {
     @Test
     public void testPing() throws Exception {
         new Socket("127.0.0.1", 8085);
-         System.in.read();
+        //System.in.read();
     }
     
-    @Test
+    @Ignore
     public void testNewsService() throws Exception {
         Item[] items = catalogService.get();
         
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatTestCase.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatTestCase.java
deleted file mode 100644
index 5159cf6893..0000000000
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatTestCase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.rest.wireformat.json;
-
-public class JSONWireFormatTestCase {
-
-}
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/Catalog.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/Catalog.java
index b5e504fe11..d13b325395 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/Catalog.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/Catalog.java
@@ -19,9 +19,13 @@
 
 package services;
 
+import javax.ws.rs.GET;
+
 import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface Catalog {
+    
+    @GET
     Item[] get();
 }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/store.composite b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/store.composite
index 72219337b6..c10c1f3089 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/store.composite
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/resources/store.composite
@@ -28,6 +28,7 @@
 		<service name="Catalog">
 			<tuscany:binding.rest uri="http://localhost:8085/Catalog">
     		    <tuscany:wireFormat.json />
+			    <tuscany:operationSelector.jaxrs />
     		</tuscany:binding.rest>
    		</service>
 		<reference name="currencyConverter" target="CurrencyConverter"/>