cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r707114 - in /cxf/branches/2.1.x-fixes: ./ systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
Date Wed, 22 Oct 2008 16:14:32 GMT
Author: dkulp
Date: Wed Oct 22 09:14:31 2008
New Revision: 707114

URL: http://svn.apache.org/viewvc?rev=707114&view=rev
Log:
Merged revisions 706900 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r706900 | sergeyb | 2008-10-22 04:54:48 -0400 (Wed, 22 Oct 2008) | 1 line
  
  JAX-RS : updating the system test
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 09:14:31 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705692,705708,706675
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705692,705708,706675,706900

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=707114&r1=707113&r2=707114&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
Wed Oct 22 09:14:31 2008
@@ -27,6 +27,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.ProduceMime;
+import javax.ws.rs.QueryParam;
 
 @Path("/bookstore")
 @ProduceMime("application/json")
@@ -45,8 +46,28 @@
     public Book getBookById(@PathParam("id") Long id) {
         return books.get(id);
     }
+    
+    @GET
+    @Path("/booksquery")
+    public Book getBookByQuery(@QueryParam("id") String id) {
+        
+        String[] values = id.split("\\+");
+        StringBuilder b = new StringBuilder();
+        b.append(values[0]).append(values[1]);        
+        return books.get(Long.valueOf(b.toString()));
+    }
      
     @GET
+    @Path("id={id}")
+    public Book getBookByEncodedId(@PathParam("id") String id) {
+        String[] values = id.split("\\+");
+        StringBuilder b = new StringBuilder();
+        b.append(values[0]).append(values[1]);        
+        return books.get(Long.valueOf(b.toString()));
+    }
+    
+    
+    @GET
     public Book getDefaultBook() {
         return books.get(mainId);
     }  



Mime
View raw message