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 2008/07/01 20:41:29 UTC
svn commit: r673167 [6/6] - in /cxf/trunk: parent/ rt/frontend/jaxrs/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ rt/frontend...
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue Jul 1 11:41:24 2008
@@ -27,18 +27,22 @@
import javax.ws.rs.ConsumeMime;
import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.ProduceMime;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
import javax.xml.transform.dom.DOMSource;
-import org.apache.cxf.customer.book.BookNotFoundDetails;
-import org.apache.cxf.customer.book.BookNotFoundFault;
import org.apache.cxf.helpers.XMLUtils;
@Path("/bookstore/")
@@ -48,6 +52,10 @@
private Map<Long, CD> cds = new HashMap<Long, CD>();
private long bookId = 123;
private long cdId = 123;
+
+ private String currentBookId;
+ @PathParam("CDId")
+ private String currentCdId;
public BookStore() {
init();
@@ -57,10 +65,12 @@
@GET
@Path("webappexception")
public Book throwException() {
+
Response response = Response.serverError().entity("This is a WebApplicationException").build();
throw new WebApplicationException(response);
}
+
@GET
@Path("timetable")
public Calendar getTimetable() {
@@ -74,17 +84,43 @@
}
@GET
- @Path("/books")
- public Books getBooks() {
- return new Books(books.values());
+ @Path("/books/query")
+ public Book getBookQuery(@QueryParam("bookId") String id) throws BookNotFoundFault {
+ return doGetBook(id);
+ }
+
+ @GET
+ @Path("/books/defaultquery")
+ public Book getDefaultBookQuery(@DefaultValue("123") @QueryParam("bookId") String id)
+ throws BookNotFoundFault {
+ return doGetBook(id);
+ }
+
+ @GET
+ @Path("/books/element")
+ public JAXBElement<Book> getBookElement() throws Exception {
+ return new JAXBElement<Book>(new QName("", "Book"),
+ Book.class,
+ doGetBook("123"));
}
+ @GET
+ @Path("/books/adapter")
+ @XmlJavaTypeAdapter(BookInfoAdapter.class)
+ public BookInfo getBookAdapter() throws Exception {
+ return new BookInfo(doGetBook("123"));
+ }
+
+ @PathParam("bookId")
+ public void setBookId(String id) {
+ currentBookId = id;
+ }
@GET
@Path("/books/{bookId}/")
@ProduceMime("application/json")
- public Book getBookAsJSON(@PathParam("bookId") String id) throws BookNotFoundFault {
- return doGetBook(id);
+ public Book getBookAsJSON() throws BookNotFoundFault {
+ return doGetBook(currentBookId);
}
private Book doGetBook(String id) throws BookNotFoundFault {
@@ -206,11 +242,19 @@
return r;
}
+ @POST
+ @Path("/booksplain")
+ @ConsumeMime("text/plain")
+ @ProduceMime("text/plain")
+ public Long echoBookId(long theBookId) {
+ return new Long(theBookId);
+ }
+
@GET
@Path("/cd/{CDId}/")
- public CD getCD(@PathParam("CDId") String id) {
- System.out.println("----invoking getCD with cdId: " + id);
- CD cd = cds.get(Long.parseLong(id));
+ public CD getCD() {
+ System.out.println("----invoking getCD with cdId: " + currentCdId);
+ CD cd = cds.get(Long.parseLong(currentCdId));
return cd;
}
@@ -233,7 +277,12 @@
c.setCD(cds.values());
return c;
}
-
+
+ @Path("/interface")
+ public BookSubresource getBookFromSubresource() {
+ return new BookSubresourceImpl();
+ }
+
final void init() {
Book book = new Book();
book.setId(bookId);
@@ -249,6 +298,39 @@
cd1.setName("BICYCLE RACE");
cds.put(cd1.getId(), cd1);
}
+
+ private static class BookInfo {
+ private String name;
+ private long id;
+
+ public BookInfo(Book b) {
+ this.name = b.getName();
+ this.id = b.getId();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public long getId() {
+ return id;
+ }
+ }
+
+ public static class BookInfoAdapter extends XmlAdapter<Book, BookInfo> {
+
+ @Override
+ public Book marshal(BookInfo v) throws Exception {
+ return new Book(v.getName(), v.getId());
+ }
+
+ @Override
+ public BookInfo unmarshal(Book v) throws Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ }
}
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java Tue Jul 1 11:41:24 2008
@@ -38,12 +38,6 @@
package org.apache.cxf.systest.jaxrs;
-import javax.ws.rs.PathParam;
-
-import org.apache.cxf.customer.book.BookNotFoundDetails;
-import org.apache.cxf.customer.book.BookNotFoundFault;
-
-
public class BookStoreWithInterface extends BookStoreStorage implements BookInterface {
public BookStoreWithInterface() {
@@ -54,7 +48,7 @@
}
- public Book getThatBook(@PathParam("bookId") Long id) throws BookNotFoundFault {
+ public Book getThatBook(Long id) throws BookNotFoundFault {
return doGetBook(id);
}
Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java?rev=673167&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java Tue Jul 1 11:41:24 2008
@@ -0,0 +1,34 @@
+/**
+ * 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.cxf.systest.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.ProduceMime;
+
+import org.apache.cxf.customer.book.BookNotFoundFault;
+
+public interface BookSubresource {
+
+ @GET
+ @Path("/subresource")
+ @ProduceMime("application/xml")
+ Book getTheBook() throws BookNotFoundFault;
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java?rev=673167&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java Tue Jul 1 11:41:24 2008
@@ -0,0 +1,33 @@
+/**
+ * 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.cxf.systest.jaxrs;
+
+import org.apache.cxf.customer.book.BookNotFoundFault;
+
+public class BookSubresourceImpl implements BookSubresource {
+
+ public Book getTheBook() throws BookNotFoundFault {
+ Book b = new Book();
+ b.setId(123);
+ b.setName("CXF in Action");
+ return b;
+ }
+
+}
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Books.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Books.java?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Books.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/Books.java Tue Jul 1 11:41:24 2008
@@ -19,26 +19,20 @@
package org.apache.cxf.systest.jaxrs;
-import java.util.ArrayList;
-import java.util.Collection;
-
+import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Books")
public class Books {
- private Collection<Book> books;
-
- public Books() {
- this.books = new ArrayList<Book>();
- }
+ @XmlElement
+ private Book b;
- public Books(Collection<Book> books) {
- this.books = books;
+ public Books(Book b) {
+ this.b = b;
}
-
- public Collection<Book> getBooks() {
- return books;
+
+ public Book getBook() {
+ return b;
}
-
}
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Tue Jul 1 11:41:24 2008
@@ -41,7 +41,7 @@
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServer.class));
+ launchServer(BookServer.class, true));
}
@Test
@@ -67,10 +67,11 @@
@Test
public void testNoMessageWriterFound() throws Exception {
// TODO : more specific message is needed
- String msg = ".No message body writer found for response class : GregorianCalendar.";
+ String msg1 = ".No message body writer found for response class : GregorianCalendar.";
+ String msg2 = ".No message body writer found for response class : Calendar.";
- getAndCompare("http://localhost:9080/bookstore/timetable",
- msg,
+ getAndCompareStrings("http://localhost:9080/bookstore/timetable",
+ msg1, msg2,
"*/*", 406);
}
@@ -136,6 +137,39 @@
"resources/expected_get_book123.txt",
"application/xml", 200);
+ getAndCompareAsStrings("http://localhost:9080/bookstore/books/query?bookId=123",
+ "resources/expected_get_book123.txt",
+ "application/xml", 200);
+
+ getAndCompareAsStrings("http://localhost:9080/bookstore/books/defaultquery",
+ "resources/expected_get_book123.txt",
+ "application/xml", 200);
+
+ getAndCompareAsStrings("http://localhost:9080/bookstore/books/123",
+ "resources/expected_get_book123json.txt",
+ "application/xml,application/json", 200);
+ }
+
+ @Test
+ public void testGetBookElement() throws Exception {
+ getAndCompareAsStrings("http://localhost:9080/bookstore/books/element",
+ "resources/expected_get_book123.txt",
+ "application/xml", 200);
+ }
+
+ @Test
+ public void testGetBookAdapter() throws Exception {
+ getAndCompareAsStrings("http://localhost:9080/bookstore/books/adapter",
+ "resources/expected_get_book123.txt",
+ "application/xml", 200);
+ }
+
+ @Test
+ public void testGetBook123FromSub() throws Exception {
+ getAndCompareAsStrings("http://localhost:9080/bookstore/interface/subresource",
+ "resources/expected_get_book123.txt",
+ "application/xml", 200);
+
getAndCompareAsStrings("http://localhost:9080/bookstore/books/123",
"resources/expected_get_book123json.txt",
"application/xml,application/json", 200);
@@ -153,7 +187,7 @@
public void testGetChapterChapter() throws Exception {
getAndCompareAsStrings("http://localhost:9080/bookstore/booksubresource/123/chapters/sub/1/recurse",
- "resources/expected_get_chapter1.txt",
+ "resources/expected_get_chapter1_utf.txt",
"application/xml", 200);
}
@@ -348,12 +382,9 @@
InputStream in = connect.getInputStream();
assertNotNull(in);
- InputStream expected123 = getClass().getResourceAsStream("resources/expected_get_cd.txt");
InputStream expected124 = getClass().getResourceAsStream("resources/expected_get_cds124.txt");
String result = getStringFromInputStream(in);
- //System.out.println("---" + getStringFromInputStream(in));
-
- assertTrue(result.indexOf(getStringFromInputStream(expected123)) >= 0);
+ System.out.println("---" + result);
assertTrue(result.indexOf(getStringFromInputStream(expected124)) >= 0);
}
@@ -378,7 +409,29 @@
// Release current connection to the connection pool once you are done
get.releaseConnection();
}
- }
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test
+ public void testGetPlainLong() throws Exception {
+ String endpointAddress =
+ "http://localhost:9080/bookstore/booksplain";
+
+ PostMethod post = new PostMethod(endpointAddress);
+ post.addRequestHeader("Content-Type" , "text/plain");
+ post.addRequestHeader("Accept" , "text/plain");
+ post.setRequestBody("12345");
+ HttpClient httpclient = new HttpClient();
+
+ try {
+ int result = httpclient.executeMethod(post);
+ assertEquals(200, result);
+ assertEquals(post.getResponseBodyAsString(), "12345");
+ } finally {
+ // Release current connection to the connection pool once you are done
+ post.releaseConnection();
+ }
+ }
@Test
public void testGetCDsJSON() throws Exception {
@@ -494,6 +547,7 @@
int expectedStatus) throws Exception {
GetMethod get = new GetMethod(address);
get.setRequestHeader("Accept", acceptType);
+ get.setRequestHeader("Accept-Language", "en,da;q=0.8");
HttpClient httpClient = new HttpClient();
try {
int result = httpClient.executeMethod(get);
@@ -506,6 +560,25 @@
}
}
+ private void getAndCompareStrings(String address,
+ String expectedValue1,
+ String expectedValue2,
+ String acceptType,
+ int expectedStatus) throws Exception {
+ GetMethod get = new GetMethod(address);
+ get.setRequestHeader("Accept", acceptType);
+ HttpClient httpClient = new HttpClient();
+ try {
+ int result = httpClient.executeMethod(get);
+ assertEquals(expectedStatus, result);
+ String jsonContent = getStringFromInputStream(get.getResponseBodyAsStream());
+ assertTrue("Expected value is wrong",
+ expectedValue1.equals(jsonContent) || expectedValue2.equals(jsonContent));
+ } finally {
+ get.releaseConnection();
+ }
+ }
+
private String getStringFromInputStream(InputStream in) throws Exception {
CachedOutputStream bos = new CachedOutputStream();
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java Tue Jul 1 11:41:24 2008
@@ -48,6 +48,7 @@
URL url = new URL(endpointAddress);
URLConnection connect = url.openConnection();
connect.addRequestProperty("Accept", "application/json");
+ connect.addRequestProperty("Content-Language", "badger-fish-language");
InputStream in = connect.getInputStream();
assertNotNull(in);
@@ -61,6 +62,25 @@
}
@Test
+ public void testGetBookNotFound() throws Exception {
+
+ String endpointAddress =
+ "http://localhost:9080/bookstore/books/12345";
+ URL url = new URL(endpointAddress);
+ URLConnection connect = url.openConnection();
+ connect.addRequestProperty("Accept", "application/json");
+ InputStream in = connect.getInputStream();
+ assertNotNull(in);
+
+ InputStream expected = getClass()
+ .getResourceAsStream("resources/expected_get_book_notfound_mapped.txt");
+
+ assertEquals("Exception is not mapped correctly",
+ getStringFromInputStream(expected).trim(),
+ getStringFromInputStream(in).trim());
+ }
+
+ @Test
public void testPostPetStatus() throws Exception {
String endpointAddress =
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/add_book.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/add_book.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/add_book.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/add_book.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Book><name>CXF in Action - 2</name></Book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Book><name>CXF in Action - 2</name></Book>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_add_book.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_add_book.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_add_book.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_add_book.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Book><id>124</id><name>CXF in Action - 2</name></Book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Book><id>124</id><name>CXF in Action - 2</name></Book>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_book_json.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_book_json.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_book_json.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_book_json.txt Tue Jul 1 11:41:24 2008
@@ -1 +1,14 @@
-{"contributors":[],"title":"CXF in Action","content":{"value":"<Book><id>123<\/id><name>CXF in Action<\/name><\/Book>","type":"application/xml"},"categories":[],"authors":[],"id":"123","links":[]}
\ No newline at end of file
+{
+ "id":"123",
+ "title":"CXF in Action",
+ "content":{
+ "attributes":{
+ "type":"application/xml"
+ },
+ "children":["<Book><id>123<\/id><name>CXF in Action<\/name><\/Book>"
+ ]
+ },
+ "attributes":{
+ "xml:base":"/bookstore/books/entries/123"
+ }
+}
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_books_json.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_books_json.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_books_json.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_atom_books_json.txt Tue Jul 1 11:41:24 2008
@@ -1 +1,24 @@
-{"contributors":[],"title":"Collection of Books","categories":[],"entries":[{"contributors":[],"title":"CXF in Action","content":{"value":"<Book><id>123<\/id><name>CXF in Action<\/name><\/Book>","type":"application/xml"},"categories":[],"authors":[],"id":"123","links":[]}],"authors":[{"name":"BookStore Management Company"}],"id":"http://www.books.com","links":[]}
\ No newline at end of file
+{
+ "id":"http://www.books.com",
+ "title":"Collection of Books",
+ "authors":[{
+ "name":"BookStore Management Company"
+ }
+ ],
+ "entries":[{
+ "id":"123",
+ "title":"CXF in Action",
+ "content":{
+ "attributes":{
+ "type":"application/xml"
+ },
+ "children":["<Book><id>123<\/id><name>CXF in Action<\/name><\/Book>"
+ ]
+ }
+ }
+ ],
+ "attributes":{
+ "xml:base":"/bookstore/books/feed"
+ }
+}
+
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Book><id>123</id><name>CXF in Action</name></Book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Book><id>123</id><name>CXF in Action</name></Book>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<ns1:XMLFault xmlns:ns1="http://cxf.apache.org/bindings/xformat"><ns1:faultstring xmlns:ns1="http://cxf.apache.org/bindings/xformat">org.apache.cxf.customer.book.BookNotFoundFault</ns1:faultstring></ns1:XMLFault>
\ No newline at end of file
+<ns1:XMLFault xmlns:ns1="http://cxf.apache.org/bindings/xformat"><ns1:faultstring xmlns:ns1="http://cxf.apache.org/bindings/xformat">org.apache.cxf.systest.jaxrs.BookNotFoundFault</ns1:faultstring></ns1:XMLFault>
\ No newline at end of file
Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound_mapped.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound_mapped.txt?rev=673167&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound_mapped.txt (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book_notfound_mapped.txt Tue Jul 1 11:41:24 2008
@@ -0,0 +1 @@
+No book found at all : 12345
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_books.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_books.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_books.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_books.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Book><id>123</id><name>CXF in Action</name></Book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Books><Book><id>123</id><name>CXF in Action</name></Book></Books>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cd.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cd.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cd.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cd.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<CD><id>123</id><name>BOHEMIAN RHAPSODY</name></CD>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><CD><id>123</id><name>BOHEMIAN RHAPSODY</name></CD>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cds.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cds.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cds.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cds.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<CDs><CD><id>123</id><name>BOHEMIAN RHAPSODY</name></CD><CD><id>124</id><name>BICYCLE RACE</name></CD></CDs>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><CDs><CD><id>123</id><name>BOHEMIAN RHAPSODY</name></CD><CD><id>124</id><name>BICYCLE RACE</name></CD></CDs>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Chapter><id>1</id><title>chapter 1</title></Chapter>
\ No newline at end of file
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?><Chapter><id>1</id><title>chapter 1</title></Chapter>
\ No newline at end of file
Added: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1_utf.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1_utf.txt?rev=673167&view=auto
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1_utf.txt (added)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1_utf.txt Tue Jul 1 11:41:24 2008
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Chapter><id>1</id><title>chapter 1</title></Chapter>
\ No newline at end of file
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1_utf.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_chapter1_utf.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_update_book.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_update_book.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_update_book.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_update_book.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Book><id>123</id><name>CXF in Action - 3</name></Book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Book><id>123</id><name>CXF in Action - 3</name></Book>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book_not_exist.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book_not_exist.txt?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book_not_exist.txt (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/update_book_not_exist.txt Tue Jul 1 11:41:24 2008
@@ -1 +1 @@
-<Book><id>223</id><name>CXF in Action - 3</name></Book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Book><id>223</id><name>CXF in Action - 3</name></Book>
\ No newline at end of file
Modified: cxf/trunk/systests/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml?rev=673167&r1=673166&r2=673167&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml Tue Jul 1 11:41:24 2008
@@ -36,10 +36,14 @@
<ref bean="petstore"/>
<ref bean="bookstore"/>
</jaxrs:serviceBeans>
- <jaxrs:entityProviders>
+ <jaxrs:providers>
<bean class="org.apache.cxf.systest.jaxrs.BadgerFishProvider"/>
- </jaxrs:entityProviders>
+ <ref bean="exceptionMapper"/>
+ </jaxrs:providers>
</jaxrs:server>
<bean id="bookstore" scope="prototype" class="org.apache.cxf.systest.jaxrs.BookStore"/>
<bean id="petstore" scope="prototype" class="org.apache.cxf.systest.jaxrs.PetStore"/>
+ <bean id="exceptionMapper" class="org.apache.cxf.systest.jaxrs.BookExceptionMapper">
+ <property name="toHandle" value="true"/>
+ </bean>
</beans>