incubator-photark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r949074 - in /incubator/photark/sandbox/lresende/photark-rest/src: main/java/org/apache/photark/services/GalleryService.java test/resources/gallery.composite
Date Fri, 28 May 2010 02:32:47 GMT
Author: lresende
Date: Fri May 28 02:32:46 2010
New Revision: 949074

URL: http://svn.apache.org/viewvc?rev=949074&view=rev
Log:
Workaround for TUSCANY-3572 bug

Modified:
    incubator/photark/sandbox/lresende/photark-rest/src/main/java/org/apache/photark/services/GalleryService.java
    incubator/photark/sandbox/lresende/photark-rest/src/test/resources/gallery.composite

Modified: incubator/photark/sandbox/lresende/photark-rest/src/main/java/org/apache/photark/services/GalleryService.java
URL: http://svn.apache.org/viewvc/incubator/photark/sandbox/lresende/photark-rest/src/main/java/org/apache/photark/services/GalleryService.java?rev=949074&r1=949073&r2=949074&view=diff
==============================================================================
--- incubator/photark/sandbox/lresende/photark-rest/src/main/java/org/apache/photark/services/GalleryService.java
(original)
+++ incubator/photark/sandbox/lresende/photark-rest/src/main/java/org/apache/photark/services/GalleryService.java
Fri May 28 02:32:46 2010
@@ -20,6 +20,8 @@
 package org.apache.photark.services;
 
 import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 
 import org.apache.photark.Gallery;
 import org.oasisopen.sca.annotation.Remotable;
@@ -28,6 +30,7 @@ import org.oasisopen.sca.annotation.Remo
 public interface GalleryService {
 
     @GET
+    @Produces(MediaType.APPLICATION_JSON)
     Gallery get();
     
 }

Modified: incubator/photark/sandbox/lresende/photark-rest/src/test/resources/gallery.composite
URL: http://svn.apache.org/viewvc/incubator/photark/sandbox/lresende/photark-rest/src/test/resources/gallery.composite?rev=949074&r1=949073&r2=949074&view=diff
==============================================================================
--- incubator/photark/sandbox/lresende/photark-rest/src/test/resources/gallery.composite (original)
+++ incubator/photark/sandbox/lresende/photark-rest/src/test/resources/gallery.composite Fri
May 28 02:32:46 2010
@@ -26,7 +26,7 @@
 		<implementation.java class="org.apache.photark.services.GalleryServiceImpl"/> 
 		<service name="GalleryService">
 			<tuscany:binding.rest uri="http://localhost:8085/gallery">
-    		    <tuscany:wireFormat.json />
+    		    <!--tuscany:wireFormat.json /-->
 			    <tuscany:operationSelector.jaxrs />
     		</tuscany:binding.rest>
    		</service>	



Mime
View raw message