Author: sergeyb
Date: Thu Dec 30 11:41:20 2010
New Revision: 1053859
URL: http://svn.apache.org/viewvc?rev=1053859&view=rev
Log:
Merged revisions 1053858 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1053858 | sergeyb | 2010-12-30 11:38:41 +0000 (Thu, 30 Dec 2010) | 1 line
[JAX-RS] Updating the property name
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 30 11:41:20 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239,1053290,1053402,1053654
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239,1053290,1053402,1053654,1053858
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1053859&r1=1053858&r2=1053859&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Thu Dec 30 11:41:20 2010
@@ -109,7 +109,7 @@ public final class JAXRSUtils {
private static final Logger LOG = LogUtils.getL7dLogger(JAXRSUtils.class);
private static final ResourceBundle BUNDLE =
BundleUtils.getBundle(JAXRSUtils.class);
- private static final String PROPOGATE_EXCEPTION =
"org.apache.cxf.propogate.exception";
+ private static final String PROPOGATE_EXCEPTION =
"org.apache.cxf.propagate.exception";
private static final String FORM_PARAM_MAP = JAXRSUtils.class.getName() +
".FORM_DATA";
private JAXRSUtils() {
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1053859&r1=1053858&r2=1053859&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Thu Dec 30 11:41:20 2010
@@ -150,20 +150,20 @@ public class BookStore {
}
@GET
- @Path("propogateexception")
+ @Path("propagate-exception")
public Book propogateException() throws BookNotFoundFault {
throw new BookNotFoundFault("Book Exception");
}
@GET
- @Path("propogateexception2")
+ @Path("propagate-exception2")
public Book propogateException2() throws BookNotFoundFault {
-
PhaseInterceptorChain.getCurrentMessage().put("org.apache.cxf.propogate.exception",
Boolean.FALSE);
+
PhaseInterceptorChain.getCurrentMessage().put("org.apache.cxf.propagate.exception",
Boolean.FALSE);
throw new BookNotFoundFault("Book Exception");
}
@GET
- @Path("propogateexception3")
+ @Path("propagate-exception3")
public Book propogateException3() throws BookNotFoundFault {
PhaseInterceptorChain.getCurrentMessage().getExchange()
.put("org.apache.cxf.systest.for-out-fault-interceptor",
Boolean.TRUE);
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1053859&r1=1053858&r2=1053859&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Thu Dec 30 11:41:20 2010
@@ -141,7 +141,7 @@ public class JAXRSClientServerBookTest e
@Test
public void testPropogateException() throws Exception {
- getAndCompare("http://localhost:"; + PORT +
"/bookstore/propogateexception",
+ getAndCompare("http://localhost:"; + PORT +
"/bookstore/propagate-exception",
"", "application/xml", 500);
}
@@ -151,14 +151,14 @@ public class JAXRSClientServerBookTest e
+ "<ns1:faultstring
xmlns:ns1=\"http://cxf.apache.org/bindings/xformat\";>"
+ "org.apache.cxf.systest.jaxrs.BookNotFoundFault: Book
Exception</ns1:faultstring>"
+ "</ns1:XMLFault>";
- getAndCompare("http://localhost:"; + PORT +
"/bookstore/propogateexception2",
+ getAndCompare("http://localhost:"; + PORT +
"/bookstore/propagate-exception2",
data, "application/xml", 500);
}
@Test
public void testPropogateException3() throws Exception {
String data = "<nobook/>";
- getAndCompare("http://localhost:"; + PORT +
"/bookstore/propogateexception3",
+ getAndCompare("http://localhost:"; + PORT +
"/bookstore/propagate-exception3",
data, "application/xml", 500);
}
