You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/04/05 12:00:36 UTC
svn commit: r1309733 - in /cxf/branches/2.5.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Author: sergeyb
Date: Thu Apr 5 10:00:36 2012
New Revision: 1309733
URL: http://svn.apache.org/viewvc?rev=1309733&view=rev
Log:
Merged revisions 1309729 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1309729 | sergeyb | 2012-04-05 12:53:06 +0300 (Thu, 05 Apr 2012) | 1 line
[CXF-4224] Adding one more test with a custom HttpMethod annotation
........
Added:
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java
- copied unchanged from r1309729, cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1309729
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=1309733&r1=1309732&r2=1309733&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java Thu Apr 5 10:00:36 2012
@@ -217,6 +217,13 @@ public class BookStoreSpring {
return getBookAegis();
}
+ @RETRIEVE_get
+ @Path("books/aegis/retrieve/get")
+ @Produces({"application/html;q=0.5", "application/xml;q=1.0", "application/json;q=0.5" })
+ public Book getBookAegisRetrieveGet() {
+ return getBookAegis();
+ }
+
@GET
@Path("books/xslt/{id}")
@Produces({"text/html", "application/xhtml+xml", "application/xml" })
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1309733&r1=1309732&r2=1309733&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Thu Apr 5 10:00:36 2012
@@ -453,6 +453,14 @@ public class JAXRSClientServerSpringBook
}
@Test
+ public void testRetrieveGetBookAegis() throws Exception {
+
+ String endpointAddress =
+ "http://localhost:" + PORT + "/the/thebooks4/bookstore/books/aegis/retrieve/get";
+ getBookAegis(endpointAddress, "application/xml");
+ }
+
+ @Test
public void testRetrieveBookAegis3() throws Exception {
Socket s = new Socket("localhost", Integer.parseInt(PORT));